Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBody.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 咨询机构(SysAdvisoryBody)表实体类
@@ -36,6 +37,30 @@ public class AdvisoryBody extends BaseEntity implements Serializable {
      * 咨询机构名称
      */
     private String advisoryBodyName;
+    /**
+     * 统一社会信用代码
+     */
+    private String creditCode;
+    /**
+     * 经营状态
+     */
+    private String businessStatus;
+    /**
+     * 法定代表人
+     */
+    private String legalPerson;
+    /**
+     * 注册日期
+     */
+    private Date regDate;
+    /**
+     * 注册资金
+     */
+    private String regCapital;
+    /**
+     * 注册地址
+     */
+    private String regAddress;
     /**
      * 经营范围
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/EditAdvisoryBodyInfoBo.java

 package com.dsk.cscec.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -34,6 +35,37 @@ public class EditAdvisoryBodyInfoBo {
      */
     @NotBlank(message = "咨询机构名称不能为空")
     private String advisoryBodyName;
+    /**
+     * 统一社会信用代码
+     */
+    @NotBlank(message = "统一社会信用代码不能为空")
+    private String creditCode;
+    /**
+     * 经营状态(登记状态)
+     */
+    @NotBlank(message = "登记状态不能为空")
+    private String businessStatus;
+    /**
+     * 法定代表人
+     */
+    @NotBlank(message = "法定代表人不能为空")
+    private String legalPerson;
+    /**
+     * 注册日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @NotNull(message = "注册日期不能为空")
+    private Date regDate;
+    /**
+     * 注册资金
+     */
+    @NotBlank(message = "注册资金不能为空")
+    private String regCapital;
+    /**
+     * 注册地址
+     */
+    @NotBlank(message = "注册地址不能为空")
+    private String regAddress;
     /**
      * 经营范围
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyExistVo.java

@@ -16,12 +16,4 @@ public class AdvisoryBodyExistVo extends AdvisoryBody {
      * 是否为新资讯机构
      */
     private Boolean isNewAdvisoryBody;
-    /**
-     * 法定代表人
-     */
-    private String corporatePerson;
-    /**
-     * 注册地址
-     */
-    private String regAddress;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodySearchVo.java

@@ -50,4 +50,8 @@ public class AdvisoryBodySearchVo extends AdvisoryBody {
      * 合作项目数量
      */
     private Long cooperateProjectCount;
+    /**
+     * 信息记录人
+     */
+    private String infoRecorder;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CustomerInfoVo.java

@@ -36,8 +36,13 @@ public class CustomerInfoVo implements Serializable {
     /**
      * 供应商名称
      */
-    @Excel(name = "供应商名称", width = 30)
     private String customerName;
+    /**
+     * 供应商名称导出
+     * 列表查询时customerName可能作为查询关键字被标红,所以单独设置此属性
+     */
+    @Excel(name = "供应商名称", width = 30)
+    private String customerNameExport;
     /**
      * 二级市场企业编码
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java

@@ -80,9 +80,9 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
             Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
             Map companyData = MapUtils.getMap(companyMap, "data", null);
 
-            //查询最近一次合作时间
+            //填充查询最近一次合作时间与信息记录人
             List<AdvisoryBodyProject> advisoryBodyProjectList = advisoryBodyProjectMapper.selectList(new LambdaQueryWrapper<AdvisoryBodyProject>()
-                    .select(AdvisoryBodyProject::getCreateTime)
+                    .select(AdvisoryBodyProject::getCreateTime, AdvisoryBodyProject::getCreateBy)
                     .eq(AdvisoryBodyProject::getAdvisoryBodyCid, advisoryBodySearchVo.getAdvisoryBodyCid())
                     .orderByDesc(AdvisoryBodyProject::getCreateTime));
             Date lastCooperateDate = null;
@@ -91,6 +91,7 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                 //TODO:AdvisoryBodyProject表中保留了cooperate_time字段,应当取该字段作为最近一次合作时间,但产品并未给存入这个字段的需求
                 lastCooperateDate = advisoryBodyProjectList.get(0).getCreateTime();
                 advisoryBodySearchVo.setLastCooperateTime(lastCooperateDate);
+                advisoryBodySearchVo.setInfoRecorder(advisoryBodyProjectList.get(0).getCreateBy());
             }
 
             //筛选最近一次合作时间
@@ -140,14 +141,6 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
         if (ObjectUtil.isNotNull(advisoryBody)) {
             //咨询机构表中有记录,则设置为非新咨询机构
             AdvisoryBodyExistVo advisoryBodyExistVo = BeanUtil.toBean(advisoryBody, AdvisoryBodyExistVo.class);
-            EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
-            infoHeaderBody.setCompanyId(advisoryBodyExistVo.getAdvisoryBodyCid());
-            Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
-            Map companyData = MapUtils.getMap(companyMap, "data", null);
-            //法人信息
-            advisoryBodyExistVo.setCorporatePerson(MapUtils.getString(companyData,"corporatePerson"));
-            //注册地址
-            advisoryBodyExistVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
             //是否为新资讯机构
             advisoryBodyExistVo.setIsNewAdvisoryBody(false);
             return advisoryBodyExistVo;
@@ -168,19 +161,29 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                         advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(jskEid));
                         //企业名称
                         advisoryBodyExistVo.setAdvisoryBodyName(companyName);
+                        //统一社会信用代码
+                        advisoryBodyExistVo.setCreditCode(MapUtils.getString(companyData, "creditCode"));
+                        //法人信息
+                        advisoryBodyExistVo.setLegalPerson(MapUtils.getString(companyData, "legalPerson"));
                         //经营范围
                         advisoryBodyExistVo.setBusinessScope(MapUtils.getString(companyData, "businessScope"));
-                        //法人信息
-                        advisoryBodyExistVo.setCorporatePerson(MapUtils.getString(companyData,"legalPerson"));
 
                         EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
                         infoHeaderBody.setCompanyId(Math.toIntExact(jskEid));
                         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
                         Map companyData1 = MapUtils.getMap(companyMap, "data", null);
-                        //注册地址
-                        advisoryBodyExistVo.setRegAddress(MapUtils.getString(companyData1, "addressDetail", ""));
-                        //是否为新资讯机构
-                        advisoryBodyExistVo.setIsNewAdvisoryBody(true);
+                        if (ObjectUtil.isNotNull(companyData1)) {
+                            //登记状态
+                            advisoryBodyExistVo.setBusinessStatus(MapUtils.getString(companyData1, "businessStatus", ""));
+                            //成立日期
+                            advisoryBodyExistVo.setRegDate(DateUtil.parse(MapUtils.getString(companyData1, "registeredDate", ""),"yyyy-MM-dd"));
+                            //注册地址
+                            advisoryBodyExistVo.setRegAddress(MapUtils.getString(companyData1, "addressDetail", ""));
+                            //注册资本
+                            advisoryBodyExistVo.setRegCapital(MapUtils.getString(companyData1, "regCapital", ""));
+                            //是否为新资讯机构
+                            advisoryBodyExistVo.setIsNewAdvisoryBody(true);
+                        }
                         return advisoryBodyExistVo;
                     }
                 }
@@ -235,7 +238,7 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                 AdvisoryBody advisoryBody = baseMapper.selectOne(new LambdaQueryWrapper<AdvisoryBody>()
                         .eq(AdvisoryBody::getAdvisoryBodyCid, editInfoBo.getAdvisoryBodyCid()));
                 updateAdvisoryBodyProject.setAdvisoryBodyId(advisoryBody.getAdvisoryBodyId());
-            }else {
+            } else {
                 updateAdvisoryBodyProject.setAdvisoryBodyId(advisoryBodyProject.getAdvisoryBodyId());
             }
             return advisoryBodyProjectMapper.updateById(updateAdvisoryBodyProject);

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

@@ -66,6 +66,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         AtomicInteger sortNum = new AtomicInteger(1);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             page.getRecords().forEach(item->{
+                item.setCustomerNameExport(item.getCustomerName());
                 item.setNum(sortNum.getAndIncrement());
                 DCustomerListVo vo = subcontractMapper.selectStatisticByCustomerId(item.getCustomerId());
                 //企业合作数量

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java

@@ -281,7 +281,7 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             return this.treatProjectCodeExist(projectCode);
         } else {
             CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
-            ////未做任何改动时
+            //未做任何改动时
             //Assert.isFalse(projectCode.equals(projectRecord.getIpmProjectNo()), "新编码与旧编码相同");
             //修改项目信息or新增新阶段项目时
             if (projectCode.equals(projectRecord.getIpmProjectNo())