修改首页问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/common/ZsyzCommonController.java

@@ -88,84 +88,6 @@ public class ZsyzCommonController extends BaseController {
     @PreAuthorize("@ss.hasPermi('projectV2:common:xszp')")
     public AjaxResult xszp(@RequestBody ZpVo zpVo) {
         return  zsyzCommonService.xszp(zpVo);
-/*        String zpType = zsyzSbbzb.getZpType();
-        if (ONE.equals(zpType)){
-            ArrayList<SysDept> deptList = zsyzSbbzb.getDeptList();
-            if (deptList != null && deptList.size() > 0){
-                for (SysDept sysDept : deptList) {
-                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
-                    zsyzProjectDept.setXmId(zsyzSbbzb.getId());
-                    zsyzProjectDept.setXmbh(zsyzSbbzb.getXmbh());
-                    zsyzProjectDept.setXmmc(zsyzSbbzb.getXmxsmc());
-                    zsyzProjectDept.setDeptId(sysDept.getDeptId());
-                    zsyzProjectDept.setDeptName(sysDept.getDeptName());
-                    //指派给要素部门
-                    zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
-                }
-            }
-            zsyzSbbzb.setProgress(THR);
-            zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
-        }else if (TWO.equals(zpType)){
-            //判断该项目是否已经被指派
-            ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbService.selectZsyzSbbzbById(zsyzSbbzb.getId());
-            if (zsyzSbbzbOld != null){
-                Long cjdId = zsyzSbbzbOld.getCjdId();
-                if (cjdId != null){
-                    return AjaxResult.error("该线索已被指派,请勿重复指派或等待当前指派承接地放弃承接");
-                }
-            }
-            //指派给承接地
-            zsyzSbbzb.setProgress(FOR);
-            zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
-        }else if (THR.equals(zpType)){
-            //两个都发先去发承接地,承接地发送成功再去发要素部门
-            //判断该项目是否已经被指派
-            ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbService.selectZsyzSbbzbById(zsyzSbbzb.getId());
-            if (zsyzSbbzbOld != null){
-                Long cjdId = zsyzSbbzbOld.getCjdId();
-                if (cjdId != null){
-                    return AjaxResult.error("该线索已被指派,请勿重复指派或等待当前指派承接地放弃承接");
-                }
-            }
-
-            ArrayList<SysDept> deptList = zsyzSbbzb.getDeptList();
-            if (deptList != null && deptList.size() > 0){
-                for (SysDept sysDept : deptList) {
-                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
-                    zsyzProjectDept.setXmId(zsyzSbbzb.getId());
-                    zsyzProjectDept.setXmbh(zsyzSbbzb.getXmbh());
-                    zsyzProjectDept.setXmmc(zsyzSbbzb.getXmxsmc());
-                    zsyzProjectDept.setDeptId(sysDept.getDeptId());
-                    zsyzProjectDept.setDeptName(sysDept.getDeptName());
-                    //指派给要素部门
-                    zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
-                }
-                //插入流程记录表
-                SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
-                ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
-                zsyzLcjl.setXmId(zsyzSbbzb.getId());
-                zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
-                zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
-                zsyzLcjl.setDeptId(dept.getDeptId());
-                String deptName = dept.getDeptName();
-                zsyzLcjl.setDeptName(deptName);
-                zsyzLcjl.setProgress(THR);
-                zsyzLcjlService.insertZsyzLcjl(zsyzLcjl);
-            }
-            zsyzSbbzb.setProgress(FOR);
-            zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
-        }
-        //插入流程记录表
-        SysDept dept = SecurityUtils.getLoginUser().getUser().getDept();
-        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
-        zsyzLcjl.setXmId(zsyzSbbzb.getId());
-        zsyzLcjl.setXmmc(zsyzSbbzb.getXmxsmc());
-        zsyzLcjl.setXmbh(zsyzSbbzb.getXmbh());
-        zsyzLcjl.setDeptId(dept.getDeptId());
-        String deptName = dept.getDeptName();
-        zsyzLcjl.setDeptName(deptName);
-        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
-        zsyzLcjlService.insertZsyzLcjl(zsyzLcjl);*/
     }
 
     /**

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

@@ -459,23 +459,23 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         if (zsyzSbbzbs != null && zsyzSbbzbs.size() > 0) {
             Map<String, List<ZsyzSbbzb>> collect = zsyzSbbzbs.stream().collect(Collectors.groupingBy(ZsyzSbbzb::getProgress));
 
-            List<ZsyzSbbzb> stList = collect.get(ST);
+            List<ZsyzSbbzb> stList = collect.get(ONE);
             if (stList != null) {
                 st = stList.size();
             }
-            List<ZsyzSbbzb> cjList = collect.get(CJ);
+            List<ZsyzSbbzb> cjList = collect.get(TWO);
             if (stList != null) {
                 cj = cjList.size();
             }
-            List<ZsyzSbbzb> qyList = collect.get(QY);
+            List<ZsyzSbbzb> qyList = collect.get(THR);
             if (stList != null) {
                 qy = qyList.size();
             }
-            List<ZsyzSbbzb> kgList = collect.get(KG);
+            List<ZsyzSbbzb> kgList = collect.get(FOR);
             if (stList != null) {
                 kg = kgList.size();
             }
-            List<ZsyzSbbzb> tcList = collect.get(TC);
+            List<ZsyzSbbzb> tcList = collect.get(FIV);
             if (stList != null) {
                 tc = tcList.size();
             }
@@ -560,23 +560,23 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 int kgNub = 0;
                 int tcNub = 0;
                 Map<String, List<ZsyzSbbzb>> collect = zsyzSbbzbs.stream().collect(Collectors.groupingBy(ZsyzSbbzb::getProgress));
-                List<ZsyzSbbzb> stList = collect.get(ST);
+                List<ZsyzSbbzb> stList = collect.get(ONE);
                 if (stList != null) {
                     stNub = stList.size();
                 }
-                List<ZsyzSbbzb> cjList = collect.get(CJ);
+                List<ZsyzSbbzb> cjList = collect.get(TWO);
                 if (stList != null) {
                     cjNub = cjList.size();
                 }
-                List<ZsyzSbbzb> qyList = collect.get(QY);
+                List<ZsyzSbbzb> qyList = collect.get(THR);
                 if (stList != null) {
                     qyNub = qyList.size();
                 }
-                List<ZsyzSbbzb> kgList = collect.get(KG);
+                List<ZsyzSbbzb> kgList = collect.get(FOR);
                 if (stList != null) {
                     kgNub = kgList.size();
                 }
-                List<ZsyzSbbzb> tcList = collect.get(TC);
+                List<ZsyzSbbzb> tcList = collect.get(FIV);
                 if (stList != null) {
                     tcNub = tcList.size();
                 }