储备项目新-流程相关内容修改

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/service/ReserveSummaryProcessService.java

@@ -347,6 +347,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
             //删除联合审图的并行任务
             String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
             mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
@@ -382,12 +383,13 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
-            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+//            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
             //删除联合审图的并行任务
             String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
-            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+//            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
             mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
-            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
+//            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
 
             act.preUpdate();
             // 提交流程任务
@@ -417,12 +419,13 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             ActRunTaskTest taskTest = mapper.getByProId(reserveProcess.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
-            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+//            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
             //删除联合审图的并行任务
             String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
-            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+//            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
             mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
-            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
+//            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
 
             act.preUpdate();
             // 提交流程任务
@@ -493,6 +496,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             ActRunTaskTest taskTest = mapper.getByProId(process.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
             //删除联合审图的并行任务
             String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
             mapper.deleteExecution(taskTest.getProcDefId(),taskKey);
@@ -527,12 +531,13 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
             ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+//            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
             mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
             //删除联合审图的并行任务
-            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+//            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
             String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
-            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+//            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
             mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
             return;
 
@@ -565,12 +570,13 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
 
             ActRunTaskTest taskTest = mapper.getByProId(user.getProjectReserveId());
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
-            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+//            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
             mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
             //删除联合审图的并行任务
-            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+//            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
             String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
-            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+//            mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
             mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
             return;
         }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/web/ProcessController.java

@@ -110,10 +110,10 @@ public class ProcessController extends BaseController {
             reserveProcess.setApprovalForm(infoByProId.getApprovalForm());
 
         }
-        if (count>0){
-            model.addAttribute("material", "测试");
-            model.addAttribute("drjgc", "测试");
-        }
+//        if (count>0){
+//            model.addAttribute("material", "测试");
+//            model.addAttribute("drjgc", "测试");
+//        }
 
         model.addAttribute("reserveProcess", reserveProcess);
         return "modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/designUnit";
@@ -277,199 +277,6 @@ public class ProcessController extends BaseController {
                         Double allNum = reserveProcessService.getAllNum("500138348");
                         workService.updateSwitchNum(allNum == null ? "" : allNum + "");
 
-                        //获取新建土建包封数据总和
-                        double bfSum = 0.0;
-                        if (queryService.getTJBFData() != null){
-                            bfSum = bfSum + queryService.getTJBFData();
-
-                        }
-                        //获取新建土建基础数据总和
-                        double jcSum = 0.0;
-                        if (queryService.getTJJCData() != null){
-                            jcSum = jcSum + queryService.getTJJCData();
-
-                        }
-                        double divide = jcSum/bfSum;
-
-//                        //获取所有的 物料编码，扩展描述，总量信息
-//                        List<MaterialData> materialData = queryService.findAllCount();
-//
-//                        //现场浇筑清单
-//                        Double decimal1 = 0.0;
-//                        Double decimal2 = 0.0;
-//                        Double decimal3 = 0.0;
-//                        Double decimal4 = 0.0;
-//                        Double decimal5 = 0.0;
-//                        Double decimal6 = 0.0;
-//
-//                        //预制化清单
-//                        Double decimal7 = 0.0;
-//                        Double decimal8 = 0.0;
-//                        Double decimal9 = 0.0;
-//                        Double decimal10 = 0.0;
-//                        Double decimal11 = 0.0;
-//                        Double decimal12 = 0.0;
-//                        Double decimal13 = 0.0;
-//                        Double decimal14 = 0.0;
-//                        Double decimal15 = 0.0;
-//                        Double decimal16 = 0.0;
-//                        Double decimal17 = 0.0;
-//                        Double decimal18 = 0.0;
-//                        Double decimal19 = 0.0;
-//                        for (int i=0;i<materialData.size();i++){
-//                            if (materialData.get(i).getMaterialCode().equals("乙供")){
-//                                //现场浇筑清单
-//                                if (materialData.get(i).getExtendDescription().equals("配农网用,整套杆,GNH31-13-B")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal1 = decimal1 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("GNH35-13；灌注桩")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal2 = decimal2 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("GNH39-13；灌注桩")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal3 = decimal3 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("GNH31-13；台阶式基础")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal4 = decimal4 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("GNH35-13；台阶式基础")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal5 = decimal5 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("GNH39-13；台阶式基础")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal6 = decimal6 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//
-//                                //预制化清单
-//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，2×3（5+1），≤100kN")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal7 = decimal7 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，2×4（7+1），≤100kN")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal8 = decimal8 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，3×4（11+1），≤100kN")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal9 = decimal9 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×3（11+1），≤100kN")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal10 = decimal10 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×4（15+1），≤100kN")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal11 = decimal11 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化排管，4×5（19+1），≤100kN")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal12 = decimal12 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化直线井，3×2.0×1.9，人孔")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal13 = decimal13 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化三通井，3×2.8×1.9，人孔")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal14 = decimal14 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("预制化八角井，4.0×4.0×1.9，人孔")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal15 = decimal15 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("两进两出环网箱基础预制，3.2×1.15×1.6")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal16 = decimal16 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("两进四出环网箱基础预制，4.0×1.15×1.6")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal17 = decimal17 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("紧凑型箱变基础预制，2.45×1.15×1.6")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal18 = decimal18 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//                                if (materialData.get(i).getExtendDescription().equals("标准型箱变基础预制，3.3×2.2×1.6")
-//                                        & StringUtils.isNotEmpty(materialData.get(i).getTotalCount())){
-//                                    decimal19 = decimal19 + Double.valueOf(materialData.get(i).getTotalCount());
-//                                }
-//
-//                            }
-//
-//                        }
-//
-//                        //设置    现场浇筑清单数据
-//                        String castInPlaceList = "";
-//                        if (StringUtils.isNotEmpty(decimal1.toString()) & decimal1 != 0.0){
-//                            castInPlaceList = decimal1.toString() + "基" + "配农网用,整套杆,GNH31-13-B";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal2.toString()) & decimal2 != 0.0){
-//                            castInPlaceList = castInPlaceList + ";" + decimal2.toString() + "基" + "GNH35-13；灌注桩";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal3.toString()) & decimal3 != 0.0){
-//                            castInPlaceList = castInPlaceList + ";" + decimal3.toString() + "基" + "GNH39-13；灌注桩";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal4.toString()) & decimal4 != 0.0){
-//                            castInPlaceList = castInPlaceList + ";" + decimal4.toString() + "基" + "GNH31-13；台阶式基础";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal5.toString()) & decimal5 != 0.0){
-//                            castInPlaceList = castInPlaceList + ";" + decimal5.toString() + "基" + "GNH35-13；台阶式基础";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal6.toString()) & decimal6 != 0.0){
-//                            castInPlaceList = castInPlaceList + ";" + decimal6.toString() + "基" + "GNH39-13；台阶式基础";
-//                        }
-//
-//                        String designList = "";
-//                        if (StringUtils.isNotEmpty(decimal7.toString()) & decimal7 != 0.0){
-//                            designList = decimal7.toString() + "米" + "预制化排管，2×3（5+1），≤100kN";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal8.toString()) & decimal8 != 0.0){
-//                            designList = designList + ";" + decimal8.toString() + "米" + "预制化排管，2×4（7+1），≤100kN";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal9.toString()) & decimal9 != 0.0){
-//                            designList = designList + ";" + decimal9.toString() + "米" + "预制化排管，3×4（11+1），≤100kN";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal10.toString()) & decimal10 != 0.0){
-//                            designList = designList + ";" + decimal10.toString() + "米" + "预制化排管，4×3（11+1），≤100kN";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal11.toString()) & decimal11 != 0.0){
-//                            designList = designList + ";" + decimal11.toString() + "米" + "预制化排管，4×4（15+1），≤100kN";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal12.toString()) & decimal12 != 0.0){
-//                            designList = designList + ";" + decimal12.toString() + "米" + "预制化排管，4×5（19+1），≤100kN";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal13.toString()) & decimal13 != 0.0){
-//                            designList = designList + ";" + decimal13.toString() + "座" + "预制化直线井，3×2.0×1.9，人孔";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal14.toString()) & decimal14 != 0.0){
-//                            designList = designList + ";" + decimal14.toString() + "座" + "预制化三通井，3×2.8×1.9，人孔";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal15.toString()) & decimal15 != 0.0){
-//                            designList = designList + ";" + decimal15.toString() + "座" + "预制化八角井，4.0×4.0×1.9，人孔";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal16.toString()) & decimal16 != 0.0){
-//                            designList = designList + ";" + decimal16.toString() + "座" + "两进两出环网箱基础预制，3.2×1.15×1.6";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal17.toString()) & decimal17 != 0.0){
-//                            designList = designList + ";" + decimal17.toString() + "座" + "两进四出环网箱基础预制，4.0×1.15×1.6";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal18.toString()) & decimal18 != 0.0){
-//                            designList = designList + ";" + decimal18.toString() + "座" + "紧凑型箱变基础预制，2.45×1.15×1.6";
-//                        }
-//                        if (StringUtils.isNotEmpty(decimal19.toString()) & decimal19 != 0.0){
-//                            designList = designList + ";" + decimal19.toString() + "座" + "标准型箱变基础预制，3.3×2.2×1.6";
-//                        }
-//
-//                        if (divide >0 ){
-//                            //修改  是否含新建土建基础/包封 为是
-//                            preconstructService.updateMetion("是",castInPlaceList,designList);
-//                        }else {
-//                            preconstructService.updateMetion("否",castInPlaceList,designList);
-//                        }
 
                     }else {
                         //修改项目设计单位上传文件部分

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/designUnit.jsp

@@ -138,28 +138,6 @@
 
 				})
 			});
-			/*$("#no").click(function () {
-				jp.prompt("取消流程", function (message) {
-					var projectReserveId = $("#projectReserveId").val();
-					jp.post("${ctx}/cg/reservemanagementcenter/process/actDesignUnit",{
-								"taskId": "${reserveProcess.act.taskId}",
-								"taskName": "${reserveProcess.act.taskName}",
-								"taskDefKey": "${reserveProcess.act.taskDefKey}",
-								"procInsId": "${reserveProcess.act.procInsId}",
-								"procDefId": "${reserveProcess.act.procDefId}",
-								"flag": "no",
-								"projectReserveId":projectReserveId,
-								"comment": window.encodeURI(message)
-							},
-							function (data) {
-								if (data.success) {
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							}
-					)
-				})
-			});*/
 
 			$("#moreImport").click(function(){
 				jp.open({
@@ -202,6 +180,9 @@
 						//当确定的时候将数据查出来
 						var body = top.layer.getChildFrame('body', index);
 						var materialCode = body.find('#projectName').val();
+						var test = $("#drjgc").val();
+						console.log(test + "测试")
+
 						document.getElementById("material").value = materialCode
 						jp.close(index);
 					},