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/AdvisoryBodyProject.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -51,7 +52,7 @@ public class AdvisoryBodyProject extends BaseEntity implements Serializable {
     /**
      * 结算金额(万元)
      */
-    private Double settleAmount;
+    private BigDecimal settleAmount;
     /**
      * 结算开始时间
      */

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

@@ -79,6 +79,10 @@ public class CustomerApproveVo {
      * 业主性质
      */
     private String ownerKind;
+    /**
+     * 企业性质
+     */
+    private String customerProperty;
     /**
      * 资质等级
      */
@@ -132,10 +136,6 @@ public class CustomerApproveVo {
      * 税号
      */
     private String taxNumber;
-    /**
-     * 企业性质
-     */
-    private String customerProperty;
 
     //证书信息
     /**
@@ -167,6 +167,10 @@ public class CustomerApproveVo {
      */
     private String expireDate7;
     //审批意见
+    /**
+     * 是否同意准入/准入情况
+     */
+    private String isagree;
     /**
      * 经办人
      */

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

@@ -42,7 +42,7 @@ import java.util.Map;
 /**
  * 咨询机构管理
  *
- * @author makejava
+ * @author sxk
  * @since 2023-12-10 15:34:51
  */
 @Slf4j
@@ -148,11 +148,14 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     public TableDataInfo<CooperateProjectDetailSearchVo> queryCooperateProjectDetailList(CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
         //先根据咨询机构CID查出所有该咨询机构下的项目主键keys
         List<Long> projectKeys = advisoryBodyProjectMapper.selectProjectKeysByAdvisoryBodyCids(Collections.singletonList(cooperateProjectDetailSearchBo.getAdvisoryBodyCid()));
+        if (projectKeys.isEmpty()) {
+            return TableDataInfo.build();
+        }
         //再根据记录终改的项目主键查询项目详情
         QueryWrapper<DProject> wrapper = Wrappers.query();
         wrapper
                 //项目主键
-                .in(!projectKeys.isEmpty(), "project_key", projectKeys)
+                .in("project_key", projectKeys)
                 //项目名称
                 .like(StringUtils.isNotBlank(cooperateProjectDetailSearchBo.getProjectName()), "project_name", cooperateProjectDetailSearchBo.getProjectName())
                 //项目承接类型
@@ -175,9 +178,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             if (ObjectUtil.isNotNull(advisoryBodyProject)) {
                 Date settleStartTime = advisoryBodyProject.getSettleStartTime();
                 Date settleFinishTime = advisoryBodyProject.getSettleFinishTime();
-                if (ObjectUtil.isNotNull(settleStartTime)&& ObjectUtil.isNotNull(settleFinishTime)) {
+                if (ObjectUtil.isNotNull(settleStartTime) && ObjectUtil.isNotNull(settleFinishTime)) {
                     cooperateProjectDetailSearchVo.setSettlementDays(DateUtil.between(settleStartTime, settleFinishTime, DateUnit.DAY));
-                }else {
+                } else {
                     cooperateProjectDetailSearchVo.setSettlementDays(0L);
                 }
             }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java

@@ -61,4 +61,30 @@ public class CompanyRelationTableV1Controller {
     public R pageSelect(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
         return relationTableV1Service.pageSelect(dto);
     }
+
+    /***
+     *@Description: -分页列表-统计
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/statistics")
+    public R statistics(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
+        return relationTableV1Service.statistics(dto);
+    }
+
+    /***
+     *@Description: 常合作集团成员详情-分页列表
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/combinePage")
+    public TableDataInfo combinePage(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception {
+        return relationTableV1Service.combinePage(dto);
+    }
+
+
 }

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

@@ -67,5 +67,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
      */
     private Integer sort = 5;
 
+    /**
+     * 集团Id
+     */
+    private Integer combineId;
+
 
 }

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

@@ -25,12 +25,22 @@ public class CompanyRelationTableV1Service {
     private DskOpenApiUtil dskOpenApiUtil;
 
     public TableDataInfo page(JskCompanyRelationTableV1Dto dto) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/page", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = null;
+        if (dto.getCompanyType().equals(3)) {
+            map = dskOpenApiUtil.requestBody("/operate/consultancy/combinePage", BeanUtil.beanToMap(dto, false, false));
+        } else {
+            map = dskOpenApiUtil.requestBody("/operate/consultancy/page", BeanUtil.beanToMap(dto, false, false));
+        }
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception{
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
+    public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception {
+        Map<String, Object> map = null;
+        if (dto.getCompanyType().equals(3)) {
+            map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetailPage", BeanUtil.beanToMap(dto, false, false));
+        } else {
+            map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
+        }
         return dskOpenApiUtil.responsePage(map);
     }
 
@@ -45,4 +55,21 @@ public class CompanyRelationTableV1Service {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/pageSelect", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    /***
+     *@Description: -分页列表-下拉
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    public R statistics(JskCompanyRelationTableV1Dto dto) throws Exception{
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/statistics", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public TableDataInfo combinePage(JskCompanyRelationTableV1Dto dto) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/combinePage", BeanUtil.beanToMap(dto, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
 }

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

@@ -9,7 +9,10 @@
         from advisory_body_project abp
         <where>
             <if test="advisoryBodyCids != null">
-                abp.advisory_body_cid = #{advisoryBodyCids}
+                abp.advisory_body_cid in
+                <foreach collection="advisoryBodyCids" item="advisoryBodyCids" open="(" close=")" separator=",">
+                    #{advisoryBodyCids}
+                </foreach>
             </if>
         </where>
     </select>