储备流程测试结果三需求功能修改

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/entity/DistributionNetwork.java

@@ -43,16 +43,6 @@ public class DistributionNetwork extends ActEntity<DistributionNetwork> {
     private String problemResolved;           //问题是否解决-经理
     private String problemResolvedDescript;   //问题解决描述-经理
     private String designChange;              //是否需要设计变更-经理
-    private String changeType;                //变更类型-经理
-    private String designChangeType;          //设计变更类型-经理
-    private String reportToLeader;            //是否需要上报业主领导
-    //业主单位领导
-    private String problemSolverLeader;       //问题解决人-领导
-    private String problemResolvedLeader;         //问题是否解决-领导
-    private String problemResolvedDescriptLeader; //问题解决描述-领导
-    private String designChangeLeader;            //是否需要设计变更-领导
-    private String changeTypeLeader;              //变更类型-领导
-    private String designChangeTypeLeader;        //设计变更类型-领导
     private String processStatus;                 //流程状态
 
     public String getReserStatus() {
@@ -297,78 +287,6 @@ public class DistributionNetwork extends ActEntity<DistributionNetwork> {
         this.designChange = designChange;
     }
 
-    public String getChangeType() {
-        return changeType;
-    }
-
-    public void setChangeType(String changeType) {
-        this.changeType = changeType;
-    }
-
-    public String getDesignChangeType() {
-        return designChangeType;
-    }
-
-    public void setDesignChangeType(String designChangeType) {
-        this.designChangeType = designChangeType;
-    }
-
-    public String getReportToLeader() {
-        return reportToLeader;
-    }
-
-    public void setReportToLeader(String reportToLeader) {
-        this.reportToLeader = reportToLeader;
-    }
-
-    public String getProblemSolverLeader() {
-        return problemSolverLeader;
-    }
-
-    public void setProblemSolverLeader(String problemSolverLeader) {
-        this.problemSolverLeader = problemSolverLeader;
-    }
-
-    public String getProblemResolvedLeader() {
-        return problemResolvedLeader;
-    }
-
-    public void setProblemResolvedLeader(String problemResolvedLeader) {
-        this.problemResolvedLeader = problemResolvedLeader;
-    }
-
-    public String getProblemResolvedDescriptLeader() {
-        return problemResolvedDescriptLeader;
-    }
-
-    public void setProblemResolvedDescriptLeader(String problemResolvedDescriptLeader) {
-        this.problemResolvedDescriptLeader = problemResolvedDescriptLeader;
-    }
-
-    public String getDesignChangeLeader() {
-        return designChangeLeader;
-    }
-
-    public void setDesignChangeLeader(String designChangeLeader) {
-        this.designChangeLeader = designChangeLeader;
-    }
-
-    public String getChangeTypeLeader() {
-        return changeTypeLeader;
-    }
-
-    public void setChangeTypeLeader(String changeTypeLeader) {
-        this.changeTypeLeader = changeTypeLeader;
-    }
-
-    public String getDesignChangeTypeLeader() {
-        return designChangeTypeLeader;
-    }
-
-    public void setDesignChangeTypeLeader(String designChangeTypeLeader) {
-        this.designChangeTypeLeader = designChangeTypeLeader;
-    }
-
     public String getProcessStatus() {
         return processStatus;
     }

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/mapper/xml/DistributionDesignChangeMapper.xml

@@ -48,10 +48,6 @@
 		IFNULL(b.drawingTransfer,"") as drawingTransfer,
 		IFNULL(b.drawingTransferTime,"") as drawingTransferTime,
 		IFNULL(b.dataIntegrity,"") as dataIntegrity,
-		IFNULL(c.designChangeType,"") as designChangeType,
-		IFNULL(c.designChangeTypeLeader,"") as designChangeTypeLeader,
-		IFNULL(c.changeType,"") as changeType,
-		IFNULL(c.changeTypeLeader,"") as changeTypeLeader,
 		IFNULL(c.promoter,"") as proposer,
 		IFNULL(c.problemDescript,"") as proposeReasons
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/mapper/xml/DistributionNetworkMapper.xml

@@ -18,16 +18,7 @@
         a.problemSolver,
         a.problemResolved,
         a.problemResolvedDescript,
-        a.designChange,
-        a.changeType,
-        a.designChangeType,
-        a.reportToLeader,
-        a.problemSolverLeader,
-        a.problemResolvedLeader,
-        a.problemResolvedDescriptLeader,
-        a.designChangeLeader,
-        a.changeTypeLeader,
-        a.designChangeTypeLeader
+        a.designChange
 
     </sql>
 
@@ -66,16 +57,7 @@
         IFNULL(b.problemSolver,"") as problemSolver,
         IFNULL(b.problemResolved,"") as problemResolved,
         IFNULL(b.problemResolvedDescript,"") as problemResolvedDescript,
-        IFNULL(b.designChange,"") as designChange,
-        IFNULL(b.changeType,"") as changeType,
-        IFNULL(b.designChangeType,"") as designChangeType,
-        IFNULL(b.reportToLeader,"") as reportToLeader,
-        IFNULL(b.problemSolverLeader,"") as problemSolverLeader,
-        IFNULL(b.problemResolvedLeader,"") as problemResolvedLeader,
-        IFNULL(b.problemResolvedDescriptLeader,"") as problemResolvedDescriptLeader,
-        IFNULL(b.designChangeLeader,"") as designChangeLeader,
-        IFNULL(b.changeTypeLeader,"") as changeTypeLeader,
-        IFNULL(b.designChangeTypeLeader,"") as designChangeTypeLeader
+        IFNULL(b.designChange,"") as designChange
 
     </sql>
 
@@ -96,16 +78,7 @@
         problemSolver,
         problemResolved,
         problemResolvedDescript,
-        designChange,
-        changeType,
-        designChangeType,
-        reportToLeader,
-        problemSolverLeader,
-        problemResolvedLeader,
-        problemResolvedDescriptLeader,
-        designChangeLeader,
-        changeTypeLeader,
-        designChangeTypeLeader
+        designChange
         )
         values
         (
@@ -124,16 +97,7 @@
             #{problemSolver},
             #{problemResolved},
             #{problemResolvedDescript},
-            #{designChange},
-            #{changeType},
-            #{designChangeType},
-            #{reportToLeader},
-            #{problemSolverLeader},
-            #{problemResolvedLeader},
-            #{problemResolvedDescriptLeader},
-            #{designChangeLeader},
-            #{changeTypeLeader},
-            #{designChangeTypeLeader}
+            #{designChange}
             )
     </insert>
 
@@ -154,16 +118,7 @@
         problemSolver,
         problemResolved,
         problemResolvedDescript,
-        designChange,
-        changeType,
-        designChangeType,
-        reportToLeader,
-        problemSolverLeader,
-        problemResolvedLeader,
-        problemResolvedDescriptLeader,
-        designChangeLeader,
-        changeTypeLeader,
-        designChangeTypeLeader
+        designChange
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -183,16 +138,7 @@
             #{item.problemSolver},
             #{item.problemResolved},
             #{item.problemResolvedDescript},
-            #{item.designChange},
-            #{item.changeType},
-            #{item.designChangeType},
-            #{item.reportToLeader},
-            #{item.problemSolverLeader},
-            #{item.problemResolvedLeader},
-            #{item.problemResolvedDescriptLeader},
-            #{item.designChangeLeader},
-            #{item.changeTypeLeader},
-            #{item.designChangeTypeLeader}
+            #{item.designChange}
             )
         </foreach>
     </insert>
@@ -211,16 +157,7 @@
         problemSolver = #{problemSolver},
         problemResolved = #{problemResolved},
         problemResolvedDescript = #{problemResolvedDescript},
-        designChange = #{designChange},
-        changeType = #{changeType},
-        designChangeType = #{designChangeType},
-        reportToLeader = #{reportToLeader},
-        problemSolverLeader = #{problemSolverLeader},
-        problemResolvedLeader = #{problemResolvedLeader},
-        problemResolvedDescriptLeader = #{problemResolvedDescriptLeader},
-        designChangeLeader = #{designChangeLeader},
-        changeTypeLeader = #{changeTypeLeader},
-        designChangeTypeLeader = #{designChangeTypeLeader}
+        designChange = #{designChange}
         where id = #{id}
 	</update>
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/mapper/xml/DistributionNetworkProcessMapper.xml

@@ -36,16 +36,7 @@
         a.problemSolver,
         a.problemResolved,
         a.problemResolvedDescript,
-        a.designChange,
-        a.changeType,
-        a.designChangeType,
-        a.reportToLeader,
-        a.problemSolverLeader,
-        a.problemResolvedLeader,
-        a.problemResolvedDescriptLeader,
-        a.designChangeLeader,
-        a.changeTypeLeader,
-        a.designChangeTypeLeader
+        a.designChange
 
     </sql>
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/util/DistributionExportUtil.java

@@ -74,16 +74,6 @@ public class DistributionExportUtil {
                 Cell cell28 = crateCell(workbook,row,28); //问题解决描述
 
                 Cell cell29 = crateCell(workbook,row,29); //是否需要设计变更
-                Cell cell30 = crateCell(workbook,row,30); //变更类型
-                Cell cell31 = crateCell(workbook,row,31); //设计变更类型
-                Cell cell32 = crateCell(workbook,row,32); //是否需要上报业主领导
-
-                Cell cell33 = crateCell(workbook,row,33); //问题解决人
-                Cell cell34 = crateCell(workbook,row,34); //问题是否解决
-                Cell cell35 = crateCell(workbook,row,35); //问题解决描述
-                Cell cell36 = crateCell(workbook,row,36); //是否需要设计变更
-                Cell cell37 = crateCell(workbook,row,37); //变更类型
-                Cell cell38 = crateCell(workbook,row,38); //设计变更类型
 
                 DistributionNetwork reserveManagement = list.get(i);
 
@@ -123,15 +113,6 @@ public class DistributionExportUtil {
                 cell27.setCellValue(reserveManagement.getProblemResolved());
                 cell28.setCellValue(reserveManagement.getProblemResolvedDescript());
                 cell29.setCellValue(reserveManagement.getDesignChange());
-                cell30.setCellValue(reserveManagement.getChangeType());
-                cell31.setCellValue(reserveManagement.getDesignChangeType());
-                cell32.setCellValue(reserveManagement.getReportToLeader());
-                cell33.setCellValue(reserveManagement.getProblemSolverLeader());
-                cell34.setCellValue(reserveManagement.getProblemResolvedLeader());
-                cell35.setCellValue(reserveManagement.getProblemResolvedDescriptLeader());
-                cell36.setCellValue(reserveManagement.getDesignChangeLeader());
-                cell37.setCellValue(reserveManagement.getChangeTypeLeader());
-                cell38.setCellValue(reserveManagement.getDesignChangeTypeLeader());
 
             }
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/util/DistributionImportUtil.java

@@ -51,15 +51,6 @@ public class DistributionImportUtil {
                 reserveManagement.setProblemResolved((String) importUtil.getCellValue(row,27));
                 reserveManagement.setProblemResolvedDescript((String) importUtil.getCellValue(row,28));
                 reserveManagement.setDesignChange((String) importUtil.getCellValue(row,29));
-                reserveManagement.setChangeType((String) importUtil.getCellValue(row,30));
-                reserveManagement.setDesignChangeType((String) importUtil.getCellValue(row,31));
-                reserveManagement.setReportToLeader((String) importUtil.getCellValue(row,32));
-                reserveManagement.setProblemSolverLeader((String) importUtil.getCellValue(row,33));
-                reserveManagement.setProblemResolvedLeader((String) importUtil.getCellValue(row,34));
-                reserveManagement.setProblemResolvedDescriptLeader((String) importUtil.getCellValue(row,35));
-                reserveManagement.setDesignChangeLeader((String) importUtil.getCellValue(row,36));
-                reserveManagement.setChangeTypeLeader((String) importUtil.getCellValue(row,37));
-                reserveManagement.setDesignChangeTypeLeader((String) importUtil.getCellValue(row,38));
                 reserveManagement.setProcessStatus("0");
 
 

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/web/DistributionController.java

@@ -142,6 +142,23 @@ public class DistributionController {
     }
 
     /**
+     * 业主项目经理再次审核
+     */
+    @RequestMapping(value = "designUnitAgainTwo")
+    public String designUnitAgainTwo(DistributionNetworkProcess reserveProcess, Model model) {
+        //获取当前用户
+        String loginName = UserUtils.getUser().getName();
+        if (StringUtils.isBlank(reserveProcess.getProblemSolverLeader())){
+            reserveProcess.setProblemSolver(loginName);
+        }
+        //查询项目中心领导信息
+        List<String> users = processService.getUserInfo();
+        reserveProcess.setUserList(users);
+        model.addAttribute("reserveProcess", reserveProcess);
+        return "modules/cg/reservemanagementcenter/distribution/process/designUnitAgainTwo";
+    }
+
+    /**
      * 业主领导审核
      */
     @RequestMapping(value = "leaderProcess")
@@ -205,8 +222,6 @@ public class DistributionController {
             network.setProblemResolved(reserveProcess.getProblemResolved());
             network.setProblemResolvedDescript(reserveProcess.getProblemResolvedDescript());
             network.setDesignChange(reserveProcess.getDesignChange());
-            network.setReportToLeader(reserveProcess.getReportToLeader());
-            network.setProblemSolverLeader(reserveProcess.getProblemSolverLeader());
             vars.put("manager", userName);
             vars.put("pass",true);
             vars.put("disAgree",false);
@@ -216,10 +231,7 @@ public class DistributionController {
             //设计单位上传文件
             ReserveProcessProject processProject = projectService.queryByProjectId(reserveProcess.getProjectReserveId());
             network.setProblemSolver("");
-            network.setProblemSolverLeader("");
             network.setDesignChange(reserveProcess.getDesignChange());
-            network.setChangeType(reserveProcess.getChangeType());
-            network.setDesignChangeType(reserveProcess.getDesignChangeType());
             vars.put("manager", UserUtils.getByUserName(processProject.getDesigner()).getLoginName());
             vars.put("pass",false);
             vars.put("disAgree",false);
@@ -236,6 +248,36 @@ public class DistributionController {
     }
 
     /***
+     *  技经人员审核 --  业主项目经理
+     * */
+    @ResponseBody
+    @RequestMapping(value = "actDesignUnitNewTwo")
+    public AjaxJson actDesignUnitNewTwo(Act act, DistributionNetworkProcess reserveProcess) throws Exception {
+        AjaxJson j = new AjaxJson();
+
+        String flag = act.getFlag();
+        //提交流程任务
+        Map<String, Object> vars = Maps.newHashMap();
+        String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+        act.setComment(comment);
+        DistributionNetwork network = networkService.getByReserveId(reserveProcess.getProjectReserveId());
+        if ("agree".equals(flag)){
+            network.setProblemSolver(reserveProcess.getProblemSolver());
+            network.setProblemResolved(reserveProcess.getProblemResolved());
+            network.setProblemResolvedDescript(reserveProcess.getProblemResolvedDescript());
+            network.setProcessStatus("2");
+            vars.put("agree",true);
+        }
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+
+        networkService.update(network);
+        j.setMsg("流程结束");
+        return j;
+    }
+
+    /***
      * 业主项目经理再次审核
      * */
     @ResponseBody
@@ -285,9 +327,10 @@ public class DistributionController {
         DistributionNetwork network = networkService.getByReserveId(reserveProcess.getProjectReserveId());
         ReserveProcessProject processProject = projectService.queryByProjectId(reserveProcess.getProjectReserveId());
         if ("agree".equals(flag)){
-            network.setProcessStatus("2");
+//            network.setProcessStatus("2");
             vars.put("agree",true);
             vars.put("disAgree",false);
+            vars.put("manager", UserUtils.getByUserName(processProject.getOwnerReserveProjectManagre()).getLoginName());
         } else if ("disAgree".equals(flag)){
             vars.put("manager", UserUtils.getByUserName(processProject.getOwnerReserveProjectManagre()).getLoginName());
             //驳回
@@ -317,8 +360,6 @@ public class DistributionController {
         Map<String, Object> vars = Maps.newHashMap();
         DistributionNetwork network = networkService.getByReserveId(reserveProcess.getProjectReserveId());
         if ("agree".equals(flag)){
-            network.setProblemResolvedLeader(reserveProcess.getProblemResolvedLeader());
-            network.setProblemResolvedDescriptLeader(reserveProcess.getProblemResolvedDescriptLeader());
             network.setProcessStatus("2");
             vars.put("agree",true);
             vars.put("disAgree",false);
@@ -326,21 +367,14 @@ public class DistributionController {
         } else if ("disAgree".equals(flag)){
             ReserveProcessProject processProject = projectService.queryByProjectId(reserveProcess.getProjectReserveId());
             //驳回
-            network.setProblemSolverLeader("");
             vars.put("disAgree",true);
             vars.put("agree",false);
             vars.put("tg",false);
             vars.put("manager", UserUtils.getByUserName(processProject.getOwnerReserveProjectManagre()).getLoginName());
-            network.setProblemResolvedLeader(reserveProcess.getProblemResolvedLeader());
         } else if ("tg".equals(flag)){
-            network.setProblemResolvedLeader(reserveProcess.getProblemResolvedLeader());
             //设计单位上传文件
             ReserveProcessProject processProject = projectService.queryByProjectId(reserveProcess.getProjectReserveId());
             network.setProblemSolver(reserveProcess.getProblemSolver());
-            network.setProblemSolverLeader(reserveProcess.getProblemSolverLeader());
-            network.setDesignChangeLeader(reserveProcess.getDesignChangeLeader());
-            network.setChangeTypeLeader(reserveProcess.getChangeTypeLeader());
-            network.setDesignChangeTypeLeader(reserveProcess.getDesignChangeTypeLeader());
             vars.put("manager", UserUtils.getByUserName(processProject.getDesigner()).getLoginName());
             vars.put("disAgree",false);
             vars.put("agree",false);

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/distribution/web/DistributionNetworkController.java

@@ -251,15 +251,6 @@ public class DistributionNetworkController extends BaseController {
             safety.setProblemResolved(reserveManagement.getProblemResolved());
             safety.setProblemResolvedDescript(reserveManagement.getProblemResolvedDescript());
             safety.setDesignChange(reserveManagement.getDesignChange());
-            safety.setChangeType(reserveManagement.getChangeType());
-            safety.setDesignChangeType(reserveManagement.getDesignChangeType());
-            safety.setReportToLeader(reserveManagement.getReportToLeader());
-            safety.setProblemSolverLeader(reserveManagement.getProblemSolverLeader());
-            safety.setProblemResolvedLeader(reserveManagement.getProblemResolvedLeader());
-            safety.setProblemResolvedDescriptLeader(reserveManagement.getProblemResolvedDescriptLeader());
-            safety.setDesignChangeLeader(reserveManagement.getDesignChangeLeader());
-            safety.setChangeTypeLeader(reserveManagement.getChangeTypeLeader());
-            safety.setDesignChangeTypeLeader(reserveManagement.getDesignChangeTypeLeader());
             safety.setProcessStatus("1");
         }else {
             safety.setProjectReserveId(reserveManagement.getProjectReserveId());
@@ -271,15 +262,6 @@ public class DistributionNetworkController extends BaseController {
             safety.setProblemResolved(reserveManagement.getProblemResolved());
             safety.setProblemResolvedDescript(reserveManagement.getProblemResolvedDescript());
             safety.setDesignChange(reserveManagement.getDesignChange());
-            safety.setChangeType(reserveManagement.getChangeType());
-            safety.setDesignChangeType(reserveManagement.getDesignChangeType());
-            safety.setReportToLeader(reserveManagement.getReportToLeader());
-            safety.setProblemSolverLeader(reserveManagement.getProblemSolverLeader());
-            safety.setProblemResolvedLeader(reserveManagement.getProblemResolvedLeader());
-            safety.setProblemResolvedDescriptLeader(reserveManagement.getProblemResolvedDescriptLeader());
-            safety.setDesignChangeLeader(reserveManagement.getDesignChangeLeader());
-            safety.setChangeTypeLeader(reserveManagement.getChangeTypeLeader());
-            safety.setDesignChangeTypeLeader(reserveManagement.getDesignChangeTypeLeader());
             safety.setProcessStatus("1");
             //新增或编辑表单保存
 //            networkService.update(safety);

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/ReserveSummaryProcessMapper.java

@@ -17,6 +17,14 @@ import java.util.List;
 public interface ReserveSummaryProcessMapper extends BaseMapper<ReserveSummaryProcess> {
 
     /**
+     * 根据流程节点的procInsId，与流程节点名称，查询出该节点的任务id
+     * @param procInsId
+     * @param name
+     * @return
+     */
+    String getTaskIdByProcInsIdAndName(@Param("procInsId") String procInsId,@Param("name") String name);
+
+    /**
      * 根据结束时间查下一个节点信息
      * @param instId
      * @param time

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/ReserveSummaryProcessMapper.xml

@@ -448,7 +448,6 @@
         a.drawingSpecification,
         a.demolition,
         a.approvalForm,
-        a.approvalForm,
         a.civilPrefabricate,
         a.powerFailure,
         a.studyReport
@@ -491,4 +490,7 @@
             </if>
         </where>
     </select>
+    <select id="getTaskIdByProcInsIdAndName" resultType="java.lang.String">
+        select ID_ from act_ru_task where PROC_INST_ID_ = #{procInsId} and NAME_ = #{name}
+    </select>
 </mapper>

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/mapper/xml/SummaryStatisticMapper.xml

@@ -276,7 +276,7 @@
     </select>
     <select id="getAllCode"
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
-        select a.projectReserveId,includeReserve,processStatus,startDesignOrNot,disclosureMethod, from cg_reserve_summary_statistics a
+        select a.projectReserveId,includeReserve,processStatus,startDesignOrNot,disclosureMethod from cg_reserve_summary_statistics a
         left join cg_reserve_process b on a.projectReserveId = b.projectReserveId
     </select>
     <select id="getByProId"

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

@@ -481,6 +481,7 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
         act.setTitle(title);
         vars.put("manager",xmjl);
         vars.put("managerTest",cbzz);
+        vars.put("managerUser","sgs");
 
         //指定代理人
 //        vars.put("manager",UserUtils.getByUserName(user.getOwnerProjectManager()).getLoginName());
@@ -617,9 +618,12 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
             mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"省公司评审");
             //删除联合审图的并行任务
             String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "省公司评审");
             mapper.deleteExecution(taskTest.getProcInsId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcInsId(),taskKey2);
 
         } else if ("cancel".equals(flag)){
             //取消-项目取消，修改第六张表的状态
@@ -766,9 +770,12 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
             //删除掉act_ru_task表的联合审图 及 项目经理审图数据
             mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
             mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"省公司评审");
             //删除联合审图的并行任务
             String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "省公司评审");
             mapper.deleteExecution(taskTest.getProcDefId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcDefId(),taskKey2);
 
         } else if ("cancel".equals(flag)){
             //取消-项目取消，修改第六张表的状态

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/utils/ReserveProcessProjectProUtil.java

@@ -571,8 +571,19 @@ public class ReserveProcessProjectProUtil {
                 reserveManagement.setComprehensiveProject("");
                 reserveManagement.setPowerFailureDifficulty((String) importUtil.getCellValue(row,35));
                 reserveManagement.setPowerFailureDescribe((String) importUtil.getCellValue(row,36));
+                //停电难度与其他问题难度必填验证
+                if (reserveManagement.getPowerFailureDifficulty().equals("难")){
+                    if (StringUtils.isBlank(reserveManagement.getPowerFailureDescribe())){
+                        throw new Exception( "项目储备编号为" + reserveManagement.getProjectReserveId() + "的项目的停电描述必须填写！");
+                    }
+                }
                 reserveManagement.setOtherProblemDifficulty((String) importUtil.getCellValue(row,37));
                 reserveManagement.setOtherProblemDescribe((String) importUtil.getCellValue(row,38));
+                if (reserveManagement.getOtherProblemDifficulty().equals("难")){
+                    if (StringUtils.isBlank(reserveManagement.getOtherProblemDescribe())){
+                        throw new Exception( "项目储备编号为" + reserveManagement.getProjectReserveId() + "的项目的其他问题描述必须填写！");
+                    }
+                }
                 reserveManagement.setRunPlanRequire((String) importUtil.getCellValue(row,39));
                 reserveManagement.setProgramChangeDescription((String) importUtil.getCellValue(row,40));
                 reserveManagement.setDiscloseRemarks((String) importUtil.getCellValue(row,41));

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

@@ -1,16 +1,22 @@
 package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.web;
 
+import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ActRunTaskTest;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.CompanyReview;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveProcessProject;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReserveProcessProjectMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReserveSummaryProcessMapper;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.*;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectExportUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.utils.ReserveProcessProjectProUtil;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.service.BudgetStatsService;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
@@ -62,6 +68,9 @@ public class CompanyReviewController extends BaseController {
     @Autowired
     private ProjectTypeVerificateService verificateService;
 
+    @Autowired
+    private ReserveSummaryProcessMapper mapper;
+
     @ModelAttribute
     public CompanyReview get(@RequestParam(required = false) String id) {
         CompanyReview entity = null;
@@ -109,42 +118,100 @@ public class CompanyReviewController extends BaseController {
             List<CompanyReview> companyReviewList = ReserveProcessProjectProUtil.getCompanyUtil(importUtil,proIdList,proIdList2);
             //对 是否通过省公司评审字段进行判断
             //两种情况  1、在流程中  2、流程未开始
-            companyReviewList.forEach(c->{
-                allCode.forEach(a->{
-                    //通过省公司评审的状态
-                    if (c.getPassProvincialCompanyReview().equals("通过") & a.getProjectReserveId().equals(c.getProjectReserveId())){
-
-                    }else if (c.getPassProvincialCompanyReview().equals("取消") & a.getProjectReserveId().equals(c.getProjectReserveId())){
-                        //取消的状态
-                        //流程开始的状态
-//                        if (a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
-                        if (a.getStartDesignOrNot().equals("是") & !a.getProcessStatus().equals("2")){
-                            //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
-                            projectService.updateProcessStatus(a.getProjectReserveId(),3);
-
-                            ReserveSummary summary = new ReserveSummary();
-                            summary.setProjectReserveId(a.getProjectReserveId());
-                            ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
-                            summary1.setStartDesignOrNot("否");
-                            summary1.setReasonForCancel(c.getReviewComments());
-                            statisticService.update(summary1);
-
-                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
-//                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
-                            //取消流程   将流程表中的流程信息删除
-                            service.deleteActivityByProId(a.getProjectReserveId());
 
-                            //将act_ru_task表中的任务删除
+            for (int i=0;i<companyReviewList.size();i++){
+                for (int z=0;z<allCode.size();z++){
+                    if (companyReviewList.get(i).getPassProvincialCompanyReview().equals("不通过") &
+                            allCode.get(z).getProjectReserveId().equals(companyReviewList.get(i).getProjectReserveId())){
+                        if (allCode.get(z).getStartDesignOrNot().equals("是") & !allCode.get(z).getProcessStatus().equals("2")){
+                            //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
+//                            projectService.updateProcessStatus(a.getProjectReserveId(),3);
+//
+//                            ReserveSummary summary = new ReserveSummary();
+//                            summary.setProjectReserveId(a.getProjectReserveId());
+//                            ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+//                            summary1.setStartDesignOrNot("否");
+//                            summary1.setReasonForCancel(c.getReviewComments());
+//                            statisticService.update(summary1);
+//
 //                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
-                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
-                            //删除联合审图的并行任务
-                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
-                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
-
+////                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
+//                            //取消流程   将流程表中的流程信息删除
+//                            service.deleteActivityByProId(a.getProjectReserveId());
+//
+//                            //将act_ru_task表中的任务删除
+////                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+//                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+//                            //删除联合审图的并行任务
+//                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+//                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+                            determineNoPass(companyReviewList.get(i));
+                        }
+                    } else if (companyReviewList.get(i).getPassProvincialCompanyReview().equals("通过") &
+                            allCode.get(z).getProjectReserveId().equals(companyReviewList.get(i).getProjectReserveId())){
+                        if (allCode.get(z).getStartDesignOrNot().equals("是") & !allCode.get(z).getProcessStatus().equals("2")){
+                            //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
+//                            projectService.updateProcessStatus(a.getProjectReserveId(),3);
+//
+//                            ReserveSummary summary = new ReserveSummary();
+//                            summary.setProjectReserveId(a.getProjectReserveId());
+//                            ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+//                            summary1.setStartDesignOrNot("否");
+//                            summary1.setReasonForCancel(c.getReviewComments());
+//                            statisticService.update(summary1);
+//
+//                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+////                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
+//                            //取消流程   将流程表中的流程信息删除
+//                            service.deleteActivityByProId(a.getProjectReserveId());
+//
+//                            //将act_ru_task表中的任务删除
+////                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+//                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+//                            //删除联合审图的并行任务
+//                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+//                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+                            determinePass(companyReviewList.get(i));
                         }
                     }
-                });
-            });
+                }
+            }
+//            companyReviewList.forEach(c->{
+//                allCode.forEach(a->{
+//                    //通过省公司评审的状态
+//                    if (c.getPassProvincialCompanyReview().equals("通过") & a.getProjectReserveId().equals(c.getProjectReserveId())){
+//
+//                    }else if (c.getPassProvincialCompanyReview().equals("不通过") & a.getProjectReserveId().equals(c.getProjectReserveId())){
+//                        //取消的状态
+//                        //流程开始的状态
+////                        if (a.getIncludeReserve().equals("是") & !a.getProcessStatus().equals("2")){
+//                        if (a.getStartDesignOrNot().equals("是") & !a.getProcessStatus().equals("2")){
+//                            //修改基础表的流程字段为取消，修改汇总表的是否纳入储备为取消，将取消原因放入到汇总表的取消原因说明字段 结束流程
+////                            projectService.updateProcessStatus(a.getProjectReserveId(),3);
+////
+////                            ReserveSummary summary = new ReserveSummary();
+////                            summary.setProjectReserveId(a.getProjectReserveId());
+////                            ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+////                            summary1.setStartDesignOrNot("否");
+////                            summary1.setReasonForCancel(c.getReviewComments());
+////                            statisticService.update(summary1);
+////
+////                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+//////                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
+////                            //取消流程   将流程表中的流程信息删除
+////                            service.deleteActivityByProId(a.getProjectReserveId());
+////
+////                            //将act_ru_task表中的任务删除
+//////                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+////                            summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+////                            //删除联合审图的并行任务
+////                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-A0FF4858-9940-4B37-B14E-2DEA24AB37E5");
+////                            summaryProcessService.deleteExecution(taskTest.getProcInsId(),"sid-C92A1CEE-3775-4A11-AAD0-64FA836AC97C");
+//                            determineNoPass(c);
+//                        }
+//                    }
+//                });
+//            });
 
             //查询已有的参数数据 并分类返回已存在数据和未存在数据
             Map map = service.getExistProjectList(companyReviewList);
@@ -153,6 +220,8 @@ public class CompanyReviewController extends BaseController {
             //已存在数据
             List<CompanyReview> existList = (List<CompanyReview>) map.get("exist");
 
+
+
             //对未存在的数据进行批量导入
             if(withoutList.size()>0){
                 service.insertList(withoutList);
@@ -289,6 +358,87 @@ public class CompanyReviewController extends BaseController {
         util.exportCompany(response,workbook,list);
     }
 
+
+    public void determineNoPass(CompanyReview companyReview){
+        ReserveSummary summary = new ReserveSummary();
+        summary.setProjectReserveId(companyReview.getProjectReserveId());
+        ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+        if (null != summary1) {
+//            summary1.setStartDesignOrNot("否");
+//            summary1.setIncludeReserve("不通过");
+//            summary1.setReasonForCancel(companyReview.getReviewComments());
+
+            //执行驳回操作  返回到设计单位上传文件节点
+            Act act = new Act();
+            Map<String, Object> vars = Maps.newHashMap();
+            String procInsId = mapper.getInfoByProId(summary1.getProjectReserveId());
+            ReserveProcessProject user = MyActiviUtils.findCgUser(procInsId);
+            String loginNameByName = mapper.getLoginNameByName(user.getDesigner());
+            vars.put("manager", loginNameByName);
+            vars.put("pass",false);
+            vars.put("tg",true);
+
+            ActRunTaskTest taskTest = mapper.getByProId(summary1.getProjectReserveId());
+            //删除掉act_ru_task表的联合审图 及 项目经理审图数据
+            mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
+            mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+            //删除联合审图的并行任务
+            String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+            String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+            mapper.deleteExecution(taskTest.getProcDefId(),taskKey);
+            mapper.deleteExecution(taskTest.getProcDefId(),taskKey2);
+
+            act.setTitle("设计单位上传施工图纸");
+            act.setProcInsId(procInsId);
+            act.setComment("");
+            String taskId = mapper.getTaskIdByProcInsIdAndName(procInsId,"省公司评审");
+            act.setTaskId(taskId);
+            act.preUpdate();
+            summaryProcessService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+
+//            statisticService.update(summary1);
+
+        }
+    }
+
+    public void determinePass(CompanyReview companyReview){
+        ReserveSummary summary = new ReserveSummary();
+        summary.setProjectReserveId(companyReview.getProjectReserveId());
+        ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+        if (null != summary1) {
+
+            //执行驳回操作  返回到设计单位上传文件节点
+            Act act = new Act();
+            Map<String, Object> vars = Maps.newHashMap();
+            String procInsId = mapper.getInfoByProId(summary1.getProjectReserveId());
+
+            vars.put("pass",true);
+            vars.put("no",false);
+            ActRunTaskTest taskTest = mapper.getByProId(summary1.getProjectReserveId());
+            //从ACT_HI_TASKINST历史表中查看  概预算审核信息（根据时间排序取最近的一个），根据查出来的endTime来查下一个节点是否是设计单位上传文件
+            String time = mapper.selectTimeByName(taskTest.getProcInsId(), "技经人员审预算");
+            if (StringUtils.isEmpty(time)){
+                //说明审预算节点未结束
+            }else {
+                //根据结束时间来查是否有下一个节点
+                String name = mapper.selectNameByTime(taskTest.getProcInsId(), time);
+                if (StringUtils.isEmpty(name)){
+                    //说明还在流程中
+                    projectService.updateProcessStatus(summary1.getProjectReserveId(),2);
+                }
+            }
+
+            act.setProcInsId(procInsId);
+            act.setComment("");
+            String taskId = mapper.getTaskIdByProcInsIdAndName(procInsId,"省公司评审");
+            act.setTaskId(taskId);
+            act.preUpdate();
+            summaryProcessService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+
+        }
+    }
+
     /**
      * 修改表单
      * @param companyReview
@@ -321,6 +471,14 @@ public class CompanyReviewController extends BaseController {
             proId.setCompanyRemarks(companyReview.getCompanyRemarks());
             service.save(proId);
 
+            ReserveSummary reserveSummary = statisticService.getCodeByProId(companyReview.getProjectReserveId());
+            if (companyReview.getPassProvincialCompanyReview().equals("不通过") &reserveSummary.getStartDesignOrNot().equals("是") & !reserveSummary.getProcessStatus().equals("2")){
+
+                determineNoPass(proId);
+            } else if (companyReview.getPassProvincialCompanyReview().equals("通过") &reserveSummary.getStartDesignOrNot().equals("是") & !reserveSummary.getProcessStatus().equals("2")) {
+                determinePass(proId);
+            }
+
         }else {
             proId.setProjectReserveId(companyReview.getProjectReserveId());
             proId.setJoinProvincialCompanyReview(companyReview.getJoinProvincialCompanyReview());
@@ -340,40 +498,79 @@ public class CompanyReviewController extends BaseController {
             //2、流程未开始修改（正常操作不进行其他处理）
             CompanyReview finalProId = proId;
 
-            if (companyReview.getPassProvincialCompanyReview().equals("取消") &reserveSummary.getStartDesignOrNot().equals("是") & !reserveSummary.getProcessStatus().equals("2")){
-
-                ReserveSummary summary = new ReserveSummary();
-                summary.setProjectReserveId(companyReview.getProjectReserveId());
-                ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
-                if (null != summary1) {
-                    summary1.setStartDesignOrNot("否");
-                    summary1.setIncludeReserve("取消");
-                    summary1.setReasonForCancel(companyReview.getReviewComments());
-
-                    ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
-                    //取消流程   将流程表中的流程信息删除
-                    service.deleteActivityByProId(companyReview.getProjectReserveId());
-                    //将act_ru_task表中的任务删除
-
-                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
-                    //删除联合审图的并行任务
-                    String taskKey = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "联合审图");
-                    String taskKey2 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
-                    String taskKey3 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "技经人员审预算");
-                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey);
-                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey2);
-                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey3);
-
-                    projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
-                    statisticService.update(summary1);
-
-                }
+            if (companyReview.getPassProvincialCompanyReview().equals("不通过") &reserveSummary.getStartDesignOrNot().equals("是") & !reserveSummary.getProcessStatus().equals("2")){
+
+//                ReserveSummary summary = new ReserveSummary();
+//                summary.setProjectReserveId(companyReview.getProjectReserveId());
+//                ReserveSummary summary1 = statisticService.queryByProjectReserveId(summary);
+//                if (null != summary1) {
+//                    summary1.setStartDesignOrNot("否");
+//                    summary1.setIncludeReserve("不通过");
+//                    summary1.setReasonForCancel(companyReview.getReviewComments());
+//
+////                    ActRunTaskTest taskTest = summaryProcessService.getByProId(companyReview.getProjectReserveId());
+////                    //取消流程   将流程表中的流程信息删除
+////                    service.deleteActivityByProId(companyReview.getProjectReserveId());
+////                    //将act_ru_task表中的任务删除
+////
+////                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+////                    //删除联合审图的并行任务
+////                    String taskKey = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+////                    String taskKey2 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+////                    String taskKey3 = summaryProcessService.selectTaskKey(taskTest.getProcInsId(), "技经人员审预算");
+////                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey);
+////                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey2);
+////                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey3);
+////
+////                    projectService.updateProcessStatus(companyReview.getProjectReserveId(),3);
+//
+//                    //执行驳回操作  返回到设计单位上传文件节点
+//                    Act act = new Act();
+//                    Map<String, Object> vars = Maps.newHashMap();
+//                    String procInsId = mapper.getInfoByProId(summary1.getProjectReserveId());
+//                    ReserveProcessProject user = MyActiviUtils.findCgUser(procInsId);
+//                    String loginNameByName = mapper.getLoginNameByName(user.getDesigner());
+//                    vars.put("manager", loginNameByName);
+//                    vars.put("pass",false);
+//                    vars.put("tg",true);
+//                    vars.put("no",false);
+//                    vars.put("rural",false);
+//
+//                    ActRunTaskTest taskTest = mapper.getByProId(summary1.getProjectReserveId());
+//                    //删除掉act_ru_task表的联合审图 及 项目经理审图数据
+//                    mapper.deleteByProcId(taskTest.getProcInsId(),"项目经理审图");
+//                    mapper.deleteByProcId(taskTest.getProcInsId(),"技经人员审预算");
+//                    mapper.deleteByProcId(taskTest.getProcInsId(),"联合审图");
+//                    //删除联合审图的并行任务
+//                    String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+//                    String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+//                    mapper.deleteExecution(taskTest.getProcDefId(),taskKey);
+//                    mapper.deleteExecution(taskTest.getProcDefId(),taskKey2);
+//
+//                    act.setTitle("设计单位上传施工图纸");
+//                    act.setProcInsId(procInsId);
+//                    act.setComment("");
+//                    String taskId = mapper.getTaskIdByProcInsIdAndName(procInsId,"省公司评审");
+//                    act.setTaskId(taskId);
+//                    act.preUpdate();
+//                    summaryProcessService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+//
+//                    statisticService.update(summary1);
+//
+//                }
                 //新增或编辑表单保存
+                determineNoPass(finalProId);
                 service.update(finalProId);
 
                 j.setSuccess(true);
                 j.setMsg("修改省公司评审信息成功");
-            }else {
+            }else if (companyReview.getPassProvincialCompanyReview().equals("通过") &reserveSummary.getStartDesignOrNot().equals("是") & !reserveSummary.getProcessStatus().equals("2")){
+                determinePass(finalProId);
+                service.update(finalProId);
+
+                j.setSuccess(true);
+                j.setMsg("修改省公司评审信息成功");
+            } else {
                 //新增或编辑表单保存
                 service.update(finalProId);
 

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

@@ -43,12 +43,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -129,6 +127,7 @@ public class ProcessController extends BaseController {
             reserveProcess.setApprovalForm(infoByProId.getApprovalForm());
             reserveProcess.setCivilPrefabricate(infoByProId.getCivilPrefabricate());
             reserveProcess.setPowerFailure(infoByProId.getPowerFailure());
+            reserveProcess.setStudyReport(infoByProId.getStudyReport());
 
         }
 //        if (count>0){
@@ -168,6 +167,15 @@ public class ProcessController extends BaseController {
     }
 
     /**
+     * 省公司评审
+     */
+    @RequestMapping(value = "provincialCompany")
+    public String provincialCompany(ReserveSummaryProcess reserveProcess, Model model) {
+        model.addAttribute("reserveProcess", reserveProcess);
+        return "modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/provincialCompany";
+    }
+
+    /**
      * 联合审图（储备专职/配网项目经理）
      */
     @RequestMapping(value = "drawingReviewTest")
@@ -214,7 +222,8 @@ public class ProcessController extends BaseController {
     }
 
     @RequestMapping(value = "/importMore/Process")
-    public String importProcess(Model model){
+    public String importProcess(Model model,String proName){
+        model.addAttribute("proName", proName);
         return "modules/cg/reservemanagementcenter/reserveManage/summaryStatistics/importProcessTest";
     }
 
@@ -228,57 +237,9 @@ public class ProcessController extends BaseController {
 
         //判断项目建议书及可研报告是否必填
         ReserveProcessProject reserveProcessProject = reserveProcessProjectService.queryByProjectId(reserveProcess.getProjectReserveId());
-        if (reserveProcessProject.getNetRackProjectDivide().equals("网架")){
-            if (StringUtils.isBlank(reserveProcess.getStudyReport())){
-                j.setMsg("可研报告不能为空!");
-                j.setSuccess(false);
-                return j;
-            }
-        } else if (reserveProcessProject.getNetRackProjectDivide().equals("非网架")){
-            // 获取当前项目的路径
-            File file = new File(reserveProcess.getBudgetStatement());
-            String filePath = file.getAbsolutePath();
-            int index = file.getAbsolutePath().indexOf("fileServer");
-            String FILE_PREFIX = loader.getProperty("linux.file.store.prefix");
-
-            if (SYS_TYPE.equals("1")) {
-                filePath = filePath.substring(index-1);
-
-            } else {
-                //liunx file store prefix
-                filePath = FILE_PREFIX + Servlets.getRequest().getContextPath() + filePath.substring(index-1);
-                filePath = filePath.replaceAll("\\\\","/");
-            }
-
-            //读取上传的预算书文件，判断是否必填
-//            String filePath = reserveProcess.getBudgetStatement();
-            String sheetName = "总算表(表一)";
-            int rowIndex = 22;
-            int columnIndex = 7;
-
-            FileInputStream fis = new FileInputStream(filePath);
-            Workbook workbook = new XSSFWorkbook(fis);
-
-            //获取指定的工作表
-            Sheet sheet = workbook.getSheet(sheetName);
-            Row row = sheet.getRow(rowIndex);
-            Cell cell = row.getCell(columnIndex);
-            if (cell != null) {
-                double cellValueAsDouble = cell.getNumericCellValue();
-                if (cellValueAsDouble>=30){
-                    if (StringUtils.isBlank(reserveProcess.getStudyReport())){
-                        j.setMsg("可研报告不能为空!");
-                        j.setSuccess(false);
-                        return j;
-                    }
-                }else if (cellValueAsDouble<30){
-                    if (StringUtils.isBlank(reserveProcess.getProjectProposal())){
-                        j.setMsg("项目建议书不能为空!");
-                        j.setSuccess(false);
-                        return j;
-                    }
-                }
-            }
+        j = needJysReport(reserveProcess, reserveProcessProject);
+        if (!j.isSuccess()){
+            return j;
         }
 
         if (material != null || drjgc != null){
@@ -385,6 +346,25 @@ public class ProcessController extends BaseController {
             }
         }
 
+        //根据甲供材信息判断是否需上传土建现浇审批单
+        List<MaterialInfo> materialInfos = reserveProcessService.findMaterialActiviti(reserveProcess.getProjectName());
+        if (StringUtils.isBlank(reserveProcess.getApprovalForm())){
+            j = determineTjUpload(materialInfos);
+            if (!j.isSuccess()){
+                return j;
+            }
+        }
+
+        //根据甲供材信息判断是否需上传土建预制化审批单 determineTjYzhUpload
+        if (StringUtils.isBlank(reserveProcess.getCivilPrefabricate())){
+
+            j = determineTjYzhUpload(materialInfos);
+            if (!j.isSuccess()){
+                return j;
+            }
+        }
+
+
         j.setMsg("审批成功");
         return j;
     }
@@ -947,4 +927,106 @@ public class ProcessController extends BaseController {
         j.setMsg("审批成功");
         return j;
     }
+
+    /**
+     * 判断项目建议书及可研报告是否必填
+     * @param reserveProcess
+     * @param reserveProcessProject
+     * @return
+     * @throws IOException
+     */
+    public AjaxJson needJysReport(ReserveSummaryProcess reserveProcess,ReserveProcessProject reserveProcessProject) throws IOException {
+        AjaxJson j = new AjaxJson();
+        if (reserveProcessProject.getNetRackProjectDivide().equals("网架")){
+            if (StringUtils.isBlank(reserveProcess.getStudyReport())){
+                j.setMsg("可研报告不能为空!");
+                j.setSuccess(false);
+                return j;
+            }
+        } else if (reserveProcessProject.getNetRackProjectDivide().equals("非网架")){
+            // 获取当前项目的路径
+            File file = new File(reserveProcess.getBudgetStatement());
+            String filePath = file.getAbsolutePath();
+            int index = file.getAbsolutePath().indexOf("fileServer");
+            String FILE_PREFIX = loader.getProperty("linux.file.store.prefix");
+
+            if (SYS_TYPE.equals("1")) {
+                filePath = filePath.substring(index-1);
+
+            } else {
+                //liunx file store prefix
+                filePath = FILE_PREFIX + Servlets.getRequest().getContextPath() + filePath.substring(index-1);
+                filePath = filePath.replaceAll("\\\\","/");
+            }
+
+            //读取上传的预算书文件，判断是否必填
+//            String filePath = reserveProcess.getBudgetStatement();
+            String sheetName = "总算表(表一)";
+            int rowIndex = 22;
+            int columnIndex = 7;
+
+            FileInputStream fis = new FileInputStream(filePath);
+            Workbook workbook = new XSSFWorkbook(fis);
+
+            //获取指定的工作表
+            Sheet sheet = workbook.getSheet(sheetName);
+            Row row = sheet.getRow(rowIndex);
+            Cell cell = row.getCell(columnIndex);
+            if (cell != null) {
+                double cellValueAsDouble = cell.getNumericCellValue();
+                if (cellValueAsDouble>=30){
+                    if (StringUtils.isBlank(reserveProcess.getStudyReport())){
+                        j.setMsg("可研报告不能为空!");
+                        j.setSuccess(false);
+                        return j;
+                    }
+                }else if (cellValueAsDouble<30){
+                    if (StringUtils.isBlank(reserveProcess.getProjectProposal())){
+                        j.setMsg("项目建议书不能为空!");
+                        j.setSuccess(false);
+                        return j;
+                    }
+                }
+            }
+        }
+        return j;
+    }
+
+    //判断是否需要上传土建现浇审批单
+    public AjaxJson determineTjUpload(List<MaterialInfo> list) {
+        AjaxJson j = new AjaxJson();
+        String tjNames[] = {"直线电缆井，钢混，3×1.6×1.9，人孔","直线电缆井，钢混，6×1.6×1.9，人孔","三通电缆井，钢混，5×1.6×1.9，人孔",
+                "四通电缆井，钢混，5×（1.6/1.6）×1.9，人孔","转弯电缆井，钢混，（6—10）×1.6×1.9，人孔","环网柜基础","分支箱基础",
+                "箱变基础","钢筋混凝土，单侧3层，3*500mm，9根，1200*1100","钢筋混凝土，单侧4层，4*500mm，12根，1200*1350",
+                "钢筋混凝土，双侧4层，2*4*500mm，24根，1900*1350"};
+        List<String> tjNameList = Arrays.asList(tjNames);
+        for (MaterialInfo materialInfo : list) {
+            if (tjNameList.contains(materialInfo.getMaterialName())){
+                j.setMsg("土建现浇审批单不能为空!");
+                j.setSuccess(false);
+                return j;
+            }
+        }
+        j.setSuccess(true);
+        return j;
+    }
+
+    //判断是否需要上传土建预制化审批单
+    public AjaxJson determineTjYzhUpload(List<MaterialInfo> list) {
+        AjaxJson j = new AjaxJson();
+        String tjNames[] = {"预制化排管，2×3（5+1），≤100kN","预制化排管，2×4（7+1），≤100kN","预制化排管，3×4（11+1），≤100kN","预制化排管，4×3（11+1），≤100kN",
+                        "预制化排管，4×4（15+1），≤100kN","预制化排管，4×5（19+1），≤100kN","预制化直线井，3×2.0×1.9，人孔",
+                        "预制化三通井，3×2.8×1.9，人孔","预制化八角井，4.0×4.0×1.9，人孔","两进两出环网箱基础预制，3.2×1.15×1.6",
+                        "两进四出环网箱基础预制，4.0×1.15×1.6","紧凑型箱变基础预制，2.45×1.15×1.6"};
+        List<String> tjNameList = Arrays.asList(tjNames);
+        for (MaterialInfo materialInfo : list) {
+            if (tjNameList.contains(materialInfo.getMaterialName())){
+                j.setMsg("土建预制化审批单不能为空!");
+                j.setSuccess(false);
+                return j;
+            }
+        }
+        j.setSuccess(true);
+        return j;
+    }
 }

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

@@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -311,6 +312,8 @@ public class SummaryStatisticController extends BaseController {
                     if (!proId.getCompleteDiscloseTime().equals(reserveManagement.getCompleteDiscloseTime())){
                         //根据项目储备编号修改交底完成时间
                         proId.setCompleteDiscloseTime(reserveManagement.getCompleteDiscloseTime());
+                        proId.setUpdateDate(new Date());
+                        proId.setUpdateBy(UserUtils.getUser());
                         statisticService.update(proId);
                         j.setSuccess(true);
                         j.setMsg("修改成功！");
@@ -394,6 +397,8 @@ public class SummaryStatisticController extends BaseController {
                 proId.setDisclosureMethod(reserveManagement.getDisclosureMethod());
                 proId.setCompleteDisclose(reserveManagement.getCompleteDisclose());
                 proId.setCompleteDiscloseTime(reserveManagement.getCompleteDiscloseTime());
+                proId.setUpdateDate(new Date());
+                proId.setUpdateBy(UserUtils.getUser());
                 //新增或编辑表单保存
                 statisticService.update(proId);
 //            }else if (companyReview.getPassProvincialCompanyReview().equals("取消") & reserveManagement.getIncludeReserve().equals("是")){
@@ -408,6 +413,8 @@ public class SummaryStatisticController extends BaseController {
                     if (!proId.getCompleteDiscloseTime().equals(reserveManagement.getCompleteDiscloseTime())){
                         //根据项目储备编号修改交底完成时间
                         proId.setCompleteDiscloseTime(reserveManagement.getCompleteDiscloseTime());
+                        proId.setUpdateDate(new Date());
+                        proId.setUpdateBy(UserUtils.getUser());
                         statisticService.update(proId);
                         j.setSuccess(true);
                         j.setMsg("修改成功！");
@@ -492,6 +499,8 @@ public class SummaryStatisticController extends BaseController {
             proId.setDisclosureMethod(reserveManagement.getDisclosureMethod());
             proId.setCompleteDiscloseTime(reserveManagement.getCompleteDiscloseTime());
             proId.setCompleteDisclose(reserveManagement.getCompleteDisclose());
+            proId.setUpdateDate(new Date());
+            proId.setUpdateBy(UserUtils.getUser());
             statisticService.update(proId);
         }
         j.setSuccess(true);
@@ -635,6 +644,8 @@ public class SummaryStatisticController extends BaseController {
                 for (ReserveSummary reserveManagement : existList) {
                     //去掉之前的流程，重新开始流程
                     reserveProcessService.deleteAct(reserveManagement.getProjectReserveId());
+                    reserveManagement.setUpdateDate(new Date());
+                    reserveManagement.setUpdateBy(UserUtils.getUser());
                     statisticService.update(reserveManagement);
 //                    if (reserveManagement.getIncludeReserve().equals("是")){
                     if (reserveManagement.getStartDesignOrNot().equals("是")){

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/entity/ProgressStats.java

@@ -14,12 +14,15 @@ public class ProgressStats extends DataEntity<ProgressStats> {
     private String demandUnit;              //需求单位
     private String district;                //区域
     private String projectGroup;            //项目分组
+    private String projectManagre;          //项目经理
     private String reserveBatches;          //储备批次
     private String blockSupply;             //供电区域
     private String gridNumber;              //网格编号
     private String cellNumber;              //单元格编号
     private String projectReserveId;        //项目储备编号
     private String projectName;             //项目名称
+    private String stateGridProjectCode;             //国网项目编码
+    private String stateGridProjectName;             //国网项目名称
     private String constructionNecessityAndContent;           //建设必要性及内容
     private String substationName;           //变电站名称
     private String circuitName;              //线路名称
@@ -41,12 +44,11 @@ public class ProgressStats extends DataEntity<ProgressStats> {
     private String onSiteConfess;                   //是否进行现场交底
     private String confessCompleteTime;             //交底完成时间
 
-    private String includeReserve;          //是否进行储备
+//    private String includeReserve;          //是否进行储备
     private String completeDesign;          //是否完成初设
     private String submitTime;              //初设提交时间
 
-    private String completeDraw;            //是否进行审图
-    private String completeDrawDate;        //审图日期
+    private String completeDraw;            //是否完成审图
     private String drawAudit;               //是否通过图纸审核
     private String passAuditDate;           //通过审核日期
     private String reasonForFailure;        //未通过原因分析
@@ -55,7 +57,6 @@ public class ProgressStats extends DataEntity<ProgressStats> {
 
 
     private String whetherToAudit;                  //概预算-是否进行审核
-    private String auditDate;                       //概预算-审核日期
     private String expertReview;                    //概预算-是否通过专家审核
     private String estimatePassAuditDate;           //概预算-通过审核日期
     private String estimateReasonForFailure;        //概预算-未通过原因分析
@@ -72,17 +73,12 @@ public class ProgressStats extends DataEntity<ProgressStats> {
     private String drawingReview;                   //图纸联合审查-是否进行图纸审查
     private String reviewDate;                      //图纸联合审查-联合审图日期
     private String passDrawingReview;               //图纸联合审查-是否通过图纸审查
-    private String approvedDate;                    //图纸联合审查-通过联合审图日期
     private String reviewComment;                   //图纸联合审查-审图意见
     private String jointReviewDesignChange;         //图纸联合审查-是否需设计变更
     private String drawingUnionRemarks;             //图纸联合审查-备注
 
-    private String drawingFinalize;                 //图纸是否定稿
-    private String finalDate;                       //定稿日期
-    private String formalDrawing;                   //是否打印正式图纸
-    private String drawingDate;                     //通知出图日期
-    private String transferProjectCenterDate;       //正式图纸移交项目中心日期
-    private String transferToConstructionUnitDate;  //正式图纸移交施工单位日期
+    private String projectCancel;                   //项目是否取消
+    private String implementReserve;                //是否纳入储备库
 
     private String completeReserve;   //是否完成储备
 
@@ -126,6 +122,14 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.projectGroup = projectGroup;
     }
 
+    public String getProjectManagre() {
+        return projectManagre;
+    }
+
+    public void setProjectManagre(String projectManagre) {
+        this.projectManagre = projectManagre;
+    }
+
     public String getReserveBatches() {
         return reserveBatches;
     }
@@ -174,6 +178,22 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.projectName = projectName;
     }
 
+    public String getStateGridProjectCode() {
+        return stateGridProjectCode;
+    }
+
+    public void setStateGridProjectCode(String stateGridProjectCode) {
+        this.stateGridProjectCode = stateGridProjectCode;
+    }
+
+    public String getStateGridProjectName() {
+        return stateGridProjectName;
+    }
+
+    public void setStateGridProjectName(String stateGridProjectName) {
+        this.stateGridProjectName = stateGridProjectName;
+    }
+
     public String getConstructionNecessityAndContent() {
         return constructionNecessityAndContent;
     }
@@ -318,14 +338,6 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.confessCompleteTime = confessCompleteTime;
     }
 
-    public String getIncludeReserve() {
-        return includeReserve;
-    }
-
-    public void setIncludeReserve(String includeReserve) {
-        this.includeReserve = includeReserve;
-    }
-
     public String getCompleteDesign() {
         return completeDesign;
     }
@@ -350,14 +362,6 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.completeDraw = completeDraw;
     }
 
-    public String getCompleteDrawDate() {
-        return completeDrawDate;
-    }
-
-    public void setCompleteDrawDate(String completeDrawDate) {
-        this.completeDrawDate = completeDrawDate;
-    }
-
     public String getDrawAudit() {
         return drawAudit;
     }
@@ -406,14 +410,6 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.whetherToAudit = whetherToAudit;
     }
 
-    public String getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(String auditDate) {
-        this.auditDate = auditDate;
-    }
-
     public String getExpertReview() {
         return expertReview;
     }
@@ -526,14 +522,6 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.passDrawingReview = passDrawingReview;
     }
 
-    public String getApprovedDate() {
-        return approvedDate;
-    }
-
-    public void setApprovedDate(String approvedDate) {
-        this.approvedDate = approvedDate;
-    }
-
     public String getReviewComment() {
         return reviewComment;
     }
@@ -558,52 +546,20 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.drawingUnionRemarks = drawingUnionRemarks;
     }
 
-    public String getDrawingFinalize() {
-        return drawingFinalize;
-    }
-
-    public void setDrawingFinalize(String drawingFinalize) {
-        this.drawingFinalize = drawingFinalize;
-    }
-
-    public String getFinalDate() {
-        return finalDate;
-    }
-
-    public void setFinalDate(String finalDate) {
-        this.finalDate = finalDate;
-    }
-
-    public String getFormalDrawing() {
-        return formalDrawing;
-    }
-
-    public void setFormalDrawing(String formalDrawing) {
-        this.formalDrawing = formalDrawing;
-    }
-
-    public String getDrawingDate() {
-        return drawingDate;
-    }
-
-    public void setDrawingDate(String drawingDate) {
-        this.drawingDate = drawingDate;
-    }
-
-    public String getTransferProjectCenterDate() {
-        return transferProjectCenterDate;
+    public String getProjectCancel() {
+        return projectCancel;
     }
 
-    public void setTransferProjectCenterDate(String transferProjectCenterDate) {
-        this.transferProjectCenterDate = transferProjectCenterDate;
+    public void setProjectCancel(String projectCancel) {
+        this.projectCancel = projectCancel;
     }
 
-    public String getTransferToConstructionUnitDate() {
-        return transferToConstructionUnitDate;
+    public String getImplementReserve() {
+        return implementReserve;
     }
 
-    public void setTransferToConstructionUnitDate(String transferToConstructionUnitDate) {
-        this.transferToConstructionUnitDate = transferToConstructionUnitDate;
+    public void setImplementReserve(String implementReserve) {
+        this.implementReserve = implementReserve;
     }
 
     public String getCompleteReserve() {

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/mapper/xml/ProgressStatsMapper.xml

@@ -26,6 +26,7 @@
 		a.requirementType,
 		a.costEstimate,
 		a.basicRemarks,
+		a.ownerReserveProjectManagre as projectManagre,
 		IFNULL(b.inspectDepartmentReview,"") as inspectDepartmentReview,
 		IFNULL(b.inspectDepartmentReviewTime,"") as inspectDepartmentReviewTime,
 		IFNULL(b.releaseReserveTime,"") as releaseReserveTime,
@@ -35,10 +36,10 @@
 		IFNULL(b.drawRemarks,"") as drawRemarks,
 		IFNULL(b.budgetRemarks,"") as budgetRemarks,
 		IFNULL(b.drawingUnionRemarks,"") as drawingUnionRemarks,
-		IFNULL(b.drawingDate,"") as drawingDate,
-        IFNULL(c.includeReserve,"") as implementPlan,
+		IFNULL(b.projectCancel,"") as projectCancel,
+        IFNULL(e.implementPlan,"") as implementPlan,
 --         IFNULL(c.initialImplementBatch,"") as initialImplementBatch,
-        IFNULL(c.includeReserve,"") as includeReserve,
+--         IFNULL(c.includeReserve,"") as includeReserve,
 --         IFNULL(c.drawOfficeDrawn,"") as formalDrawing,
         IFNULL(d.joinProvincialCompanyReview,"") as provincialCompanyReview,
         IFNULL(d.batchOfProvincialCompany,"") as provincialCompanyReviewBatch,
@@ -46,6 +47,7 @@
         IFNULL(d.reviewComments,"") as causeAnalysis,
         IFNULL(d.designChangeRequired,"") as designChange,
         IFNULL(d.companyRemarks,"") as provincialCompanyRemarks,
+        IFNULL(c.includeReserve,"") as implementReserve,
         tv.projectNatureArtificial AS projectNature
     </sql>
 
@@ -67,7 +69,7 @@
         drawRemarks,
         budgetRemarks,
         drawingUnionRemarks,
-        drawingDate
+        projectCancel
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -88,7 +90,7 @@
             #{item.drawRemarks},
             #{item.budgetRemarks},
             #{item.drawingUnionRemarks},
-            #{item.drawingDate}
+            #{item.projectCancel}
             )
         </foreach>
     </insert>
@@ -106,6 +108,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_reserve_company_review d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_screen e on a.projectReserveId = e.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0
@@ -145,6 +148,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_reserve_company_review d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_screen e on a.projectReserveId = e.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         where a.id = #{id}
     </select>
@@ -162,6 +166,7 @@
         on a.projectReserveId = c.projectReserveId
         left join cg_reserve_company_review d
         on a.projectReserveId = d.projectReserveId
+        left join cg_project_screen e on a.projectReserveId = e.projectReserveId
         left join cg_project_type_verificate tv on a.projectReserveId = tv.projectReserveId
         <where>
             a.del_flag = 0

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/service/ProgressStatsService.java

@@ -43,7 +43,7 @@ public class ProgressStatsService extends CrudService<ProgressStatsMapper, Progr
     }
 
     @Transactional(readOnly = false)
-    public void insertList(@Param("list") List<ProgressStats> list){
+    public void insertList(List<ProgressStats> list){
         List<ProgressStats> statsList = mapper.exportFindList(null);
         for(ProgressStats progressStats : list){
             statsList.forEach(sta->{

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/util/ExcelExportUtil.java

@@ -514,59 +514,65 @@ public class ExcelExportUtil {
                 Cell cell3 = crateCell(workbook,row,3); //需求单位
                 Cell cell4 = crateCell(workbook,row,4); //区域
                 Cell cell5 = crateCell(workbook,row,5); //项目分组
-                Cell cell6 = crateCell(workbook,row,6); //储备批次
-                Cell cell7 = crateCell(workbook,row,7); //供电区域
-                Cell cell8 = crateCell(workbook,row,8); //网格编号
-                Cell cell9 = crateCell(workbook,row,9); //单元格编号
-                Cell cell10 = crateCell(workbook,row,10); //项目储备编号
-                Cell cell11 = crateCell(workbook,row,11); //项目名称
-                Cell cell12 = crateCell(workbook,row,12); //建设必要性及内容
-                Cell cell13 = crateCell(workbook,row,13); //变电站名称
-                Cell cell14 = crateCell(workbook,row,14); //线路名称
-                Cell cell15 = crateCell(workbook,row,15); //网架项目划分
-                Cell cell16 = crateCell(workbook,row,16); //需求类型
-                Cell cell17 = crateCell(workbook,row,17); //费用估算
-                Cell cell18 = crateCell(workbook,row,18); //备注
-                Cell cell19 = crateCell(workbook,row,19); //储备进度
-                Cell cell20 = crateCell(workbook,row,20); //是否纳入实施计划
-                Cell cell21 = crateCell(workbook,row,21); //初定实施批次
-                Cell cell22 = crateCell(workbook,row,22); //是否通过运检部评审
-                Cell cell23 = crateCell(workbook,row,23); //通过运检部评审时间
-                Cell cell24 = crateCell(workbook,row,24); //运检部下达储备时间
-                Cell cell25 = crateCell(workbook,row,25); //是否发出设计委托
-                Cell cell26 = crateCell(workbook,row,26); //设计委托发出时间
-                Cell cell27 = crateCell(workbook,row,27); //初设提交限定日期
-                Cell cell28 = crateCell(workbook,row,28); //是否进行现场交底
-                Cell cell29 = crateCell(workbook,row,29); //交底完成时间
-                Cell cell30 = crateCell(workbook,row,30); //是否完成初设
-                Cell cell31 = crateCell(workbook,row,31); //初设提交时间
-                Cell cell32 = crateCell(workbook,row,32); //是否完成审图
-                Cell cell33 = crateCell(workbook,row,33); //是否通过图纸审核
-                Cell cell34 = crateCell(workbook,row,34); //未通过原因分析
-                Cell cell35 = crateCell(workbook,row,35); //通过审核日期
-                Cell cell36 = crateCell(workbook,row,36); //是否需设计变更
-                Cell cell37 = crateCell(workbook,row,37); //项目经理审图-备注
-
-                Cell cell38 = crateCell(workbook,row,38); //概预算-是否完成审核
-                Cell cell39 = crateCell(workbook,row,39); //概预算-是否通过专家审核
-                Cell cell40 = crateCell(workbook,row,40); //概预算-未通过原因分析
-                Cell cell41 = crateCell(workbook,row,41); //概预算-通过审核日期
-                Cell cell42 = crateCell(workbook,row,42); //概预算-是否需设计变更
-                Cell cell43 = crateCell(workbook,row,43); //概预算审核-备注
-                Cell cell44 = crateCell(workbook,row,44); //是否参加省公司评审
-                Cell cell45 = crateCell(workbook,row,45); //省公司评审批次/日期
-                Cell cell46 = crateCell(workbook,row,46); //是否通过省公司评审
-                Cell cell47 = crateCell(workbook,row,47); //评审意见
-                Cell cell48 = crateCell(workbook,row,48); //是否需设计变更
-                Cell cell49 = crateCell(workbook,row,49); //省公司评审-备注
-
-                Cell cell50 = crateCell(workbook,row,50); //图纸联合审查-是否进行图纸审查
-                Cell cell51 = crateCell(workbook,row,51); //图纸联合审查-联合审图日期
-                Cell cell52 = crateCell(workbook,row,52); //图纸联合审查-是否通过图纸审查
-                Cell cell53 = crateCell(workbook,row,53); //图纸联合审查-审图意见
-                Cell cell54 = crateCell(workbook,row,54); //图纸联合审查-是否需设计变更
-                Cell cell55 = crateCell(workbook,row,55); //图纸联合审查-备注
-                Cell cell56 = crateCell(workbook,row,56); //是否完成储备
+                Cell cell6 = crateCell(workbook,row,6); //项目经理
+                Cell cell7 = crateCell(workbook,row,7); //储备批次
+                Cell cell8 = crateCell(workbook,row,8); //供电区域
+                Cell cell9 = crateCell(workbook,row,9); //网格编号
+                Cell cell10 = crateCell(workbook,row,10); //单元格编号
+                Cell cell11 = crateCell(workbook,row,11); //项目储备编号
+                Cell cell12 = crateCell(workbook,row,12); //项目名称
+                Cell cell13 = crateCell(workbook,row,13); //国网项目编码
+                Cell cell14 = crateCell(workbook,row,14); //国网项目名称
+                Cell cell15 = crateCell(workbook,row,15); //建设必要性及内容
+                Cell cell16 = crateCell(workbook,row,16); //变电站名称
+                Cell cell17 = crateCell(workbook,row,17); //线路名称
+                Cell cell18 = crateCell(workbook,row,18); //网架项目划分
+                Cell cell19 = crateCell(workbook,row,19); //需求类型
+                Cell cell20 = crateCell(workbook,row,20); //费用估算
+                Cell cell21 = crateCell(workbook,row,21); //备注
+                Cell cell22 = crateCell(workbook,row,22); //储备进度
+                Cell cell23 = crateCell(workbook,row,23); //是否纳入实施计划
+                Cell cell24 = crateCell(workbook,row,24); //初定实施批次
+                Cell cell25 = crateCell(workbook,row,25); //是否通过运检部评审
+                Cell cell26 = crateCell(workbook,row,26); //通过运检部评审时间
+                Cell cell27 = crateCell(workbook,row,27); //运检部下达储备时间
+                Cell cell28 = crateCell(workbook,row,28); //是否发出设计委托
+                Cell cell29 = crateCell(workbook,row,29); //设计委托发出时间
+                Cell cell30 = crateCell(workbook,row,30); //初设提交限定日期
+
+                Cell cell31 = crateCell(workbook,row,31); //是否进行现场交底
+                Cell cell32 = crateCell(workbook,row,32); //交底完成时间
+                Cell cell33 = crateCell(workbook,row,33); //是否完成初设
+                Cell cell34 = crateCell(workbook,row,34); //初设提交时间
+                Cell cell35 = crateCell(workbook,row,35); //是否完成审图
+                Cell cell36 = crateCell(workbook,row,36); //是否通过图纸审核
+                Cell cell37 = crateCell(workbook,row,37); //未通过原因分析
+                Cell cell38 = crateCell(workbook,row,38); //通过审核日期
+                Cell cell39 = crateCell(workbook,row,39); //是否需设计变更
+                Cell cell40 = crateCell(workbook,row,40); //项目经理审图-备注
+
+                Cell cell41 = crateCell(workbook,row,41); //概预算-是否完成审核
+                Cell cell42 = crateCell(workbook,row,42); //概预算-是否通过专家审核
+                Cell cell43 = crateCell(workbook,row,43); //概预算-未通过原因分析
+                Cell cell44 = crateCell(workbook,row,44); //概预算-通过审核日期
+                Cell cell45 = crateCell(workbook,row,45); //概预算-是否需设计变更
+                Cell cell46 = crateCell(workbook,row,46); //概预算审核-备注
+                Cell cell47 = crateCell(workbook,row,47); //是否参加省公司评审
+                Cell cell48 = crateCell(workbook,row,48); //省公司评审批次/日期
+                Cell cell49 = crateCell(workbook,row,49); //是否通过省公司评审
+                Cell cell50 = crateCell(workbook,row,50); //评审意见
+                Cell cell51 = crateCell(workbook,row,51); //是否需设计变更
+                Cell cell52 = crateCell(workbook,row,52); //省公司评审-备注
+
+                Cell cell53 = crateCell(workbook,row,53); //图纸联合审查-是否进行图纸审查
+                Cell cell54 = crateCell(workbook,row,54); //图纸联合审查-联合审图日期
+                Cell cell55 = crateCell(workbook,row,55); //图纸联合审查-是否通过图纸审查
+                Cell cell56 = crateCell(workbook,row,56); //图纸联合审查-审图意见
+                Cell cell57 = crateCell(workbook,row,57); //图纸联合审查-是否需设计变更
+                Cell cell58 = crateCell(workbook,row,58); //图纸联合审查-备注
+                Cell cell59 = crateCell(workbook,row,59); //是否完成储备
+                Cell cell60 = crateCell(workbook,row,60); //项目是否取消
+                Cell cell61 = crateCell(workbook,row,61); //是否纳入储备库
 
                 ProgressStats progressStats = list.get(i);
 
@@ -576,62 +582,66 @@ public class ExcelExportUtil {
                 cell3.setCellValue(progressStats.getDemandUnit());
                 cell4.setCellValue(progressStats.getDistrict());
                 cell5.setCellValue(progressStats.getProjectGroup());
-                cell6.setCellValue(progressStats.getReserveBatches());
-                cell7.setCellValue(progressStats.getBlockSupply());
-                cell8.setCellValue(progressStats.getGridNumber());
-                cell9.setCellValue(progressStats.getCellNumber());
-                cell10.setCellValue(progressStats.getProjectReserveId());
-                cell11.setCellValue(progressStats.getProjectName());
-                cell12.setCellValue(progressStats.getConstructionNecessityAndContent());
-                cell13.setCellValue(progressStats.getSubstationName());
-                cell14.setCellValue(progressStats.getCircuitName());
-                cell15.setCellValue(progressStats.getNetRackProjectDivide());
-                cell16.setCellValue(progressStats.getRequirementType());
+                cell6.setCellValue(progressStats.getProjectManagre());
+                cell7.setCellValue(progressStats.getReserveBatches());
+                cell8.setCellValue(progressStats.getBlockSupply());
+                cell9.setCellValue(progressStats.getGridNumber());
+                cell10.setCellValue(progressStats.getCellNumber());
+                cell11.setCellValue(progressStats.getProjectReserveId());
+                cell12.setCellValue(progressStats.getProjectName());
+                cell13.setCellValue(progressStats.getStateGridProjectCode());
+                cell14.setCellValue(progressStats.getStateGridProjectName());
+                cell15.setCellValue(progressStats.getConstructionNecessityAndContent());
+                cell16.setCellValue(progressStats.getSubstationName());
+                cell17.setCellValue(progressStats.getCircuitName());
+                cell18.setCellValue(progressStats.getNetRackProjectDivide());
+                cell19.setCellValue(progressStats.getRequirementType());
 
                 String costEstimateStr= progressStats.getCostEstimate();
                 if(StringUtils.isNotBlank(costEstimateStr)){
-                    cell17.setCellValue(Double.parseDouble(costEstimateStr));
+                    cell20.setCellValue(Double.parseDouble(costEstimateStr));
                 }
-                cell18.setCellValue(progressStats.getBasicRemarks());
-                cell19.setCellValue(progressStats.getReserveProgress());
-                cell20.setCellValue(progressStats.getImplementPlan());
-                cell21.setCellValue(progressStats.getInitialImplementBatch());
-                cell22.setCellValue(progressStats.getInspectDepartmentReview());
-                cell23.setCellValue(progressStats.getInspectDepartmentReviewTime());
-                cell24.setCellValue(progressStats.getReleaseReserveTime());
-                cell25.setCellValue(progressStats.getDesignCommission());
-                cell26.setCellValue(progressStats.getDesignCommissionIssueTime());
-                cell27.setCellValue(progressStats.getLimitDate());
-                cell28.setCellValue(progressStats.getOnSiteConfess());
-                cell29.setCellValue(progressStats.getConfessCompleteTime());
-                cell30.setCellValue(progressStats.getCompleteDesign());
-                cell31.setCellValue(progressStats.getSubmitTime());
-                cell32.setCellValue(progressStats.getCompleteDraw());
-                cell33.setCellValue(progressStats.getDrawAudit());
-                cell34.setCellValue(progressStats.getReasonForFailure());
-                cell35.setCellValue(progressStats.getPassAuditDate());
-                cell36.setCellValue(progressStats.getChangeDesign());
-                cell37.setCellValue(progressStats.getDrawRemarks());
-                cell38.setCellValue(progressStats.getWhetherToAudit());
-                cell39.setCellValue(progressStats.getExpertReview());
-                cell40.setCellValue(progressStats.getEstimateReasonForFailure());
-                cell41.setCellValue(progressStats.getEstimatePassAuditDate());
-                cell42.setCellValue(progressStats.getEstimateChangeDesign());
-                cell43.setCellValue(progressStats.getBudgetRemarks());
-                cell44.setCellValue(progressStats.getProvincialCompanyReview());
-                cell45.setCellValue(progressStats.getProvincialCompanyReviewBatch());
-                cell46.setCellValue(progressStats.getPassProvincialCompanyReview());
-                cell47.setCellValue(progressStats.getCauseAnalysis());
-                cell48.setCellValue(progressStats.getDesignChange());
-                cell49.setCellValue(progressStats.getProvincialCompanyRemarks());
-                cell50.setCellValue(progressStats.getDrawingReview());
-                cell51.setCellValue(progressStats.getReviewDate());
-                cell52.setCellValue(progressStats.getPassDrawingReview());
-                cell53.setCellValue(progressStats.getReviewComment());
-                cell54.setCellValue(progressStats.getJointReviewDesignChange());
-                cell55.setCellValue(progressStats.getDrawingUnionRemarks());
-                cell56.setCellValue(progressStats.getCompleteReserve());
-
+                cell21.setCellValue(progressStats.getBasicRemarks());
+                cell22.setCellValue(progressStats.getReserveProgress());
+                cell23.setCellValue(progressStats.getImplementPlan());
+                cell24.setCellValue(progressStats.getInitialImplementBatch());
+                cell25.setCellValue(progressStats.getInspectDepartmentReview());
+                cell26.setCellValue(progressStats.getInspectDepartmentReviewTime());
+                cell27.setCellValue(progressStats.getReleaseReserveTime());
+                cell28.setCellValue(progressStats.getDesignCommission());
+                cell29.setCellValue(progressStats.getDesignCommissionIssueTime());
+                cell30.setCellValue(progressStats.getLimitDate());
+                cell31.setCellValue(progressStats.getOnSiteConfess());
+                cell32.setCellValue(progressStats.getConfessCompleteTime());
+                cell33.setCellValue(progressStats.getCompleteDesign());
+                cell34.setCellValue(progressStats.getSubmitTime());
+                cell35.setCellValue(progressStats.getCompleteDraw());
+                cell36.setCellValue(progressStats.getDrawAudit());
+                cell37.setCellValue(progressStats.getPassAuditDate());
+                cell38.setCellValue(progressStats.getReasonForFailure());
+                cell39.setCellValue(progressStats.getChangeDesign());
+                cell40.setCellValue(progressStats.getDrawRemarks());
+                cell41.setCellValue(progressStats.getWhetherToAudit());
+                cell42.setCellValue(progressStats.getExpertReview());
+                cell43.setCellValue(progressStats.getEstimatePassAuditDate());
+                cell44.setCellValue(progressStats.getEstimateReasonForFailure());
+                cell45.setCellValue(progressStats.getEstimateChangeDesign());
+                cell46.setCellValue(progressStats.getBudgetRemarks());
+                cell47.setCellValue(progressStats.getProvincialCompanyReview());
+                cell48.setCellValue(progressStats.getProvincialCompanyReviewBatch());
+                cell49.setCellValue(progressStats.getPassProvincialCompanyReview());
+                cell50.setCellValue(progressStats.getCauseAnalysis());
+                cell51.setCellValue(progressStats.getDesignChange());
+                cell52.setCellValue(progressStats.getProvincialCompanyRemarks());
+                cell53.setCellValue(progressStats.getDrawingReview());
+                cell54.setCellValue(progressStats.getReviewDate());
+                cell55.setCellValue(progressStats.getPassDrawingReview());
+                cell56.setCellValue(progressStats.getReviewComment());
+                cell57.setCellValue(progressStats.getJointReviewDesignChange());
+                cell58.setCellValue(progressStats.getDrawingUnionRemarks());
+                cell59.setCellValue(progressStats.getCompleteReserve());
+                cell60.setCellValue(progressStats.getProjectCancel());
+                cell61.setCellValue(progressStats.getImplementReserve());
             }
 
             String str = URLEncoder.encode("储备进度统计表.xlsx", "UTF8");

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/util/ExcelImportUtil.java

@@ -467,19 +467,19 @@ public class ExcelImportUtil {
 
             String reserveProjectName = (String) importUtil.getCellValue(row, 1);
             //获取项目储备编号
-            String projectReserveId = (String) importUtil.getCellValue(row, 10);
+            String projectReserveId = (String) importUtil.getCellValue(row, 11);
             if (StringUtils.isNotBlank(reserveProjectName)) {
                 if (StringUtils.isNotBlank(projectReserveId)) {
-                    progressStats.setProjectReserveId((String) importUtil.getCellValue(row, 10));//项目储备编号
+                    progressStats.setProjectReserveId((String) importUtil.getCellValue(row, 11));//项目储备编号
 
                     //和基本信息表比对，是否有对应的数据
                     getBmList2(proIdList,progressStats.getProjectReserveId());
 
-                    progressStats.setInspectDepartmentReview((String) importUtil.getCellValue(row, 22));//是否通过运检部评审
+                    progressStats.setInspectDepartmentReview((String) importUtil.getCellValue(row, 25));//是否通过运检部评审
 
-                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 23))){
+                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 26))){
                         try {
-                            Date parse = format.parse((String) importUtil.getCellValue(row, 23));
+                            Date parse = format.parse((String) importUtil.getCellValue(row, 26));
                             progressStats.setInspectDepartmentReviewTime(format.format(parse));//通过运检部评审时间
                         }catch (Exception e){
                             progressStats.setInspectDepartmentReviewTime(null);//通过运检部评审时间
@@ -488,9 +488,9 @@ public class ExcelImportUtil {
                         progressStats.setInspectDepartmentReviewTime(null);//通过运检部评审时间
                     }
 
-                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 24))){
+                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 27))){
                         try {
-                            Date parse = format.parse((String) importUtil.getCellValue(row, 24));
+                            Date parse = format.parse((String) importUtil.getCellValue(row, 27));
                             progressStats.setReleaseReserveTime(format.format(parse));//运检部下达储备时间
                         }catch (Exception e){
                             progressStats.setReleaseReserveTime(null);//运检部下达储备时间
@@ -499,9 +499,9 @@ public class ExcelImportUtil {
                         progressStats.setReleaseReserveTime(null);//运检部下达储备时间
                     }
 
-                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 27))){
+                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 30))){
                         try {
-                            Date parse = format.parse((String) importUtil.getCellValue(row, 27));
+                            Date parse = format.parse((String) importUtil.getCellValue(row, 30));
                             progressStats.setLimitDate(format.format(parse));//初设提交限定日期
                         }catch (Exception e){
                             progressStats.setLimitDate(null);//初设提交限定日期
@@ -510,11 +510,11 @@ public class ExcelImportUtil {
                         progressStats.setLimitDate(null);//初设提交限定日期
                     }
 
-                    progressStats.setOnSiteConfess((String) importUtil.getCellValue(row, 28));//是否进行现场交底
+                    progressStats.setOnSiteConfess((String) importUtil.getCellValue(row, 31));//是否进行现场交底
 
-                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 29))){
+                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 32))){
                         try {
-                            Date parse = format.parse((String) importUtil.getCellValue(row, 29));
+                            Date parse = format.parse((String) importUtil.getCellValue(row, 32));
                             progressStats.setConfessCompleteTime(format.format(parse));//交底完成时间
                         }catch (Exception e){
                             progressStats.setConfessCompleteTime(null);//交底完成时间
@@ -523,10 +523,11 @@ public class ExcelImportUtil {
                         progressStats.setConfessCompleteTime(null);//交底完成时间
                     }
 
-                    progressStats.setDrawRemarks((String) importUtil.getCellValue(row, 37));//项目经理审图-备注
-                    progressStats.setBudgetRemarks((String) importUtil.getCellValue(row, 43));//概预算审核-备注
-                    progressStats.setDrawingUnionRemarks((String) importUtil.getCellValue(row, 55));//图纸联合审查-备注
-                    progressStats.setDrawingDate(null);//通知出图日期
+                    progressStats.setDrawRemarks((String) importUtil.getCellValue(row, 40));//项目经理审图-备注
+                    progressStats.setBudgetRemarks((String) importUtil.getCellValue(row, 46));//概预算审核-备注
+                    progressStats.setDrawingUnionRemarks((String) importUtil.getCellValue(row, 58));//图纸联合审查-备注
+                    progressStats.setProjectCancel((String) importUtil.getCellValue(row, 60));//储备完成-项目是否取消
+//                    progressStats.setDrawingDate(null);//通知出图日期
 //                    if (StringUtils.isNotEmpty((String) importUtil.getCellValue(row, 50))){
 //                        try {
 //                            Date parse = format.parse((String) importUtil.getCellValue(row, 50));

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/statisticalTable/web/ProgressStatsController.java

@@ -4,8 +4,12 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ActRunTaskTest;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.FeedBackBudget;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.ReserveSummaryProcessMapper;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.CompanyReviewService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveProcessProjectService;
+import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.ReserveSummaryProcessService;
 import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.service.SummaryStatisticService;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.History;
 import com.jeeplus.modules.cg.reservemanagementcenter.statisticalTable.entity.ProgressStats;
@@ -53,6 +57,15 @@ public class ProgressStatsController extends BaseController {
     @Autowired
     private ReserveProcessProjectService projectService;
 
+    @Autowired
+    private ReserveSummaryProcessService summaryProcessService;
+
+    @Autowired
+    private CompanyReviewService service;
+
+    @Autowired
+    private ReserveSummaryProcessMapper mapper;
+
     @ModelAttribute
     public ProgressStats get(@RequestParam(required = false) String id) {
         ProgressStats entity = null;
@@ -346,67 +359,69 @@ public class ProgressStatsController extends BaseController {
                 //设置是否进行图纸审查
                 if (lhHis.size()>0){
                     if (StringUtils.isNotEmpty(lhHis.get(0).getEndTime())){
-                        if (lhHis.get(0).getEndTime().equals(gysHis.get(0).getStartTime())){
-                            if (StringUtils.isNotBlank(jlHis.get(0).getEndTime())){
-                                //说明项目经理审图也结束了
-                                stats.setDrawingReview("是");
-                                //设置联合审图日期
-                                stats.setReviewDate(jlHis.get(0).getStartTime());
-                                //设置是否通过图纸审查
-                                if (StringUtils.isNotEmpty(jlHis.get(0).getEndTime())){
-                                    //设置审图意见  从历史意见表中根据时间获取
-                                    String comment = statsService.getCommentByProInsId(procInsId,jlHis.get(0).getEndTime());
-                                    if (jlHis.get(0).getEndTime().equals(history.get(0).getStartTime())){
-                                        //说明是不通过
-                                        stats.setPassDrawingReview("不通过");
-                                        //设置通过联合审图日期
-                                        stats.setApprovedDate(jlHis.get(0).getEndTime());
-                                        //设置审图意见
-                                        stats.setReviewComment(comment);
-                                        //设置是否需设计变更
-                                        stats.setJointReviewDesignChange("是");
-                                    }else if (status == 3){
-                                        //取消
-                                        stats.setPassDrawingReview("取消");
-                                        //设置通过联合审图日期
-                                        stats.setApprovedDate(jlHis.get(0).getEndTime());
-                                        stats.setReviewComment(comment);
-                                        //设置是否需设计变更
-                                        stats.setJointReviewDesignChange("是");
-                                    }else if (status == 4){
-                                        //取消
-                                        stats.setPassDrawingReview("待定");
-                                        //设置通过联合审图日期
-                                        stats.setApprovedDate(jlHis.get(0).getEndTime());
-                                        stats.setReviewComment(comment);
-                                        //设置是否需设计变更
-                                        stats.setJointReviewDesignChange("是");
-                                    }else {
-                                        //通过
-                                        stats.setPassDrawingReview("通过");
-                                        biaoJi += 1;
-                                        //设置通过联合审图日期
-                                        stats.setApprovedDate(jlHis.get(0).getEndTime());
-                                        //设置是否需设计变更
-                                        stats.setJointReviewDesignChange("否");
+                        if (gysHis.size()>0){
+                            if (lhHis.get(0).getEndTime().equals(gysHis.get(0).getStartTime())){
+                                if (StringUtils.isNotBlank(jlHis.get(0).getEndTime())){
+                                    //说明项目经理审图也结束了
+                                    stats.setDrawingReview("是");
+                                    //设置联合审图日期
+                                    stats.setReviewDate(jlHis.get(0).getStartTime());
+                                    //设置是否通过图纸审查
+                                    if (StringUtils.isNotEmpty(jlHis.get(0).getEndTime())){
+                                        //设置审图意见  从历史意见表中根据时间获取
+                                        String comment = statsService.getCommentByProInsId(procInsId,jlHis.get(0).getEndTime());
+                                        if (jlHis.get(0).getEndTime().equals(history.get(0).getStartTime())){
+                                            //说明是不通过
+                                            stats.setPassDrawingReview("不通过");
+                                            //设置通过联合审图日期
+//                                            stats.setApprovedDate(jlHis.get(0).getEndTime());
+                                            //设置审图意见
+                                            stats.setReviewComment(comment);
+                                            //设置是否需设计变更
+                                            stats.setJointReviewDesignChange("是");
+                                        }else if (status == 3){
+                                            //取消
+                                            stats.setPassDrawingReview("取消");
+                                            //设置通过联合审图日期
+//                                            stats.setApprovedDate(jlHis.get(0).getEndTime());
+                                            stats.setReviewComment(comment);
+                                            //设置是否需设计变更
+                                            stats.setJointReviewDesignChange("是");
+                                        }else if (status == 4){
+                                            //取消
+                                            stats.setPassDrawingReview("待定");
+                                            //设置通过联合审图日期
+//                                            stats.setApprovedDate(jlHis.get(0).getEndTime());
+                                            stats.setReviewComment(comment);
+                                            //设置是否需设计变更
+                                            stats.setJointReviewDesignChange("是");
+                                        }else {
+                                            //通过
+                                            stats.setPassDrawingReview("通过");
+                                            biaoJi += 1;
+                                            //设置通过联合审图日期
+//                                            stats.setApprovedDate(jlHis.get(0).getEndTime());
+                                            //设置是否需设计变更
+                                            stats.setJointReviewDesignChange("否");
+                                        }
                                     }
+                                } else {
+                                    //设置是否进行图纸审查
+                                    stats.setDrawingReview("否");
+                                    //设置联合审图日期
+                                    stats.setReviewDate("");
+                                    //设置是否通过图纸审查
+                                    stats.setPassDrawingReview("");
+                                    //设置通过联合审图日期
+//                                    stats.setApprovedDate("");
+                                    //设置审图意见
+                                    stats.setReviewComment("");
+                                    //设置是否需设计变更
+                                    stats.setJointReviewDesignChange("");
                                 }
-                            } else {
-                                //设置是否进行图纸审查
-                                stats.setDrawingReview("否");
-                                //设置联合审图日期
-                                stats.setReviewDate("");
-                                //设置是否通过图纸审查
-                                stats.setPassDrawingReview("");
-                                //设置通过联合审图日期
-                                stats.setApprovedDate("");
-                                //设置审图意见
-                                stats.setReviewComment("");
-                                //设置是否需设计变更
-                                stats.setJointReviewDesignChange("");
-                            }
 
-                        }else if (StringUtils.isNotBlank(jlHis.get(0).getEndTime())){
+                            }
+                        } else if (StringUtils.isNotBlank(jlHis.get(0).getEndTime())){
                             if (jlHis.get(0).getEndTime().equals(gysHis.get(0).getStartTime())){
                                 stats.setDrawingReview("是");
                                 //设置联合审图日期
@@ -419,7 +434,7 @@ public class ProgressStatsController extends BaseController {
                                         //说明是不通过
                                         stats.setPassDrawingReview("不通过");
                                         //设置通过联合审图日期
-                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
                                         //设置审图意见
                                         stats.setReviewComment(comment);
                                         //设置是否需设计变更
@@ -428,7 +443,7 @@ public class ProgressStatsController extends BaseController {
                                         //取消
                                         stats.setPassDrawingReview("取消");
                                         //设置通过联合审图日期
-                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
                                         stats.setReviewComment(comment);
                                         //设置是否需设计变更
                                         stats.setJointReviewDesignChange("是");
@@ -436,7 +451,7 @@ public class ProgressStatsController extends BaseController {
                                         //取消
                                         stats.setPassDrawingReview("待定");
                                         //设置通过联合审图日期
-                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
                                         stats.setReviewComment(comment);
                                         //设置是否需设计变更
                                         stats.setJointReviewDesignChange("是");
@@ -445,7 +460,7 @@ public class ProgressStatsController extends BaseController {
                                         stats.setPassDrawingReview("通过");
                                         biaoJi += 1;
                                         //设置通过联合审图日期
-                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                        stats.setApprovedDate(lhHis.get(0).getEndTime());
                                         //设置是否需设计变更
                                         stats.setJointReviewDesignChange("否");
                                         stats.setReviewComment("");
@@ -459,7 +474,7 @@ public class ProgressStatsController extends BaseController {
                                 //设置是否通过图纸审查
                                 stats.setPassDrawingReview("");
                                 //设置通过联合审图日期
-                                stats.setApprovedDate("");
+//                                stats.setApprovedDate("");
                                 //设置审图意见
                                 stats.setReviewComment("");
                                 //设置是否需设计变更
@@ -473,7 +488,7 @@ public class ProgressStatsController extends BaseController {
                             //设置是否通过图纸审查
                             stats.setPassDrawingReview("");
                             //设置通过联合审图日期
-                            stats.setApprovedDate("");
+//                            stats.setApprovedDate("");
                             //设置审图意见
                             String comment = statsService.getCommentByProInsId(procInsId,lhHis.get(0).getEndTime());
                             stats.setReviewComment(comment);
@@ -482,12 +497,14 @@ public class ProgressStatsController extends BaseController {
                         } else {
                             //设置是否进行图纸审查
                             stats.setDrawingReview("否");
+
+                            stats.setReasonForFailure("");
                             //设置联合审图日期
                             stats.setReviewDate("");
                             //设置是否通过图纸审查
                             stats.setPassDrawingReview("");
                             //设置通过联合审图日期
-                            stats.setApprovedDate("");
+//                            stats.setApprovedDate("");
                             //设置审图意见
                             stats.setReviewComment("");
                             //设置是否需设计变更
@@ -502,7 +519,7 @@ public class ProgressStatsController extends BaseController {
                     //设置是否通过图纸审查
                     stats.setPassDrawingReview("");
                     //设置通过联合审图日期
-                    stats.setApprovedDate("");
+//                    stats.setApprovedDate("");
                     //设置审图意见
                     stats.setReviewComment("");
                     //设置是否需设计变更
@@ -546,6 +563,8 @@ public class ProgressStatsController extends BaseController {
                     stats.setCompleteReserve(stats.getExpertReview());
                 } else {
                     stats.setCompleteReserve("");
+                    stats.setEstimateReasonForFailure("");
+                    stats.setReviewComment("");
                 }
             } else {
                 stats = setStatsValue(stats);
@@ -590,6 +609,27 @@ public class ProgressStatsController extends BaseController {
             //获取导入表格所有数据
             List<ProgressStats> budgetStats = ExcelImportUtil.getProgressUtil(importUtil,proIdList);
             statsService.insertList(budgetStats);
+
+            budgetStats.forEach(li->{
+                if (li.getProjectCancel().equals("取消")){
+                    projectService.updateProcessStatus(li.getProjectReserveId(),3);
+                    ActRunTaskTest taskTest = summaryProcessService.getByProId(li.getProjectReserveId());
+//                            statisticService.updateReserveSummary(a.getProjectReserveId(),"取消",c.getReviewComments());
+                    //取消流程   将流程表中的流程信息删除
+                    service.deleteActivityByProId(li.getProjectReserveId());
+
+                    //将act_ru_task表中的任务删除
+//                            ActRunTaskTest taskTest = summaryProcessService.getByProId(c.getProjectReserveId());
+                    summaryProcessService.deleteByProcId(taskTest.getProcInsId(),"");
+                    //删除联合审图的并行任务
+                    String taskKey = mapper.selectTaskKey(taskTest.getProcInsId(), "项目经理审图");
+                    String taskKey2 = mapper.selectTaskKey(taskTest.getProcInsId(), "联合审图");
+                    String taskKey3 = mapper.selectTaskKey(taskTest.getProcInsId(), "省公司评审");
+                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey);
+                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey2);
+                    summaryProcessService.deleteExecution(taskTest.getProcInsId(),taskKey3);
+                }
+            });
         } catch (Exception e) {
             j.setSuccess(false);
             j.setMsg("导入储备进度信息失败！失败信息：" + e.getMessage());
@@ -869,7 +909,7 @@ public class ProgressStatsController extends BaseController {
                                     //说明是不通过
                                     stats.setPassDrawingReview("不通过");
                                     //设置通过联合审图日期
-                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
                                     //设置审图意见
                                     stats.setReviewComment(comment);
                                     //设置是否需设计变更
@@ -878,7 +918,7 @@ public class ProgressStatsController extends BaseController {
                                     //取消
                                     stats.setPassDrawingReview("取消");
                                     //设置通过联合审图日期
-                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
                                     stats.setReviewComment(comment);
                                     //设置是否需设计变更
                                     stats.setJointReviewDesignChange("是");
@@ -886,7 +926,7 @@ public class ProgressStatsController extends BaseController {
                                     //取消
                                     stats.setPassDrawingReview("待定");
                                     //设置通过联合审图日期
-                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
                                     stats.setReviewComment(comment);
                                     //设置是否需设计变更
                                     stats.setJointReviewDesignChange("是");
@@ -895,7 +935,7 @@ public class ProgressStatsController extends BaseController {
                                     stats.setPassDrawingReview("通过");
                                     biaoJi += 1;
                                     //设置通过联合审图日期
-                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
+//                                    stats.setApprovedDate(lhHis.get(0).getEndTime());
                                     //设置是否需设计变更
                                     stats.setJointReviewDesignChange("否");
                                 }
@@ -908,7 +948,7 @@ public class ProgressStatsController extends BaseController {
                             //设置是否通过图纸审查
                             stats.setPassDrawingReview("");
                             //设置通过联合审图日期
-                            stats.setApprovedDate("");
+//                            stats.setApprovedDate("");
                             //设置审图意见
                             stats.setReviewComment("");
                             //设置是否需设计变更
@@ -923,7 +963,7 @@ public class ProgressStatsController extends BaseController {
                     //设置是否通过图纸审查
                     stats.setPassDrawingReview("");
                     //设置通过联合审图日期
-                    stats.setApprovedDate("");
+//                    stats.setApprovedDate("");
                     //设置审图意见
                     stats.setReviewComment("");
                     //设置是否需设计变更
@@ -1022,7 +1062,7 @@ public class ProgressStatsController extends BaseController {
         //设置是否通过图纸审查
         stats.setPassDrawingReview("");
         //设置通过联合审图日期
-        stats.setApprovedDate("");
+//        stats.setApprovedDate("");
         //设置审图意见
         stats.setReviewComment("");
         //设置是否需设计变更

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/network/reserveManagementInformation.js

@@ -83,8 +83,7 @@ $(document).ready(function () {
                     {checkbox:true,width: 36},
                     {"title":"储备项目基本信息","colspan":21,"halign":"center","align": "center",width: "4200px"},
                     {"title":"问题发起","colspan":4,"halign":"center","align": "center",width: "800px"},
-                    {"title":"业主项目经理","colspan":7,"halign":"center","align": "center",width: "1400px"},
-                    {"title":"业主单位领导","colspan":6,"halign":"center","align": "center",width: "1200px"}
+                    {"title":"业主项目经理","colspan":4,"halign":"center","align": "center",width: "800px"}
 
                 ],
                 [
@@ -131,16 +130,7 @@ $(document).ready(function () {
                     { field: 'problemSolver', title: "问题解决人", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
                     { field: 'problemResolved', title: "问题是否解决", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
                     { field: 'problemResolvedDescript', title: "问题解决描述", valign:"middle", align:"center", colspan: 1, rowspan: 1 ,formatter:paramsMatter},
-                    { field: 'designChange', title: "是否需要设计变更", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'changeType', title: "变更类型", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'designChangeType', title: "设计变更类型", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'reportToLeader', title: "是否需要上报业主领导", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'problemSolverLeader', title: "问题解决人", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'problemResolvedLeader', title: "问题是否解决", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'problemResolvedDescriptLeader', title: "问题解决描述", valign:"middle", align:"center", colspan: 1, rowspan: 1 ,formatter:paramsMatter},
-                    { field: 'designChangeLeader', title: "是否需要设计变更", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'changeTypeLeader', title: "变更类型", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
-                    { field: 'designChangeTypeLeader', title: "设计变更类型", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
+                    { field: 'designChange', title: "是否需要设计变更", valign:"middle", align:"center", colspan: 1, rowspan: 1 }
                 ]
 
             ]

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/network/reserveManagementModifyByzz.jsp

@@ -225,55 +225,6 @@
 				<form:input path="designChange" htmlEscape="false"  readonly="true"  class="form-control"/>
 			</td>
 		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="changeType" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">设计变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="designChangeType" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">是否需要上报业主领导：</label></td>
-			<td class="width-35">
-				<form:input path="reportToLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4" class="width-15 active"><label class="">业主单位领导：</label></td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">问题解决人：</label></td>
-			<td class="width-35">
-				<form:input path="problemSolverLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">问题是否解决：</label></td>
-			<td class="width-35">
-				<form:input path="problemResolvedLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">问题解决描述：</label></td>
-			<td class="width-35">
-				<form:textarea path="problemResolvedDescriptLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">是否需要设计变更：</label></td>
-			<td class="width-35">
-				<form:input path="designChangeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="changeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">设计变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="designChangeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-		</tr>
 		</tbody>
 	</table>
 </form:form>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/network/reserveManagementView.jsp

@@ -181,55 +181,6 @@
 				<form:input path="designChange" htmlEscape="false"  readonly="true"  class="form-control number money"/>
 			</td>
 		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="changeType" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">设计变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="designChangeType" htmlEscape="false"  readonly="true"  class="form-control number money"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">是否需要上报业主领导：</label></td>
-			<td class="width-35">
-				<form:input path="reportToLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4" class="width-15 active"><label class="">业主单位领导：</label></td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">问题解决人：</label></td>
-			<td class="width-35">
-				<form:input path="problemSolverLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">问题是否解决：</label></td>
-			<td class="width-35">
-				<form:input path="problemResolvedLeader" htmlEscape="false"  readonly="true"  class="form-control number money"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">问题解决描述：</label></td>
-			<td class="width-35">
-				<form:input path="problemResolvedDescriptLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">是否需要设计变更：</label></td>
-			<td class="width-35">
-				<form:input path="designChangeLeader" htmlEscape="false"  readonly="true"  class="form-control number money"/>
-			</td>
-		</tr>
-		<tr>
-			<td class="width-15 active"><label class="">变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="changeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-			</td>
-			<td class="width-15 active"><label class="">设计变更类型：</label></td>
-			<td class="width-35">
-				<form:input path="designChangeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control number money"/>
-			</td>
-		</tr>
 		</tbody>
 	</table>
 </form:form>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/process/designUnit.jsp

@@ -80,16 +80,10 @@
 				jp.prompt("上报业主领导", function (message) {
 					var projectReserveId = $("#projectReserveId").val();
 					var projectName = $("#projectName").val();
-					var reportToLeader = $("#reportToLeader").val();
-					var userList = $("#userList").val();
 					var problemResolved = $("#problemResolved").val();
 					var problemResolvedDescript = $("#problemResolvedDescript").val();
 					var designChange = $("#designChange").val();
-					if (reportToLeader !== '是'){
-						jp.error("是否需要上报业主领导必须为是才能发起上报业主领导流程!");
-					}else if (!userList){
-						jp.error("请选择指定领导审批!");
-					} else {
+					{
 						jp.post("${ctx}/cg/distribution/distribution/actDesignUnitNew",
 								{
 									"taskId": "${reserveProcess.act.taskId}",
@@ -99,8 +93,6 @@
 									"procDefId": "${reserveProcess.act.procDefId}",
 									"flag": "pass",
 									"projectReserveId":projectReserveId,
-									"reportToLeader":reportToLeader,
-									"problemSolverLeader":userList,
 									"designChange":designChange,
 									"problemResolvedDescript":problemResolvedDescript,
 									"problemResolved":problemResolved,
@@ -123,9 +115,7 @@
 				jp.prompt("是否需要设计变更", function (message) {
 					var projectReserveId = $("#projectReserveId").val();
 					var projectName = $("#projectName").val();
-					var designChange = $("#designChange").val();
-					var changeType = $("#changeType").val();
-					var designChangeType = $("#designChangeType").val();
+					var designChange = $("#designChange").val()
 					if (designChange !== '是'){
 						jp.error("是否需设计变更必须为是才能发起上设计变更流程!");
 					} else {
@@ -140,8 +130,6 @@
 									"projectReserveId":projectReserveId,
 									"projectName":projectName,
 									"designChange":designChange,
-									"changeType":changeType,
-									"designChangeType":designChangeType,
 									"comment": window.encodeURI(message)
 								},
 								function (data) {
@@ -341,77 +329,8 @@
 											<option value="是" <c:if test="${reserveProcess.designChange=='是'}">selected</c:if>>是</option>
 											<option value="否" <c:if test="${reserveProcess.designChange=='否'}">selected</c:if>>否</option>
 										</select>
-									</td>								</tr>
-								<tr id="problemResolvedRow2">
-									<td class="width-15 active"><label class="">变更类型：</label></td>
-									<td class="width-35">
-										<select id="changeType" name="changeType"  class="form-control required">
-											<option value="">请选择</option>
-											<option value="重出施工图" <c:if test="${reserveProcess.changeType=='重出施工图'}">selected</c:if>>重出施工图</option>
-											<option value="直接出竣工图" <c:if test="${reserveProcess.changeType=='直接出竣工图'}">selected</c:if>>直接出竣工图</option>
-										</select>
-									</td>
-									<td class="width-15 active"><label class="">设计变更类型：</label></td>
-									<td class="width-35">
-										<select id="designChangeType" name="designChangeType"  class="form-control required">
-											<option value="">请选择</option>
-											<option value="普通" <c:if test="${reserveProcess.designChangeType=='普通'}">selected</c:if>>普通</option>
-											<option value="重大" <c:if test="${reserveProcess.designChangeType=='重大'}">selected</c:if>>重大</option>
-										</select>
-									</td>
-								</tr>
-								<tr id="problemResolvedRow3">
-									<td class="width-15 active"><label class="">是否需要上报业主领导：</label></td>
-									<td class="width-35">
-										<select id="reportToLeader" name="reportToLeader"  class="form-control required">
-											<option value="0">请选择</option>
-											<option value="是" <c:if test="${reserveProcess.reportToLeader=='是'}">selected</c:if>>是</option>
-											<option value="否" <c:if test="${reserveProcess.reportToLeader=='否'}">selected</c:if>>否</option>
-										</select>
-									</td>
-									<td class="width-15 active"><label class="">选择指定领导审批：</label></td>
-									<td class="width-35">
-										<select id="userList" name="userList" class="form-control required">
-											<option value="">请选择</option>
-											<c:forEach items="${reserveProcess.userList}" var="user">
-												<option value="${user}">${user}</option>
-											</c:forEach>
-										</select>
-									</td>
-								</tr>
-								<%--<tr>
-									<td colspan="4" class="width-15 active"><label class="">业主单位领导：</label></td>
-								</tr>
-								<tr>
-									<td class="width-15 active"><label class="">问题解决人：</label></td>
-									<td class="width-35">
-										<form:input path="problemSolverLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-									<td class="width-15 active"><label class="">问题是否解决：</label></td>
-									<td class="width-35">
-										<form:input path="problemResolvedLeader" htmlEscape="false"  readonly="true"  class="form-control required"/>
 									</td>
 								</tr>
-								<tr>
-									<td class="width-15 active"><label class="">问题解决描述：</label></td>
-									<td class="width-35">
-										<form:input path="problemResolvedDescriptLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-									<td class="width-15 active"><label class="">是否需要设计变更：</label></td>
-									<td class="width-35">
-										<form:input path="designChangeLeader" htmlEscape="false"  readonly="true"  class="form-control required"/>
-									</td>
-								</tr>
-								<tr>
-									<td class="width-15 active"><label class="">变更类型：</label></td>
-									<td class="width-35">
-										<form:input path="changeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control required"/>
-									</td>
-									<td class="width-15 active"><label class="">设计变更类型：</label></td>
-									<td class="width-35">
-										<form:input path="designChangeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control required"/>
-									</td>
-								</tr>--%>
 								</tbody>
 							</table>
 						</form:form>
@@ -424,7 +343,7 @@
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="问题已解决"/>&nbsp;
 									<input id="disAgree" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回"/>
-									<input id="pass" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="上报业主领导"/>
+<%--									<input id="pass" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="上报业主领导"/>--%>
 									<input id="tg" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="设计变更"/>
 								</div>
 							</div>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/process/designUnitAgain.jsp

@@ -16,7 +16,7 @@
 				jp.prompt("通过", function (message) {
 					var projectReserveId = $("#projectReserveId").val();
 					var projectName = $("#projectName").val();
-					jp.post("${ctx}/cg/distribution/distribution/actDesignUnitNew",
+					jp.post("${ctx}/cg/distribution/distribution/actDesignUnitAgain",
 							{
 								"taskId": "${reserveProcess.act.taskId}",
 								"taskName": "${reserveProcess.act.taskName}",
@@ -77,7 +77,7 @@
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<h3 class="panel-title">
-						<h3 class="panel-title">设计单位上传施工图</h3>
+						<h3 class="panel-title">项目经理再次审核</h3>
 					</h3>
 				</div>
 				<div class="panel-body">
@@ -252,124 +252,8 @@
 										<option value="是" <c:if test="${reserveProcess.designChange=='是'}">selected</c:if>>是</option>
 										<option value="否" <c:if test="${reserveProcess.designChange=='否'}">selected</c:if>>否</option>
 									</select>
-								</td>								</tr>
-							<tr id="problemResolvedRow2">
-								<td class="width-15 active"><label class="">变更类型：</label></td>
-								<td class="width-35">
-									<select id="changeType" name="changeType" disabled class="form-control">
-										<option value="">请选择</option>
-										<option value="重出施工图" <c:if test="${reserveProcess.changeType=='重出施工图'}">selected</c:if>>重出施工图</option>
-										<option value="直接出竣工图" <c:if test="${reserveProcess.changeType=='直接出竣工图'}">selected</c:if>>直接出竣工图</option>
-									</select>
-								</td>
-								<td class="width-15 active"><label class="">设计变更类型：</label></td>
-								<td class="width-35">
-									<select id="designChangeType" name="designChangeType" disabled class="form-control">
-										<option value="">请选择</option>
-										<option value="普通" <c:if test="${reserveProcess.designChangeType=='普通'}">selected</c:if>>普通</option>
-										<option value="重大" <c:if test="${reserveProcess.designChangeType=='重大'}">selected</c:if>>重大</option>
-									</select>
-								</td>
-							</tr>
-							<tr id="problemResolvedRow3">
-								<td class="width-15 active"><label class="">是否需要上报业主领导：</label></td>
-								<td class="width-35">
-									<select id="reportToLeader" name="reportToLeader" disabled class="form-control">
-										<option value="0">请选择</option>
-										<option value="是" <c:if test="${reserveProcess.reportToLeader=='是'}">selected</c:if>>是</option>
-										<option value="否" <c:if test="${reserveProcess.reportToLeader=='否'}">selected</c:if>>否</option>
-									</select>
-								</td>
-								<td class="width-15 active"><label class="">选择指定领导审批：</label></td>
-								<td class="width-35">
-									<select id="userList" name="userList" disabled class="form-control">
-										<option value="">请选择</option>
-										<c:forEach items="${reserveProcess.userList}" var="user">
-											<option value="${user}">${user}</option>
-										</c:forEach>
-									</select>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="4" class="width-15 active"><label class="">业主单位领导：</label></td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="">问题解决人：</label></td>
-								<td class="width-35">
-									<form:input path="problemSolverLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-								</td>
-								<td class="width-15 active"><label class="">问题是否解决：</label></td>
-								<td class="width-35">
-									<form:input path="problemResolvedLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="">问题解决描述：</label></td>
-								<td class="width-35">
-									<form:input path="problemResolvedDescriptLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-								</td>
-								<td class="width-15 active"><label class="">是否需要设计变更：</label></td>
-								<td class="width-35">
-									<form:input path="designChangeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="">变更类型：</label></td>
-								<td class="width-35">
-									<form:input path="changeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-								</td>
-								<td class="width-15 active"><label class="">设计变更类型：</label></td>
-								<td class="width-35">
-									<form:input path="designChangeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-								</td>
-							</tr>
-
-							<%--<tr>
-								<td colspan="4" class="width-15 active"><label class="">设计资料：</label></td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="">预算书：</label></td>
-								<td class="width-35">
-									<sys:fileUpload path="budgetStatement" value="${reserveProcess.budgetStatement}" type="*" uploadPath="/personnelTurnover"  readonly="true"/>
-								</td>
-								<td class="width-15 active"><label class="">项目建议书：</label></td>
-								<td class="width-35">
-									<sys:fileUpload path="projectProposal" value="${reserveProcess.projectProposal}" type="*" uploadPath="/personnelTurnover"  readonly="true"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="">施工图纸：</label></td>
-								<td class="width-35">
-									<sys:fileUpload path="drawings" value="${reserveProcess.drawings}" type="*" uploadPath="/personnelTurnover"  readonly="true"/>
-								</td>
-								<td class="width-15 active"><label class="">施工图设计说明书：</label></td>
-								<td class="width-35">
-									<sys:fileUpload path="drawingSpecification" value="${reserveProcess.drawingSpecification}" type="*" uploadPath="/personnelTurnover"  readonly="true"/>
-								</td>
-							</tr>
-
-							<tr>
-								<td class="width-15 active"><label class="">拆旧清册：</label></td>
-								<td class="width-35">
-									<sys:fileUpload path="demolition" value="${reserveProcess.demolition}" type="*" uploadPath="/personnelTurnover"  readonly="true"/>
-								</td>
-								<td class="width-15 active"><label class="">土建现浇审批单：</label></td>
-								<td class="width-35">
-									<sys:fileUpload path="approvalForm" value="${reserveProcess.approvalForm}" type="*" uploadPath="/personnelTurnover"  readonly="true"/>
 								</td>
 							</tr>
-
-							<tr>
-								<td class="width-15 active"><label class="">甲供材清册：</label></td>
-								<td class="width-35">
-									<a id="moreImport" class="btn btn-info" onclick="return false;">
-										<i class="fa fa-file-excel-o"></i> 多文件导入
-									</a>
-									<a id="onLine" class="btn btn-info" onclick="return false;">
-										<i class="fa fa-file-excel-o"></i> 在线开甲供材
-									</a>
-								</td>
-							</tr>--%>
 							</tbody>
 						</table>
 					</form:form>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/process/designUnitAgainTwo.jsp

@@ -0,0 +1,289 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目经理判断问题是否解决</title>
+	<meta name="decorator" content="ani"/>
+	<%--	<%@include file="/webpage/modules/bpm/task/history/taskHistoricList.js" %>--%>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@ include file="/webpage/include/treeview.jsp" %>
+	<%@ include file="budgetReview.js"%>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+			$("#agree").click(function () {
+				jp.prompt("通过", function (message) {
+					var projectReserveId = $("#projectReserveId").val();
+					var projectName = $("#projectName").val();
+					jp.post("${ctx}/cg/distribution/distribution/actDesignUnitNewTwo",
+							{
+								"taskId": "${reserveProcess.act.taskId}",
+								"taskName": "${reserveProcess.act.taskName}",
+								"taskDefKey": "${reserveProcess.act.taskDefKey}",
+								"procInsId": "${reserveProcess.act.procInsId}",
+								"procDefId": "${reserveProcess.act.procDefId}",
+								"flag": "agree",
+								"projectReserveId":projectReserveId,
+								"projectName":projectName,
+								"comment": window.encodeURI(message)
+							},
+							function (data) {
+								if (data.success) {
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo");
+								} else {
+									jp.error(data.msg);
+								}
+							}
+					);
+				})
+			});
+			$("#disAgree").click(function () {
+				jp.prompt("驳回", function (message) {
+					var projectReserveId = $("#projectReserveId").val();
+					var projectName = $("#projectName").val();
+					jp.post("${ctx}/cg/distribution/distribution/actDesignUnitNewTwo",
+							{
+								"taskId": "${reserveProcess.act.taskId}",
+								"taskName": "${reserveProcess.act.taskName}",
+								"taskDefKey": "${reserveProcess.act.taskDefKey}",
+								"procInsId": "${reserveProcess.act.procInsId}",
+								"procDefId": "${reserveProcess.act.procDefId}",
+								"flag": "disAgree",
+								"projectReserveId":projectReserveId,
+								"projectName":projectName,
+								"comment": window.encodeURI(message)
+							},
+							function (data) {
+								if (data.success) {
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo");
+								} else {
+									jp.error(data.msg);
+								}
+							}
+					);
+				})
+			});
+		});
+	</script>
+</head>
+<body class="bg-white">
+<input id="uid" type="hidden">
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<h3 class="panel-title">项目经理判断问题是否解决</h3>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="reserveProcess" class="form-horizontal">
+						<form:hidden path="id"/>
+						<form:hidden path="act.taskId"/>
+						<form:hidden path="act.taskName"/>
+						<form:hidden path="act.taskDefKey"/>
+						<form:hidden path="act.procInsId"/>
+						<form:hidden path="act.procDefId"/>
+						<form:hidden id="flag" path="act.flag"/>
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td colspan="4" class="width-15 active"><label class="">储备项目基本信息：</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">项目年份：</label></td>
+								<td class="width-35">
+									<form:input path="projectYear" htmlEscape="false" readonly="true" class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">项目性质：</label></td>
+								<td class="width-35">
+									<form:input path="projectNature" htmlEscape="false" readonly="true" class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">需求单位：</label></td>
+								<td class="width-35">
+									<form:input path="demandUnit" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">区域：</label></td>
+								<td class="width-35">
+									<form:input path="district" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">项目分组：</label></td>
+								<td class="width-35">
+									<form:input path="projectGroup" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">储备批次：</label></td>
+								<td class="width-35">
+									<form:input path="reserveBatches" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">供电区域：</label></td>
+								<td class="width-35">
+									<form:input path="blockSupply" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class=""><font color="red">*</font>网格编号：</label></td>
+								<td class="width-35">
+									<form:input path="gridNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class=""><font color="red">*</font>单元格编号：</label></td>
+								<td class="width-35">
+									<form:input path="cellNumber" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class=""><font color="red">*</font>项目储备编号：</label></td>
+								<td class="width-35">
+									<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control required"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class=""><font color="red">*</font>项目名称：</label></td>
+								<td class="width-35">
+									<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control required"/>
+								</td>
+								<td class="width-15 active"><label class="">国网项目编码：</label></td>
+								<td class="width-35">
+									<form:input path="stateGridProjectCode" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">国网项目名称：</label></td>
+								<td class="width-35">
+									<form:input path="stateGridProjectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+								<td class="width-35">
+									<form:input path="constructionNecessityAndContent" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">变电站名称：</label></td>
+								<td class="width-35">
+									<form:input path="substationName" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">线路名称：</label></td>
+								<td class="width-35">
+									<form:input path="circuitName" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">网架项目划分：</label></td>
+								<td class="width-35">
+									<form:input path="netRackProjectDivide" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">需求类型：</label></td>
+								<td class="width-35">
+									<form:input path="requirementType" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">项目类型：</label></td>
+								<td class="width-35">
+									<form:input path="projectType" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">费用估算：</label></td>
+								<td class="width-35">
+									<form:input path="costEstimate" htmlEscape="false"  readonly="true"  class="form-control number money"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">备注：</label></td>
+								<td class="width-35">
+									<form:input path="remarks" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="4" class="width-15 active"><label class="">问题发起：</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">问题发起人：</label></td>
+								<td class="width-35">
+									<form:input path="promoter" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">问题所处阶段：</label></td>
+								<td class="width-35">
+									<form:input path="problemStage" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">问题类型：</label></td>
+								<td class="width-35">
+									<form:input path="problemType" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">问题描述：</label></td>
+								<td class="width-35">
+									<form:input path="problemDescript" htmlEscape="false"  readonly="true"  class="form-control"/>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="4" class="width-15 active"><label class="">业主项目经理：</label></td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">问题解决人：</label></td>
+								<td class="width-35">
+									<form:input path="problemSolver" htmlEscape="false" readonly="true" class="form-control"/>
+								</td>
+								<td class="width-15 active"><label class="">问题是否解决：</label></td>
+								<td class="width-35">
+									<select id="problemResolved" name="problemResolved" disabled class="form-control">
+										<option value="">请选择</option>
+										<option value="是" <c:if test="${reserveProcess.problemResolved=='是'}">selected</c:if>>是</option>
+										<option value="否" <c:if test="${reserveProcess.problemResolved=='否'}">selected</c:if>>否</option>
+									</select>
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="">问题解决描述：</label></td>
+								<td class="width-35">
+									<form:textarea path="problemResolvedDescript" readonly="true" htmlEscape="false" class="form-control"/>
+								</td>
+								<td class="width-15 active" id="problemResolvedRow"><label class="">是否需要设计变更：</label></td>
+								<td class="width-35" id="problemResolvedRow1">
+									<select id="designChange" name="designChange" disabled class="form-control">
+										<option value="">请选择</option>
+										<option value="是" <c:if test="${reserveProcess.designChange=='是'}">selected</c:if>>是</option>
+										<option value="否" <c:if test="${reserveProcess.designChange=='否'}">selected</c:if>>否</option>
+									</select>
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+					<td class="width-15 active"><label class="">历史数据展示：</label></td>
+					<table id="testPicTable"   data-toolbar="#toolbar"></table>
+					<div id="toolbar">
+						<button id="export" class="btn btn-warning">
+							<i class="fa fa-file-excel-o"></i> 导出材料清册
+						</button>
+					</div>
+					<table id="dataTable"   data-toolbar="#toolbar"></table>
+
+					<div class="row">
+						<div class="col-sm-3"></div>
+						<div class="col-sm-6">
+							<div class="form-group text-center">
+								<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="通过"/>&nbsp;
+<%--								<input id="disAgree" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回"/>--%>
+							</div>
+						</div>
+					</div>
+
+					<c:if test="${not empty reserveProcess.id}">
+						<act:flowChart procInsId="${reserveProcess.act.procInsId}"/>
+						<act:histoicFlow procInsId="${reserveProcess.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/distribution/process/designUnitFile.jsp

@@ -398,75 +398,6 @@
 											<option value="是" <c:if test="${reserveProcess.designChange=='是'}">selected</c:if>>是</option>
 											<option value="否" <c:if test="${reserveProcess.designChange=='否'}">selected</c:if>>否</option>
 										</select>
-									</td>								</tr>
-								<tr id="problemResolvedRow2">
-									<td class="width-15 active"><label class="">变更类型：</label></td>
-									<td class="width-35">
-										<select id="changeType" name="changeType" disabled class="form-control">
-											<option value="">请选择</option>
-											<option value="重出施工图" <c:if test="${reserveProcess.changeType=='重出施工图'}">selected</c:if>>重出施工图</option>
-											<option value="直接出竣工图" <c:if test="${reserveProcess.changeType=='直接出竣工图'}">selected</c:if>>直接出竣工图</option>
-										</select>
-									</td>
-									<td class="width-15 active"><label class="">设计变更类型：</label></td>
-									<td class="width-35">
-										<select id="designChangeType" name="designChangeType" disabled class="form-control">
-											<option value="">请选择</option>
-											<option value="普通" <c:if test="${reserveProcess.designChangeType=='普通'}">selected</c:if>>普通</option>
-											<option value="重大" <c:if test="${reserveProcess.designChangeType=='重大'}">selected</c:if>>重大</option>
-										</select>
-									</td>
-								</tr>
-								<tr id="problemResolvedRow3">
-									<td class="width-15 active"><label class="">是否需要上报业主领导：</label></td>
-									<td class="width-35">
-										<select id="reportToLeader" name="reportToLeader" disabled class="form-control">
-											<option value="0">请选择</option>
-											<option value="是" <c:if test="${reserveProcess.reportToLeader=='是'}">selected</c:if>>是</option>
-											<option value="否" <c:if test="${reserveProcess.reportToLeader=='否'}">selected</c:if>>否</option>
-										</select>
-									</td>
-									<%--<td class="width-15 active"><label class="">选择指定领导审批：</label></td>
-									<td class="width-35">
-										<select id="userList" name="userList" disabled class="form-control">
-											<option value="">请选择</option>
-											<c:forEach items="${reserveProcess.userList}" var="user">
-												<option value="${user}">${user}</option>
-											</c:forEach>
-										</select>
-									</td>--%>
-								</tr>
-								<tr>
-									<td colspan="4" class="width-15 active"><label class="">业主单位领导：</label></td>
-								</tr>
-								<tr>
-									<td class="width-15 active"><label class="">问题解决人：</label></td>
-									<td class="width-35">
-										<form:input path="problemSolverLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-									<td class="width-15 active"><label class="">问题是否解决：</label></td>
-									<td class="width-35">
-										<form:input path="problemResolvedLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-								</tr>
-								<tr>
-									<td class="width-15 active"><label class="">问题解决描述：</label></td>
-									<td class="width-35">
-										<form:input path="problemResolvedDescriptLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-									<td class="width-15 active"><label class="">是否需要设计变更：</label></td>
-									<td class="width-35">
-										<form:input path="designChangeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-								</tr>
-								<tr>
-									<td class="width-15 active"><label class="">变更类型：</label></td>
-									<td class="width-35">
-										<form:input path="changeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
-									</td>
-									<td class="width-15 active"><label class="">设计变更类型：</label></td>
-									<td class="width-35">
-										<form:input path="designChangeTypeLeader" htmlEscape="false"  readonly="true"  class="form-control"/>
 									</td>
 								</tr>
 

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/companyReview/companyReviewModifyByzz.jsp

@@ -167,8 +167,11 @@
 			<td class="width-35">
 				<select id="passProvincialCompanyReview" name="passProvincialCompanyReview"  class="form-control">
 					<option value="">请选择</option>
+<%--					<c:forEach items="${fns:getDictList('act_category')}" var="dict">--%>
+<%--						<option value="${dict.value}" ${dict.value==passProvincialCompanyReview?'selected':''}>${dict.label}</option>--%>
+<%--					</c:forEach>--%>
 					<option value="通过" <c:if test="${companyReview.passProvincialCompanyReview=='通过'}">selected</c:if>>通过</option>
-					<option value="取消" <c:if test="${companyReview.passProvincialCompanyReview=='取消'}">selected</c:if>>取消</option>
+					<option value="不通过" <c:if test="${companyReview.passProvincialCompanyReview=='不通过'}">selected</c:if>>不通过</option>
 				</select>
 <%--				<form:input path="passProvincialCompanyReview" htmlEscape="false" class="form-control"/>--%>
 			</td>

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

@@ -39,7 +39,7 @@
                 var workLoadCheck = $("#workLoadCheck").val();
                 if (isNotEmpty(workLoadValue) && workLoadValue !== workLoadCheck) {
                     flag = false;
-                    jp.error("填写了新的工作流核对，无法通过");
+                    jp.error("填写了新的工作量核对，无法通过");
                 }
                 var checkTheFee = $("#checkTheFee").val();
                 if (isNotEmpty(checkValue) && checkValue !== checkTheFee) {
@@ -393,7 +393,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="">工作流核对：</label></td>
+                                <td class="width-15 active"><label class="">工作量核对：</label></td>
                                 <td class="width-35">
                                     <form:input path="workLoadCheck" htmlEscape="false"
                                                 class="form-control number money"

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

@@ -155,9 +155,9 @@
 					if (isNotEmpty(powerFailure)){
 						var values = powerFailure.split('|');
 						for (var i = 0; i < values.length; i++) {
-							if (!isDocOrDocxFilename(values[i])){
+							if (!isPdfFilename(values[i])){
 								allConditionsPassed = false;
-								jp.error("上传的不停电审批单/停电审批单的格式应该为：.doc，.docx");
+								jp.error("上传的不停电审批单/停电审批单的格式应该为：.pdf");
 							}
 						}
 					} else {
@@ -237,10 +237,11 @@
 					area: [800, 400],
 					auto: true,
 					title:"导入数据",
-					content: "${ctx}/cg/reservemanagementcenter/process/importMore/Process",
+					content: "${ctx}/cg/reservemanagementcenter/process/importMore/Process?proName=" + proName,
 					btn: ['确定', '关闭'],
 					btn1: function(index, layero){
 						var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+						console.log('iframeWin', iframeWin)
 						iframeWin.contentWindow.importExcel('${ctx}/cg/reservemanagementcenter/process/importCGValidations?projectReserveId=' + projectReserveId + '&proName=' + proName, function (data) {
 							if(data.success){
 								jp.success(data.msg);
@@ -294,6 +295,14 @@
 				// 检查扩展名是否为 "doc" 或 "docx"
 				return extension === "doc" || extension === "docx";
 			};
+			//判断是否是pdf
+			function isPdfFilename(filename) {
+				// 使用正则表达式匹配最后一个小数点之后的字符
+				var extension = filename.split('.').pop().toLowerCase();
+
+				// 检查扩展名是否为 "doc" 或 "docx"
+				return extension === "pdf";
+			};
 			//判断是否是xls,xlsx
 			function isXlsOrXlsxFilename(filename) {
 				// 使用正则表达式匹配最后一个小数点之后的字符
@@ -525,7 +534,7 @@
 									</td>
 								</tr>
 								<tr  id="test4">
-									<td class="width-15 active"><label class="">工作流核对：</label></td>
+									<td class="width-15 active"><label class="">工作量核对：</label></td>
 									<td class="width-35">
 										<form:input path="workLoadCheck" htmlEscape="false" readonly="true"
 													class="form-control number money"/>
@@ -574,49 +583,49 @@
 								<tr>
 									<td class="width-15 active"><label class="">预算书：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="budgetStatement"  value="${reserveProcess.budgetStatement}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="budgetStatement"  value="${reserveProcess.budgetStatement}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 									<td class="width-15 active"><label class="">项目建议书：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="projectProposal"  value="${reserveProcess.projectProposal}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="projectProposal"  value="${reserveProcess.projectProposal}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 								</tr>
 								<tr>
 									<td class="width-15 active"><label class="">可研报告：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="studyReport"  value="${reserveProcess.studyReport}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="studyReport"  value="${reserveProcess.studyReport}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 									<td class="width-15 active"><label class="">施工图纸：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="drawings"  value="${reserveProcess.drawings}" type="all" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="drawings"  value="${reserveProcess.drawings}" type="all" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 								</tr>
 								<tr>
 									<td class="width-15 active"><label class="">施工图设计说明书：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="drawingSpecification"  value="${reserveProcess.drawingSpecification}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="drawingSpecification"  value="${reserveProcess.drawingSpecification}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 									<td class="width-15 active"><label class="">拆旧清册：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="demolition"  value="${reserveProcess.demolition}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="demolition"  value="${reserveProcess.demolition}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 								</tr>
 
 								<tr>
 									<td class="width-15 active"><label class="">土建现浇审批单：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="approvalForm"  value="${reserveProcess.approvalForm}" type="*" uploadPath="/personnelTurnover" readonly="false"/>
+										<sys:fileUpload path="approvalForm"  value="${reserveProcess.approvalForm}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover" readonly="false"/>
 									</td>
 									<td class="width-15 active"><label class="">土建预制化审批单：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="civilPrefabricate"  value="${reserveProcess.civilPrefabricate}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="civilPrefabricate"  value="${reserveProcess.civilPrefabricate}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 								</tr>
 
 								<tr>
 									<td class="width-15 active"><label class="">不停电审批单/停电审批单：</label></td>
 									<td class="width-35">
-										<sys:fileUpload path="powerFailure"  value="${reserveProcess.powerFailure}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
+										<sys:fileUpload path="powerFailure"  value="${reserveProcess.powerFailure}" type="*" fileSizeLimit="20" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 									<td class="width-15 active"><label class="">甲供材清册：</label></td>
 									<td class="width-35">

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

@@ -282,7 +282,7 @@
 									</td>
 								</tr>
 								<tr>
-									<td class="width-15 active"><label class="">工作流核对：</label></td>
+									<td class="width-15 active"><label class="">工作量核对：</label></td>
 									<td class="width-35">
 										<form:input path="workLoadCheck" htmlEscape="false"
 													class="form-control number money" readonly="true"/>

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

@@ -362,8 +362,8 @@
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="通过"/>&nbsp;
 									<input id="disagree" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不通过"/>
-									<input id="cancel" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="取消项目"/>
-									<input id="pending" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="待定项目"/>
+<%--									<input id="cancel" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="取消项目"/>--%>
+<%--									<input id="pending" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="待定项目"/>--%>
 								</div>
 							</div>
 						</div>

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

@@ -144,6 +144,7 @@
         var td_id=document.getElementsByClassName("td_id");
         //存放id的数组
         var array_id = [];
+        var proName = '${proName}'
         //循环遍历id
         for (var i = 0; i < td_id.length; i++) {
             array_id[i]=td_id[i].innerHTML;
@@ -153,6 +154,12 @@
             for (var j = 0; j < arrayFile.length; j++) {
                 if (array_id[i]==arrayFile[j]){
                     //追加文件到表单当中
+                    var fileName = arrayFile[j+1].name
+                    if (!fileName.includes(proName)) {
+                        jp.error('上传文件名称与项目名称不匹配');
+                        return ;
+                    }
+
                     formdata.append("file",arrayFile[j+1]);
                 }
             }
@@ -172,22 +179,35 @@
             timeout: 600000,
             success: function (result) {
                 if(result.success && result.errorCode === '-1'){
-                    jp.confirm('项目'+result.msg, function(){
-                        jp.loading('  正在导入，请稍等...');
-                        $.ajax({
-                            type: "POST",
-                            enctype: 'multipart/form-data',
-                            url: '${ctx}/cg/reservemanagementcenter/process/importCGValidations',
-                            data: formdata,
-                            processData: false, //prevent jQuery from automatically transforming the data into a query string
-                            contentType: false,
-                            cache: false,
-                            timeout: 600000,
-                            success: function (result) {
-                                fn(result);
-                            }
-                        })
-                    });
+                    <%--jp.confirm('项目'+result.msg, function(){--%>
+                    <%--    jp.loading('  正在导入，请稍等...');--%>
+                    <%--    $.ajax({--%>
+                    <%--        type: "POST",--%>
+                    <%--        enctype: 'multipart/form-data',--%>
+                    <%--        url: '${ctx}/cg/reservemanagementcenter/process/importCGValidations',--%>
+                    <%--        data: formdata,--%>
+                    <%--        processData: false, //prevent jQuery from automatically transforming the data into a query string--%>
+                    <%--        contentType: false,--%>
+                    <%--        cache: false,--%>
+                    <%--        timeout: 600000,--%>
+                    <%--        success: function (result) {--%>
+                    <%--            fn(result);--%>
+                    <%--        }--%>
+                    <%--    })--%>
+                    <%--});--%>
+                    $.ajax({
+                        type: "POST",
+                        enctype: 'multipart/form-data',
+                        url: '${ctx}/cg/reservemanagementcenter/process/importCGValidations',
+                        data: formdata,
+                        processData: false, //prevent jQuery from automatically transforming the data into a query string
+                        contentType: false,
+                        cache: false,
+                        timeout: 600000,
+                        success: function (result) {
+                            fn(result);
+                        }
+                    })
                 }else if((result.success && result.errorCode === '0')){
                     fn(result)
                 }

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

@@ -0,0 +1,192 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+
+<html>
+<head>
+	<title>省公司评审</title>
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@ include file="/webpage/include/treeview.jsp" %>
+	<%@ include file="drawingReview.js"%>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			$('#disclosureFinishDate').datetimepicker({
+				format: "YYYY-MM-DD"
+			});
+
+		});
+	</script>
+	<style>
+		.gray-background {
+			background-color: gray; /* 初始背景颜色为灰色 */
+		}
+	</style>
+</head>
+<body class="bg-white">
+	<div class="wrapper wrapper-content">
+		<div class="row">
+			<div class="col-md-12">
+				<div class="panel panel-primary">
+					<div class="panel-heading">
+						<h3 class="panel-title">
+							<h3 class="panel-title">省公司评审</h3>
+						</h3>
+					</div>
+					<div class="panel-body">
+						<form:form id="inputForm" modelAttribute="reserveProcess" class="form-horizontal">
+							<form:hidden path="id"/>
+							<form:hidden path="act.taskId"/>
+							<form:hidden path="act.taskName"/>
+							<form:hidden path="act.taskDefKey"/>
+							<form:hidden path="act.procInsId"/>
+							<form:hidden path="act.procDefId"/>
+							<form:hidden id="flag" path="act.flag"/>
+							<table class="table table-bordered">
+								<tbody>
+								<tr>
+									<td colspan="4" class="width-15 active"><label class="">储备项目基本信息：</label></td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">项目年份：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectYear" htmlEscape="false" readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">项目性质：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectNature" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">需求单位：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.demandUnit" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">区域：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.district" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">项目分组：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectGroup" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">储备项目经理：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectManager" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">储备批次：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.reserveBatches" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">供电区域：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.blockSupply" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">网格编号：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.gridNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">单元格编号：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.cellNumber" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">项目储备编号：</label></td>
+									<td class="width-35">
+										<form:input path="projectReserveId" htmlEscape="false"  readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">储备项目名称：</label></td>
+									<td class="width-35">
+										<form:input path="projectName" htmlEscape="false"  readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">国网项目编码：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.stateGridProjectCode" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">国网项目名称：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.stateGridProjectName" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">建设必要性及内容：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.constructionNecessityAndContent" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">变电站名称：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.substationName" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">线路名称：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.circuitName" htmlEscape="false"    readonly="true"  class="form-control"/>
+									</td>
+									<td class="width-15 active"><label class="">网架项目划分：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.netRackProjectDivide" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">需求类型：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.requirementType" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
+									<td class="width-15 active"><label class="">项目类型：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.projectType" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
+								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">费用估算：</label></td>
+									<td class="width-35">
+										<form:input path="reserveSummary.costEstimate" htmlEscape="false" readonly="true"    class="form-control number money"/>
+									</td>
+								</tr>
+
+								<tr>
+									<td colspan="4" class="width-15 active"><label class="">设计资料：</label></td>
+								</tr>
+								</tbody>
+							</table>
+						</form:form>
+						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<div id="toolbar">
+							<button id="export" class="btn btn-warning">
+								<i class="fa fa-file-excel-o"></i> 导出材料清册
+							</button>
+						</div>
+						<table id="dataTable"   data-toolbar="#toolbar"></table>
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="通过"/>&nbsp;
+									<input id="disagree" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不通过"/>
+<%--									<input id="cancel" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="取消项目"/>--%>
+<%--									<input id="pending" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="待定项目"/>--%>
+								</div>
+							</div>
+						</div>
+
+						<c:if test="${not empty reserveProcess.id}">
+							<act:flowChart procInsId="${reserveProcess.act.procInsId}"/>
+							<act:histoicFlow procInsId="${reserveProcess.act.procInsId}" />
+						</c:if>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>

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

@@ -6,6 +6,23 @@
 	<meta name="decorator" content="ani"/>
 	<script type="text/javascript">
 
+		function isEmpty(value) {
+			let result = false;
+			if (value == null || value == undefined) {
+				result = true;
+			}
+			if (typeof value == 'string' && (value.replace(/\s+/g, "") == "" || value == "")) {
+				result = true;
+			}
+			if (typeof value == "object" && value instanceof Array && value.length === 0) {
+				result = true;
+			}
+			return result;
+		};
+		function isNotEmpty (value) {
+			return !isEmpty(value)
+		}
+
 		$(document).ready(function() {
 
 	        $('#beginDate').datetimepicker({
@@ -16,6 +33,23 @@
 		    });
 		});
 		function save() {
+			var allConditionsPassed = true;
+			var powerFailureDifficulty = $("#powerFailureDifficulty").val();
+			if (powerFailureDifficulty === '难') {
+				var powerFailureDescribe = $("#powerFailureDescribe").val();
+				if (isEmpty(powerFailureDescribe)) {
+					allConditionsPassed = false
+					jp.error("请填写停电描述！")
+				}
+			}
+			var otherProblemDifficulty = $("#otherProblemDifficulty").val();
+			if (otherProblemDifficulty === '难') {
+				var otherProblemDescribe = $("#otherProblemDescribe").val();
+				if (isEmpty(otherProblemDescribe)) {
+					allConditionsPassed = false
+					jp.error("请填写其他问题描述！")
+				}
+			}
 			// var projectReserveId = $("#projectReserveId").val();
 			// var projectName = $("#projectName").val();
 			// var construct = $("#constructionNecessityAndContent").val();
@@ -55,7 +89,7 @@
 			var isValidate = jp.validateForm('#inputForm');//校验表单
 			if(!isValidate){
 				return false;
-			}else{
+			}else if (allConditionsPassed){
 				jp.loading();
 				jp.post("${ctx}/cg/reservemanagementcenter/summaryStatistics/update",$('#inputForm').serialize(),function(data){
 					if(data.success){

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

@@ -260,8 +260,8 @@
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="通过"/>&nbsp;
 									<input id="disagree" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不通过"/>
-									<input id="cancel" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="取消项目"/>
-									<input id="pending" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="待定项目"/>
+<%--									<input id="cancel" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="取消项目"/>--%>
+<%--									<input id="pending" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="待定项目"/>--%>
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/cg/statisticalTable/progressStats/progressStats.js

@@ -81,11 +81,11 @@ $(document).ready(function () {
             [
                 [
                     {checkbox:true,width: 36},
-                    {"title":"储备项目设计全流程跟踪","colspan":56,"halign":"center","align": "center",width: "11200px"}
+                    {"title":"储备项目设计全流程跟踪","colspan":61,"halign":"center","align": "center",width: "12200px"}
                 ],
                 [
                     {checkbox:true,width: 36},
-                    { title: "储备基本信息", valign:"middle", align:"center", colspan: 18, rowspan: 1},
+                    { title: "储备基本信息", valign:"middle", align:"center", colspan: 21, rowspan: 1},
                     { title: "储备进度", valign:"middle", align:"center", colspan: 3, rowspan: 1 },
                     { title: "运检部评审", valign:"middle", align:"center", colspan: 3, rowspan: 1 },
                     { title: "设计委托", valign:"middle", align:"center", colspan: 3, rowspan: 1 },
@@ -95,7 +95,7 @@ $(document).ready(function () {
                     { title: "概预算审核", valign:"middle", align:"center", colspan: 6, rowspan: 1 },
                     { title: "省公司评审", valign:"middle", align:"center", colspan: 6, rowspan: 1 },
                     { title: "图纸联合审查", valign:"middle", align:"center", colspan: 6, rowspan: 1 },
-                    { title: "储备完成", valign:"middle", align:"center", colspan: 1, rowspan: 1 },
+                    { title: "储备完成", valign:"middle", align:"center", colspan: 3, rowspan: 1 },
                 ],
                 [
                     {checkbox:true,width: 36},
@@ -104,12 +104,15 @@ $(document).ready(function () {
                     { field: 'demandUnit', title: "需求单位", valign:"middle", align:"center", colspan: 1 },
                     { field: 'district', title: "区域", valign:"middle", align:"center", colspan: 1 },
                     { field: 'projectGroup', title: "项目分组", valign:"middle", align:"center", colspan: 1 },
+                    { field: 'projectManagre', title: "项目经理", valign:"middle", align:"center", colspan: 1 },
                     { field: 'reserveBatches', title: "储备批次", valign:"middle", align:"center", colspan: 1 },
                     { field: 'blockSupply', title: "供电区域", valign:"middle", align:"center", colspan: 1 },
                     { field: 'gridNumber', title: "网格编号", valign:"middle", align:"center", colspan: 1 },
                     { field: 'cellNumber', title: "单元格编号", valign:"middle", align:"center", colspan: 1 },
                     { field: 'projectReserveId', title: "项目储备编号", valign:"middle", align:"center", colspan: 1},
                     { field: 'projectName', title: "项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
+                    { field: 'stateGridProjectCode', title: "国网项目编码", valign:"middle", align:"center", colspan: 1},
+                    { field: 'stateGridProjectName', title: "国网项目名称", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
                     { field: 'constructionNecessityAndContent', title: "建设必要性及内容", valign:"middle", align:"center", colspan: 1,formatter:paramsMatter},
                     { field: 'substationName', title: "变电站名称", valign:"middle", align:"center", colspan: 1 },
                     { field: 'circuitName', title: "线路名称", valign:"middle", align:"center", colspan: 1 },
@@ -155,12 +158,8 @@ $(document).ready(function () {
                     { field: 'jointReviewDesignChange', title: '是否需设计变更', valign:"middle", align:"center" },
                     { field: 'drawingUnionRemarks', title: '备注', valign:"middle", align:"center" ,formatter:paramsMatter},
                     { field: 'completeReserve', title: '是否完成储备', valign:"middle", align:"center" ,formatter:paramsMatter},
-                    // { field: 'drawingFinalize', title: '图纸是否定稿', valign:"middle", align:"center" },
-                    // { field: 'finalDate', title: '定稿日期', valign:"middle", align:"center" },
-                    // { field: 'formalDrawing', title: '是否打印正式图纸', valign:"middle", align:"center" },
-                    // { field: 'drawingDate', title: '通知出图日期', valign:"middle", align:"center" },
-                    // { field: 'transferProjectCenterDate', title: '正式图纸移交项目中心日期', valign:"middle", align:"center" },
-                    // { field: 'transferToConstructionUnitDate', title: '正式图纸移交施工单位日期', valign:"middle", align:"center" }
+                    { field: 'projectCancel', title: '项目是否取消', valign:"middle", align:"center" },
+                    { field: 'implementReserve', title: '是否纳入储备库', valign:"middle", align:"center" },
                 ],
 
             ]