feat :竞争管理-竞争对手管理

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

@@ -1,5 +1,6 @@
 package com.wx.blink.backend.controller;
 
+import com.wx.blink.backend.domain.dataobject.BlinkCompetitorFormerNameDO;
 import com.wx.blink.backend.domain.dto.BlinkCompetitorDTO;
 import com.wx.blink.backend.domain.dto.BlinkCompetitorDataDTO;
 import com.wx.blink.backend.domain.dto.BlinkCompetitorProjectDTO;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 @RestController
 @Tag(name = "竞争管理")
@@ -61,17 +63,20 @@ public class BlinkCompetitorController {
         return competitorService.supportsCompetitorQuery(id);
     }
 
+    @Operation(summary = "获取曾用名列表")
+    @GetMapping("/supports/competitor/formerName/queryPage/{competitorId}")
+    public ResponseDTO<List<BlinkCompetitorFormerNameDO>> queryCompetitorFormerName(@PathVariable("competitorId") String competitorId) {
+        return competitorService.queryCompetitorFormerName(competitorId);
+    }
 
     @Operation(summary = "新增信息资料")
     @PostMapping("/supports/competitor/data/create")
-    @NoNeedLogin
     public ResponseDTO<String> supportsCompetitorDataCreate(@RequestBody @Valid BlinkCompetitorDataDTO dto) {
         return dataService.supportsCompetitorDataCreate(dto);
     }
 
     @Operation(summary = "分页查询信息资料列表")
     @PostMapping("/supports/competitor/data/queryPage")
-    @NoNeedLogin
     public ResponseDTO<PageResult<BlinkCompetitorDataDTO>> supportsCompetitorDataQueryPage(@RequestBody @Valid BlinkCompetitorDataQry qry) {
         return dataService.supportsCompetitorDataQueryPage(qry);
     }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkCompetitorFormerNameDO.java

@@ -17,8 +17,8 @@ public class BlinkCompetitorFormerNameDO extends BaseEntity {
     /**
      * id
      */
-    @TableId(type = IdType.ASSIGN_UUID)
-    private Long id;
+    @TableId(type = IdType.AUTO)
+    private Integer id;
 
     /**
      * 竞争对手id

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkCompetitorQualificationDO.java

@@ -29,6 +29,6 @@ public class BlinkCompetitorQualificationDO extends BaseEntity {
     /**
      * 竞争对手ID
      */
-    private Integer competitorId;
+    private String competitorId;
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkCompetitorDTO.java

@@ -47,7 +47,6 @@ public class BlinkCompetitorDTO extends BaseEntity {
      * 注册资本（元）
      */
     private BigDecimal registeredCapital;
-    private BigDecimal registeredCapitals;
 
     /**
      * 注册日期

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkCompetitorDataDTO.java

@@ -13,7 +13,7 @@ public class BlinkCompetitorDataDTO extends BaseEntity {
     /**
      * id
      */
-    private Long id;
+    private String id;
 
     /**
      * 附件集合

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

@@ -34,11 +34,11 @@ public class BlinkCompetitorQualificationServiceImpl extends ServiceImpl<BlinkCo
      */
     @Override
     public ResponseDTO<String> supportsCompetitorQualificationCreate(BlinkCompetitorQualificationDTO dto) {
-        // 验证企业资质是否重复
-        BlinkCompetitorQualificationDO qualificationDO = repository.queryByQualificationName(dto.getQualificationName(), null, Boolean.FALSE);
-        if (Objects.nonNull(qualificationDO)) {
-            return ResponseDTO.dataErrorParam("资质名称重复!请检查");
-        }
+//        // 验证企业资质是否重复
+//        BlinkCompetitorQualificationDO qualificationDO = repository.queryByQualificationName(dto.getQualificationName(), null, Boolean.FALSE);
+//        if (Objects.nonNull(qualificationDO)) {
+//            return ResponseDTO.dataErrorParam("资质名称重复!请检查");
+//        }
         // 生成DO
         BlinkCompetitorQualificationDO competitorQualification = new BlinkCompetitorQualificationDO();
         mapper.toBlinkCompetitorQualificationDO(dto, competitorQualification);

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

@@ -21,6 +21,7 @@ import com.wx.blink.base.common.util.BlinkEnumUtil;
 import com.wx.blink.base.common.util.BlinkPageUtil;
 import com.wx.blink.base.module.support.serialnumber.constant.SerialNumberIdEnum;
 import com.wx.blink.base.module.support.serialnumber.service.SerialNumberService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -61,9 +62,9 @@ public class BlinkCompetitorServiceImpl extends ServiceImpl<BlinkCompetitorRepos
         // 生成DO
         BlinkCompetitorDO competitor = new BlinkCompetitorDO();
         mapper.toBlinkCompetitorDO(dto, competitor);
-        //生成客户编码
+        //生成竞争编码
         SerialNumberIdEnum serialNumberIdEnum = BlinkEnumUtil.getEnumByValue(10, SerialNumberIdEnum.class);
-        competitor.setCompetitorId(serialNumberService.generate(serialNumberIdEnum));
+         competitor.setCompetitorId(serialNumberService.generate(serialNumberIdEnum));
         // 创建人赋值
         BlinkEntityUtil.setCreateInfo(competitor);
         // 执行新增
@@ -161,4 +162,13 @@ public class BlinkCompetitorServiceImpl extends ServiceImpl<BlinkCompetitorRepos
         mapper.toBlinkCompetitorDTO(competitorDO, dto);
         return ResponseDTO.ok(dto);
     }
+
+    /**
+     * 查询曾用名,通过对手id
+     */
+    @Override
+    public ResponseDTO<List<BlinkCompetitorFormerNameDO>> queryCompetitorFormerName(String competitorId){
+        List<BlinkCompetitorFormerNameDO> formerNameDOList =repository.queryCompetitorFormerName(competitorId);
+        return ResponseDTO.ok(formerNameDOList);
+    }
 }

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

@@ -39,5 +39,10 @@ public interface BlinkCompetitorRepository extends BaseMapper<BlinkCompetitorDO>
      */
     Integer saveCompetitorFormerName(BlinkCompetitorFormerNameDO formerNameDO);
 
+    /**
+     * 查询曾用名,通过对手id
+     */
+    List<BlinkCompetitorFormerNameDO> queryCompetitorFormerName(@Param("competitorId") String competitorId);
+
 
 }

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

@@ -1,9 +1,13 @@
 package com.wx.blink.backend.service;
 
+import com.wx.blink.backend.domain.dataobject.BlinkCompetitorFormerNameDO;
 import com.wx.blink.backend.domain.dto.BlinkCompetitorDTO;
 import com.wx.blink.backend.domain.qry.BlinkCompetitorQry;
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface IBlinkCompetitorService {
 
@@ -37,4 +41,9 @@ public interface IBlinkCompetitorService {
      * @return
      */
     ResponseDTO<BlinkCompetitorDTO> supportsCompetitorQuery(String id);
+
+    /**
+     * 查询曾用名,通过对手id
+     */
+    ResponseDTO<List<BlinkCompetitorFormerNameDO>> queryCompetitorFormerName(String competitorId);
 }

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

@@ -31,5 +31,15 @@
         </if>
         order by create_time desc
     </select>
+    <select id="queryCompetitorFormerName"
+            resultType="com.wx.blink.backend.domain.dataobject.BlinkCompetitorFormerNameDO">
+        select *
+        from blink_competitor_former_name
+        where deleted_flag = '0'
+        <if test="competitorId != null">
+            AND competitor_id = #{competitorId}
+        </if>
+        order by create_time desc
+    </select>
 
 </mapper>