Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml

@@ -16,8 +16,8 @@
                 LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id )
         WHERE
             (
-                bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather)
-                OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation)
+                bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather where gather_result = #{params.gatherResult})
+                OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation where flow_status = #{params.flowStatus})
                 or pti.design_p_id IS NOT NULL
                 OR pti.prehomo_p_id IS NOT NULL
                 OR pti.verify_p_id IS NOT NULL

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java

@@ -10,6 +10,7 @@ import com.jero.modules.document.enums.FieldTypeEnum;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.document.vo.QueryConditionVO;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
+import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
 import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
@@ -68,6 +69,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         //封装查询条件(包含高级搜索)
         String condition = this.getConditionStr(params);
         params.put("condition",condition);
+        //只查询 法规技术评估流程状态、法规意见收集 收集结果  为已完成的数据
+        params.put("flowStatus", GatherResultEnum.COMPLETED.getValue());
+        params.put("gatherResult", GatherResultEnum.COMPLETED.getValue());
         IPage page = new Page(pageNo, pageSize);
         IPage infoPage = this.lawsComplianceBoardMapper.queryPageList(page, params);
         List records = infoPage.getRecords();
@@ -139,12 +143,14 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         //查询当前数据是否有法规意见收集流程数据
         QueryWrapper<LawsOpinionGatherEO> opinionGatherEOQueryWrapper = new QueryWrapper<>();
         opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id);
+        opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult,GatherResultEnum.COMPLETED.getValue());
         int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper);
         result.put("opinionGather",opinionGatherCount);
 
         //查询当前数据是否有法规技术评估流程数据
         QueryWrapper<LawsTechnologyEvaluationEO> evaluationEOQueryWrapper = new QueryWrapper<>();
         evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id);
+        evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus,GatherResultEnum.COMPLETED.getValue());
         int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper);
         result.put("technologyEvaluation",evaluationCount);
         return result;