修改首页问题

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -170,7 +170,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             //默认通过
             zsyzSbbzb.setProgress(TWO);
             //承接地审核通过去查询中间表 是否所有指派的要素部门都回复且通过
-            if (zsyzProjectDeptsYsbm != null) {
+            if (zsyzProjectDeptsYsbm != null && zsyzProjectDeptsYsbm.size() > 0) {
                 Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
                 List<ZsyzProjectDept> yList = collect.get("Y");
                 if (yList != null && zsyzProjectDeptsYsbm.size() == yList.size()) {
@@ -202,7 +202,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             zsyzSbbzb.setShjg(TWO);
             zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
             //需要去中间表zsyz_project_dept判断要素部门是否都回复过
-            if (zsyzProjectDeptsYsbm != null) {
+            if (zsyzProjectDeptsYsbm != null && zsyzProjectDeptsYsbm.size() > 0) {
                 Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
                 List<ZsyzProjectDept> yList = collect.get("Y");
                 if (yList != null && zsyzProjectDeptsYsbm.size() == yList.size()) {
@@ -318,7 +318,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     }
                 }
             } else {
-                if (zsyzProjectDeptsYsbm != null) {
+                if (zsyzProjectDeptsYsbm != null && zsyzProjectDeptsYsbm.size() > 0) {
                     //要素部门有多个
                     //判断除我外是否全部回复
                     Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
@@ -341,6 +341,18 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                                 //清空要素部门和引资单位中间表
                                 projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
                             }
+                        }else {
+                            //要素部门都回复了但是没有都同意
+                            //判断承接地有没有回复
+                            if ("Y".equals(zsyzProjectDeptsCjd.get(0).getIsHf())){
+                                //如果承接地回复了
+                                //说明都回复过 项目回到 项目首谈已审核,清空承接地信息
+                                zsyzSbbzb.setProgress(ONE);
+                                zsyzSbbzb.setXmStatus(TWO);
+                                zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
+                                //清空要素部门和引资单位中间表
+                                projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
+                            }
                         }
                     }
                 }
@@ -350,7 +362,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             zsyzSbbzb.setXmStatus(THR);
             zsyzSbbzb.setShjg(TWO);
             //需要去中间表zsyz_project_dept判断要素部门是否都回复过
-            if (zsyzProjectDeptsYsbm != null) {
+            if (zsyzProjectDeptsYsbm != null && zsyzProjectDeptsYsbm.size() > 0) {
                 //判断是否只有一个要素部门是不是当前人
                 if (zsyzProjectDeptsYsbm.size() == 1) {
                     if (zsyzProjectDeptsYsbm.get(0).getDeptId().equals(deptId)) {