init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -1012,10 +1012,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
         WmScorePackage scorePackage = wmScorePackageService.getById(wmReport.getScoreId());
         LambdaQueryWrapper<WmTask> lambdaQueryWrapper = Wrappers.<WmTask>query().lambda();
         lambdaQueryWrapper.and(wrapper -> wrapper.eq(WmTask::getReportDrugId, wmReport.getId())
-                .or().eq(WmTask::getReportOneId, wmReport.getId())
-                .or().eq(WmTask::getReportSecondId, wmReport.getId()));
+                        .or().eq(WmTask::getReportOneId, wmReport.getId())
+                        .or().eq(WmTask::getReportSecondId, wmReport.getId()));
         // 如果是审批页面，则过滤掉通过和不通过的数据（reportDrugApprovalOpinion或reportOneApprovalOpinion：1通过，2不通过）
         if (isApprovalPage != null && isApprovalPage.equals(1)) {
+            lambdaQueryWrapper.eq(WmTask::getTaskStatus, "3");
             if ("0".equals(scorePackage.getTypeid())) {//药企
                 lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
             } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
@@ -1061,9 +1062,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
         // 过滤审批流信息
         Integer nodeId = null;
-        if (SecurityUtils.getRoles().contains(43)){
+        if (SecurityUtils.getRoles().contains(43)) {
             nodeId = 2;
-        } else if (SecurityUtils.getRoles().contains(4)){
+        } else if (SecurityUtils.getRoles().contains(4)) {
             nodeId = 3;
         }
 
@@ -1071,7 +1072,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                 Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery()
                         .eq(SysCheckChainNodeCheckHistory::getNodeId, nodeId));
         Set<Integer> collect = his.stream().mapToInt(SysCheckChainNodeCheckHistory::getTargetId).boxed().collect(Collectors.toSet());
-        if (CollUtil.isNotEmpty(collect)){
+        if (CollUtil.isNotEmpty(collect)) {
             lambdaQueryWrapper.notIn(WmTask::getId, collect);
         }
 
@@ -1139,6 +1140,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
                 map.put("checkState", checkState);
 
+                SysDept byId = sysDeptService.getById(wmtask.getDeptId());
+                map.put("entName", byId.getName());
+
+
                 return map;
             }).collect(Collectors.toList());