咨询机构管理:bug修复

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/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/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>