feat: 竞争对手中企业资质列表查询、获取详情、编辑、移除

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkCompetitorController.java

@@ -22,22 +22,19 @@ public class BlinkCompetitorController {
 
     @Operation(summary = "新增竞争对手")
     @PostMapping("/supports/competitor/create")
-    @NoNeedLogin
     public ResponseDTO<String> supportsCompetitorCreate(@RequestBody @Valid BlinkCompetitorDTO dto) {
         return competitorService.supportsCompetitorCreate(dto);
     }
 
     @Operation(summary = "分页查询竞争对手列表")
     @PostMapping("/supports/competitor/queryPage")
-    @NoNeedLogin
     public ResponseDTO<PageResult<BlinkCompetitorDTO>> supportsCompetitorQueryPage(@RequestBody @Valid BlinkCompetitorQry qry) {
         return competitorService.supportsCompetitorQueryPage(qry);
     }
 
     @Operation(summary = "获取竞争对手信息")
     @GetMapping("/supports/competitor/query/{id}")
-    @NoNeedLogin
-    public ResponseDTO<BlinkCompetitorDTO> supportsActivityQuery(@PathVariable("id") Long id) {
+    public ResponseDTO<BlinkCompetitorDTO> supportsCompetitorQuery(@PathVariable("id") Long id) {
         return competitorService.supportsCompetitorQuery(id);
     }
 

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkCompetitorQualificationController.java

@@ -1,14 +1,13 @@
 package com.wx.blink.backend.controller;
 
 import com.wx.blink.backend.domain.dto.BlinkCompetitorQualificationDTO;
+import com.wx.blink.backend.domain.qry.BlinkCompetitorQualificationQry;
 import com.wx.blink.backend.service.IBlinkCompetitorQualificationService;
-import com.wx.blink.base.common.annoation.NoNeedLogin;
+import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -18,13 +17,36 @@ import javax.validation.Valid;
 public class BlinkCompetitorQualificationController {
 
     @Resource
-    private IBlinkCompetitorQualificationService competitorQualificationService;
+    private IBlinkCompetitorQualificationService qualificationService;
 
     @Operation(summary = "新增企业资质")
     @PostMapping("/supports/competitor/qualification/create")
-    @NoNeedLogin
     public ResponseDTO<String> supportsCompetitorQualificationCreate(@RequestBody @Valid BlinkCompetitorQualificationDTO dto) {
-        return competitorQualificationService.supportsCompetitorQualificationCreate(dto);
+        return qualificationService.supportsCompetitorQualificationCreate(dto);
+    }
+
+    @Operation(summary = "分页查询企业资质列表")
+    @PostMapping("/supports/competitor/qualification/queryPage")
+    public ResponseDTO<PageResult<BlinkCompetitorQualificationDTO>> supportsCompetitorQualificationQueryPage(@RequestBody @Valid BlinkCompetitorQualificationQry qry) {
+        return qualificationService.supportsCompetitorQualificationQueryPage(qry);
+    }
+
+    @Operation(summary = "获取企业资质信息")
+    @GetMapping("/supports/competitor/qualification/query/{id}")
+    public ResponseDTO<BlinkCompetitorQualificationDTO> supportsCompetitorQualificationQuery(@PathVariable("id") Long id) {
+        return qualificationService.supportsCompetitorQualificationQuery(id);
+    }
+
+    @Operation(summary = "编辑更新企业资质")
+    @PostMapping("/supports/competitor/qualification/update")
+    public ResponseDTO<String> supportsCompetitorQualificationUpdate(@RequestBody @Valid BlinkCompetitorQualificationDTO dto) {
+        return qualificationService.supportsCompetitorQualificationUpdate(dto);
+    }
+
+    @Operation(summary = "移除企业资质")
+    @GetMapping("/supports/qualification/delete/{id}")
+    public ResponseDTO<String> supportsCompetitorQualificationDeleteById(@PathVariable("id") Long id) {
+        return qualificationService.supportsCompetitorQualificationDeleteById(id);
     }
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/qry/BlinkCompetitorQualificationQry.java

@@ -9,6 +9,11 @@ public class BlinkCompetitorQualificationQry extends PageParam {
     /**
      * 竞争对手ID
      */
-    private String competitorId;
+    private Long competitorId;
+
+    /**
+     * 企业资质名称
+     */
+    private String qualificationName;
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkCompetitorQualificationServiceImpl.java

@@ -1,16 +1,21 @@
 package com.wx.blink.backend.manager;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wx.blink.backend.domain.dataobject.BlinkCompetitorQualificationDO;
 import com.wx.blink.backend.domain.dto.BlinkCompetitorQualificationDTO;
+import com.wx.blink.backend.domain.qry.BlinkCompetitorQualificationQry;
 import com.wx.blink.backend.objectmapper.BlinkCompetitorQualificationMapper;
 import com.wx.blink.backend.repository.BlinkCompetitorQualificationRepository;
 import com.wx.blink.backend.service.IBlinkCompetitorQualificationService;
+import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkEntityUtil;
+import com.wx.blink.base.common.util.BlinkPageUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -43,4 +48,79 @@ public class BlinkCompetitorQualificationServiceImpl extends ServiceImpl<BlinkCo
         this.save(competitorQualification);
         return ResponseDTO.ok();
     }
+
+    /**
+     * 分页查询企业资质列表
+     *
+     * @param qry
+     * @return
+     */
+    @Override
+    public ResponseDTO<PageResult<BlinkCompetitorQualificationDTO>> supportsCompetitorQualificationQueryPage(BlinkCompetitorQualificationQry qry) {
+        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
+        List<BlinkCompetitorQualificationDTO> qualificationDTOS = repository.supportsCompetitorQualificationQueryPage(page, qry);
+        PageResult<BlinkCompetitorQualificationDTO> pageResult = BlinkPageUtil.convert2PageResult(page, qualificationDTOS);
+        return ResponseDTO.ok(pageResult);
+    }
+
+    /**
+     * 获取企业资质信息
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ResponseDTO<BlinkCompetitorQualificationDTO> supportsCompetitorQualificationQuery(Long id) {
+        // 验证竞争对手是否存在
+        BlinkCompetitorQualificationDO qualificationDO = repository.queryByQualificationName(null, id, Boolean.FALSE);
+        if (!Objects.nonNull(qualificationDO)) {
+            return ResponseDTO.userErrorParam("企业资质不存在!请检查");
+        }
+        BlinkCompetitorQualificationDTO dto = new BlinkCompetitorQualificationDTO();
+        mapper.toBlinkCompetitorQualificationDTO(qualificationDO, dto);
+        return ResponseDTO.ok(dto);
+    }
+
+    /**
+     * 编辑更新企业资质
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResponseDTO<String> supportsCompetitorQualificationUpdate(BlinkCompetitorQualificationDTO dto) {
+        // 验证企业资质是否重复
+        BlinkCompetitorQualificationDO qualification = repository.queryByQualificationName(null, dto.getId(), Boolean.FALSE);
+        if (Objects.nonNull(qualification)) {
+            return ResponseDTO.dataErrorParam("企业资质名称已存在!请检查");
+        }
+        // 生成DO
+        BlinkCompetitorQualificationDO qualificationDO = new BlinkCompetitorQualificationDO();
+        mapper.toBlinkCompetitorQualificationDO(dto, qualificationDO);
+        // 创建人赋值
+//        BlinkEntityUtil.setUpdatedInfo(qualificationDO);
+        // 执行新增
+        this.updateById(qualificationDO);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 移除企业资质
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ResponseDTO<String> supportsCompetitorQualificationDeleteById(Long id) {
+        BlinkCompetitorQualificationDO qualificationDO = this.getById(id);
+        if (!Objects.nonNull(qualificationDO)){
+            return ResponseDTO.dataErrorParam("企业资质不存在!请检查");
+        }
+        // 执行假删除
+        qualificationDO.setDeletedFlag(1);
+        // 修改人赋值
+//        BlinkEntityUtil.setUpdatedInfo(qualificationDO);
+        this.updateById(qualificationDO);
+        return ResponseDTO.ok();
+    }
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkCompetitorQualificationRepository.java

@@ -31,6 +31,6 @@ public interface BlinkCompetitorQualificationRepository extends BaseMapper<Blink
      * @param qry
      * @return
      */
-    List<BlinkCompetitorQualificationDTO> supportsQualificationQueryPage(Page<?> page, @Param("query") BlinkCompetitorQualificationQry qry);
+    List<BlinkCompetitorQualificationDTO> supportsCompetitorQualificationQueryPage(Page<?> page, @Param("query") BlinkCompetitorQualificationQry qry);
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkCompetitorQualificationService.java

@@ -1,6 +1,8 @@
 package com.wx.blink.backend.service;
 
 import com.wx.blink.backend.domain.dto.BlinkCompetitorQualificationDTO;
+import com.wx.blink.backend.domain.qry.BlinkCompetitorQualificationQry;
+import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 
 public interface IBlinkCompetitorQualificationService {
@@ -12,4 +14,36 @@ public interface IBlinkCompetitorQualificationService {
      * @return
      */
     ResponseDTO<String> supportsCompetitorQualificationCreate(BlinkCompetitorQualificationDTO dto);
+
+    /**
+     * 分页查询企业资质列表
+     *
+     * @param qry
+     * @return
+     */
+    ResponseDTO<PageResult<BlinkCompetitorQualificationDTO>> supportsCompetitorQualificationQueryPage(BlinkCompetitorQualificationQry qry);
+
+    /**
+     * 获取企业资质信息
+     *
+     * @param id
+     * @return
+     */
+    ResponseDTO<BlinkCompetitorQualificationDTO> supportsCompetitorQualificationQuery(Long id);
+
+    /**
+     * 编辑更新企业资质
+     *
+     * @param dto
+     * @return
+     */
+    ResponseDTO<String> supportsCompetitorQualificationUpdate(BlinkCompetitorQualificationDTO dto);
+
+    /**
+     * 移除企业资质
+     *
+     * @param id
+     * @return
+     */
+    ResponseDTO<String> supportsCompetitorQualificationDeleteById(Long id);
 }

bound-link-api/blink-backend/src/main/resources/mapper/BlinkCompetitorQualificationRepositoryMapper.xml

@@ -22,6 +22,9 @@
         <if test="query.qualificationName != null and query.qualificationName != ''">
             AND qualification_name LIKE concat('%', #{query.qualificationName}, '%')
         </if>
+        <if test="query.competitorId != null">
+            AND competitor_id = #{query.competitorId}
+        </if>
         order by create_time desc
     </select>