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/controller/AdvisoryBodyManageController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -101,13 +100,11 @@ public class AdvisoryBodyManageController extends BaseController {
     /**
      * 获取咨询机构自定义表单
      */
-    @GetMapping("/getAdvisoryBodyCustomForm/{projectKey}")
-    public R<AdvisoryBodyCustomForm> getAdvisoryBodyCustomForm(@Validated @NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
-        return R.ok(advisoryBodyCustomFormService.getById(projectKey));
+    @GetMapping("/getAdvisoryBodyCustomForm")
+    public R<List<AdvisoryBodyCustomForm>> getAdvisoryBodyCustomForm() {
+        return R.ok(advisoryBodyCustomFormService.list());
     }
 
-    //todo:自定义表单表格只存一条json数据改造
-
     /**
      * 新增咨询机构自定义表单
      */
@@ -122,7 +119,7 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @PutMapping("/updateAdvisoryBodyCustomForm")
     @Transactional(rollbackFor = Exception.class)
-    public R<Void> updateAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
-        return toAjax(advisoryBodyCustomFormService.updateById(advisoryBodyCustomForm));
+    public R<Void> updateAdvisoryBodyCustomForm(@Validated EditAdvisoryBodyCustomFormBo editBo) {
+        return toAjax(advisoryBodyCustomFormService.updateById(editBo));
     }
 }
\ No newline at end of file

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/FSupplierLimitedController.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/SupplierLimitedController.java

@@ -21,19 +21,19 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("fSupplierLimited")
-public class FSupplierLimitedController {
+public class SupplierLimitedController {
     /**
      * 服务对象
      */
     @Resource
-    private FSupplierLimitedService fSupplierLimitedService;
+    private FSupplierLimitedService supplierLimitedService;
 
     /**
      * 获取涉诉限用禁用名单
      */
     @GetMapping("/getSupplierLimitedList")
     public TableDataInfo<SupplierLimitedSearchVo> getSupplierLimitedList(SupplierLimitedSearchBo searchBo, PageQuery pageQuery) {
-        return fSupplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
+        return supplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
     }
 
     /**
@@ -41,7 +41,7 @@ public class FSupplierLimitedController {
      */
     @GetMapping("/getSupplierUnlimitedList")
     public TableDataInfo<SupplierUnlimitedSearchVo> getSupplierUnlimitedList(SupplierUnlimitedSearchBo searchBo, PageQuery pageQuery) {
-        return fSupplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
+        return supplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
     }
 }
 

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -22,14 +21,8 @@ public class AdvisoryBodyCustomForm extends BaseEntity implements Serializable {
     /**
      * 项目主键
      */
-    @TableId(value = "project_key")
-    @NotNull(message = "项目主键不能为空")
-    private Long projectKey;
-    /**
-     * 咨询机构ID
-     */
-    @NotNull(message = "咨询机构ID不能为空")
-    private Long advisoryBodyId;
+    @TableId(value = "ab_custom_form_id")
+    private Long abCustomFormId;
     /**
      * json数据
      */

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

+package com.dsk.cscec.domain.bo;
+
+import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.01.09
+ * @time 11:24
+ */
+@Data
+public class EditAdvisoryBodyCustomFormBo extends AdvisoryBodyCustomForm {
+    /**
+     * 项目主键
+     */
+    @NotNull(message = "自定义表单ID不能为空")
+    private Long abCustomFormId;
+}

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

@@ -19,6 +19,5 @@ public class ProjectDetailBo {
     /**
      * 咨询机构Cid
      */
-    @NotNull(message = "咨询机构Cid不能为空")
     private Long advisoryBodyCid;
 }

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

@@ -16,4 +16,12 @@ 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/service/impl/AdvisoryBodyServiceImpl.java

@@ -140,6 +140,15 @@ 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;
         } else {
@@ -154,9 +163,23 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                     String companyName = StringUtils.removeRed(MapUtils.getString(companyData, "name", "NotExist"));
                     if (advisoryBodyName.equals(companyName)) {
                         AdvisoryBodyExistVo advisoryBodyExistVo = new AdvisoryBodyExistVo();
-                        advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(MapUtils.getLong(companyData, "jskEid")));
+                        //jskEid就是cid
+                        Long jskEid = MapUtils.getLong(companyData, "jskEid");
+                        advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(jskEid));
+                        //企业名称
                         advisoryBodyExistVo.setAdvisoryBodyName(companyName);
+                        //经营范围
                         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);
                         return advisoryBodyExistVo;
                     }
@@ -164,8 +187,8 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                 //查不到则抛异常
                 throw new ServiceException("咨询机构不存在或结果不唯一,请输入完整咨询机构企业名称");
             }
+            throw new ServiceException("咨询机构不存在");
         }
-        return null;
     }
 
     /**

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

@@ -83,6 +83,10 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
                 //查不到则抛异常
                 //throw new ServiceException("未查询到该供应商Cid");
             }
+            //关键字标红
+            if (StringUtils.isNotBlank(searchBo.getSupplierName())) {
+                searchVo.setFsuppliername(StringUtils.markInRed(searchVo.getFsuppliername(), searchBo.getSupplierName()));
+            }
         }
         return TableDataInfo.build(page);
     }

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

@@ -214,24 +214,27 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
      */
     @Override
     public ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo) {
+        Long advisoryBodyCid = projectDetailBo.getAdvisoryBodyCid();
         //查询项目明细
         DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
                 .eq(DProject::getProjectKey, projectDetailBo.getProjectKey()));
         ProjectDetailVo projectDetailVo = BeanUtil.toBean(dProject, ProjectDetailVo.class);
+
         //查询咨询机构信息并填充
         projectDetailVo.setAdvisoryBody(advisoryBodyMapper.queryAdvisoryBodyByProjectKey(projectDetailBo.getProjectKey()));
+        //查询项目信息并填充
+        projectDetailVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectDetailBo.getProjectKey()));
 
+        if (ObjectUtil.isNotNull(advisoryBodyCid)) {
             EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
-        infoHeaderBody.setCompanyId(Math.toIntExact(projectDetailBo.getAdvisoryBodyCid()));
+            infoHeaderBody.setCompanyId(Math.toIntExact(advisoryBodyCid));
             Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
             Map companyData = MapUtils.getMap(companyMap, "data", null);
             //法人
             projectDetailVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
             //注册地址
             projectDetailVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
-
-        //查询项目信息并填充
-        projectDetailVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectDetailBo.getProjectKey()));
+        }
         return projectDetailVo;
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1DetailPageDto.java

@@ -77,4 +77,17 @@ public class JskCompanyRelationTableV1DetailPageDto extends BasePage {
      * 成员Id（常合作集团成员详情）
      */
     private Integer memberId;
+
+
+    /**
+     * 集团名称（集团查看详情需传）
+     */
+    private String combineName;
+
+    /**
+     * 成员名称（常合作集团成员详情传
+     */
+    private String memberName;
+
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java

@@ -72,5 +72,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
      */
     private String combineId;
 
+    /**
+     * 集团名称（集团查看详情需传）
+     */
+    private String combineName;
+
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

@@ -71,12 +71,19 @@ public class EnterpriseService {
     }
 
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
-        if (body.isVaildCid()) return R.ok();
+        if (body.isVaildCid()) {
+            return R.ok();
+        }
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
-        if (200 != companyCode) return R.ok();
+        if (200 != companyCode) {
+            return R.ok();
+        }
 
         Map companyData = MapUtils.getMap(companyMap, "data", null);
+        if (ObjectUtil.isEmpty(companyData)) {
+            return R.ok();
+        }
         companyData.put("uipId", null);
         companyData.put("claimStatus", 0);
         companyData.put("bratingSubjectLevel", null);
@@ -102,14 +109,20 @@ public class EnterpriseService {
     }
 
     public R statistic(EnterpriseStatisticBody body) throws Exception {
-        if (body.isVaildCid()) return R.ok();
+        if (body.isVaildCid()) {
+            return R.ok();
+        }
         Map<String, Object> statisticMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false));
 
         Integer statisticMapCode = MapUtils.getInteger(statisticMap, "code", 300);
-        if (200 != statisticMapCode) throw new RuntimeException();
+        if (200 != statisticMapCode) {
+            return R.ok();
+        }
 
         Map statisticMapData = MapUtils.getMap(statisticMap, "data", null);
-        if (MapUtils.isEmpty(statisticMapData)) return R.ok();
+        if (MapUtils.isEmpty(statisticMapData)) {
+            return R.ok();
+        }
 
         //内部合作
         Map<String,Object> cooperation = iCustomerInfoService.cooperationStatistic(body.getCompanyName());
@@ -122,7 +135,9 @@ public class EnterpriseService {
         paramMap.put("cid", body.getCompanyId());
         Map<String, Object> projectStatisticMap = dskOpenApiUtil.requestBody("/operate/enterpriseProject/statistic", paramMap);
         Integer projectStatisticMapCode = MapUtils.getInteger(projectStatisticMap, "code", 300);
-        if (200 != projectStatisticMapCode) return R.ok(statisticMapData);
+        if (200 != projectStatisticMapCode) {
+            return R.ok(statisticMapData);
+        }
 
         Map projectStatisticMapData = MapUtils.getMap(projectStatisticMap, "data", null);
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml

@@ -24,7 +24,7 @@
     <select id="queryIsInvestProject" resultType="java.lang.String">
         SELECT DISTINCT isinvestproject
         FROM d_project
-        WHERE (isinvestproject != '')
+        WHERE (isinvestproject <![CDATA[ <> ]]> '')
     </select>
 
     <select id="selectPageCooperateProjectDetailList"