储备项目新-政策处理信息表修改

src/main/java/com/jeeplus/modules/cg/reservemanagementcenter/reserveManage/entity/ReserveProcessProject.java

@@ -3,8 +3,6 @@ package com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
-import java.util.Date;
-
 /**
  * 储备项目基本信息表
  * @author: 王强
@@ -35,12 +33,21 @@ public class ReserveProcessProject extends DataEntity<ReserveProcessProject> {
     private String ownerReserveFullTime;     //业主储备专职
     private String ownerDistributionNerworkFullTime;           //业主配网专职
     private String ownerProjectManager;      //业主项目经理
+    private String materialSoleDuty;         //业主物资专职
     private String technicalStaff;           //技经人员
     private String operationAndMaintenancePersonnel;           //运维人员
     private String designer;                 //设计人员
     private String budgetPreparer;           //概算编制人员
     private String uninterruptedWorkSurveyPersonnel;           //不停电作业查勘人员
 
+    public String getMaterialSoleDuty() {
+        return materialSoleDuty;
+    }
+
+    public void setMaterialSoleDuty(String materialSoleDuty) {
+        this.materialSoleDuty = materialSoleDuty;
+    }
+
     @ExcelField(title="项目年份", align=2, sort=1)
     public String getProjectYear() {
         return projectYear;

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

@@ -31,6 +31,7 @@
 		a.ownerReserveFullTime,
 		a.ownerDistributionNerworkFullTime,
 		a.ownerProjectManager,
+		a.materialSoleDuty,
 		a.technicalStaff,
 		a.operationAndMaintenancePersonnel,
 		a.designer,
@@ -67,6 +68,7 @@
         ownerReserveFullTime,
         ownerDistributionNerworkFullTime,
         ownerProjectManager,
+        materialSoleDuty,
         technicalStaff,
         operationAndMaintenancePersonnel,
         designer,
@@ -102,6 +104,7 @@
             #{ownerReserveFullTime},
             #{ownerDistributionNerworkFullTime},
             #{ownerProjectManager},
+            #{materialSoleDuty},
             #{technicalStaff},
             #{operationAndMaintenancePersonnel},
             #{designer},
@@ -138,6 +141,7 @@
         ownerReserveFullTime,
         ownerDistributionNerworkFullTime,
         ownerProjectManager,
+        materialSoleDuty,
         technicalStaff,
         operationAndMaintenancePersonnel,
         designer,
@@ -174,6 +178,7 @@
             #{item.ownerReserveFullTime},
             #{item.ownerDistributionNerworkFullTime},
             #{item.ownerProjectManager},
+            #{item.materialSoleDuty},
             #{item.technicalStaff},
             #{item.operationAndMaintenancePersonnel},
             #{item.designer},
@@ -209,6 +214,7 @@
         ownerReserveFullTime = #{ownerReserveFullTime},
         ownerDistributionNerworkFullTime = #{ownerDistributionNerworkFullTime},
         ownerProjectManager = #{ownerProjectManager},
+        materialSoleDuty = #{materialSoleDuty},
         technicalStaff = #{technicalStaff},
         operationAndMaintenancePersonnel = #{operationAndMaintenancePersonnel},
         designer = #{designer},
@@ -247,6 +253,9 @@
         <if test="ownerProjectManager != null and ownerProjectManager != ''">
             ownerProjectManager = #{ownerProjectManager},
         </if>
+        <if test="materialSoleDuty != null and materialSoleDuty != ''">
+            materialSoleDuty = #{materialSoleDuty},
+        </if>
         <if test="technicalStaff != null and technicalStaff != ''">
             technicalStaff = #{technicalStaff},
         </if>
@@ -291,6 +300,9 @@
         <if test="ownerProjectManager != null and ownerProjectManager != ''">
             ownerProjectManager = #{ownerProjectManager},
         </if>
+        <if test="materialSoleDuty != null and materialSoleDuty != ''">
+            materialSoleDuty = #{materialSoleDuty},
+        </if>
         <if test="technicalStaff != null and technicalStaff != ''">
             technicalStaff = #{technicalStaff},
         </if>
@@ -326,7 +338,6 @@
         from cg_reserve_process a
         left join cg_reserve_electricity_work_information b
         on a.projectReserveId = b.projectReserveId
-        from cg_reserve_process a
         <where>
             a.del_flag = 0
             <if test="projectReserveId!=null and projectReserveId!=''">
@@ -422,6 +433,7 @@
 		ownerReserveFullTime,
 		ownerDistributionNerworkFullTime,
 		ownerProjectManager,
+		materialSoleDuty,
 		technicalStaff,
 		operationAndMaintenancePersonnel,
 		designer,

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

@@ -171,6 +171,7 @@
             resultType="com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.entity.ReserveSummary">
         select
         <include refid="reserveManagementColumns"/>
+        ,count(DISTINCT a.projectReserveId)
         from cg_reserve_summary_statistics a
         left join cg_reserve_process b
         on a.projectReserveId = b.projectReserveId

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

@@ -76,11 +76,12 @@ public class ReserveProcessProjectExportUtil {
                 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 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,26); //概算编制人员
+                Cell cell28 = crateCell(workbook,row,27); //不停电作业查勘人
 
                 ReserveProcessProject reserveManagement = list.get(i);
 
@@ -111,12 +112,12 @@ public class ReserveProcessProjectExportUtil {
                 cell20.setCellValue(reserveManagement.getOwnerReserveFullTime());
                 cell21.setCellValue(reserveManagement.getOwnerDistributionNerworkFullTime());
                 cell22.setCellValue(reserveManagement.getOwnerProjectManager());
-                cell23.setCellValue(reserveManagement.getTechnicalStaff());
-                cell24.setCellValue(reserveManagement.getOperationAndMaintenancePersonnel());
-                cell25.setCellValue(reserveManagement.getDesigner());
-                cell26.setCellValue(reserveManagement.getBudgetPreparer());
-                cell27.setCellValue(reserveManagement.getUninterruptedWorkSurveyPersonnel());
-
+                cell23.setCellValue(reserveManagement.getMaterialSoleDuty());
+                cell24.setCellValue(reserveManagement.getTechnicalStaff());
+                cell25.setCellValue(reserveManagement.getOperationAndMaintenancePersonnel());
+                cell26.setCellValue(reserveManagement.getDesigner());
+                cell27.setCellValue(reserveManagement.getBudgetPreparer());
+                cell28.setCellValue(reserveManagement.getUninterruptedWorkSurveyPersonnel());
 
             }
 

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

@@ -70,10 +70,12 @@ public class ReserveProcessProjectProUtil {
                     reserveManagement.setOwnerReserveFullTime((String) importUtil.getCellValue(row,20));
                     reserveManagement.setOwnerDistributionNerworkFullTime((String) importUtil.getCellValue(row,21));
                     reserveManagement.setOwnerProjectManager((String) importUtil.getCellValue(row,22));
-                    reserveManagement.setTechnicalStaff((String) importUtil.getCellValue(row,23));
-                    reserveManagement.setOperationAndMaintenancePersonnel((String) importUtil.getCellValue(row,24));
-                    reserveManagement.setDesigner((String) importUtil.getCellValue(row,25));
-                    reserveManagement.setBudgetPreparer((String) importUtil.getCellValue(row,26));
+                    reserveManagement.setMaterialSoleDuty((String) importUtil.getCellValue(row,23));
+                    reserveManagement.setTechnicalStaff((String) importUtil.getCellValue(row,24));
+                    reserveManagement.setOperationAndMaintenancePersonnel((String) importUtil.getCellValue(row,25));
+                    reserveManagement.setDesigner((String) importUtil.getCellValue(row,26));
+                    reserveManagement.setBudgetPreparer((String) importUtil.getCellValue(row,27));
+                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,28));
 //                    reserveManagement.setUninterruptedWorkSurveyPersonnel((String) importUtil.getCellValue(row,27));
 
 

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

@@ -16,6 +16,7 @@ public class ProgressStats extends DataEntity<ProgressStats> {
     private String releaseReserveTime;              //运检部下达储备时间
     private String designCommission;                //是否发出设计委托
     private String designCommissionIssueTime;       //设计委托发出时间
+    private String limitDate;                       //初设提交限定日期
     private String onSiteConfess;                   //是否进行现场交底
     private String confessCompleteTime;             //交底完成时间
     private String completeDesign;                  //是否完成初设
@@ -115,6 +116,14 @@ public class ProgressStats extends DataEntity<ProgressStats> {
         this.designCommissionIssueTime = designCommissionIssueTime;
     }
 
+    public String getLimitDate() {
+        return limitDate;
+    }
+
+    public void setLimitDate(String limitDate) {
+        this.limitDate = limitDate;
+    }
+
     public String getOnSiteConfess() {
         return onSiteConfess;
     }

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

@@ -13,6 +13,7 @@
 		a.inspectDepartmentReview,
 		a.inspectDepartmentReviewTime,
 		a.releaseReserveTime,
+		a.limitDate,
 		a.onSiteConfess,
 		a.confessCompleteTime,
 		a.provincialCompanyReview,
@@ -52,6 +53,7 @@
         inspectDepartmentReview,
         inspectDepartmentReviewTime,
         releaseReserveTime,
+        limitDate,
         onSiteConfess,
         confessCompleteTime,
         provincialCompanyReview,
@@ -83,6 +85,7 @@
             #{item.inspectDepartmentReview},
             #{item.inspectDepartmentReviewTime},
             #{item.releaseReserveTime},
+            #{item.limitDate},
             #{item.onSiteConfess},
             #{item.confessCompleteTime},
             #{item.provincialCompanyReview},

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

@@ -74,4 +74,5 @@ public class BudgetStatsService extends CrudService<BudgetStatsMapper, BudgetSta
     public History getHistoryByTime(String time,String executeId){
         return dao.getHistoryByTime(time, executeId);
     }
+
 }

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

@@ -263,7 +263,7 @@ public class ExcelExportUtil {
                 cell12.setCellValue(progressStats.getReleaseReserveTime());
                 cell13.setCellValue(progressStats.getDesignCommission());
                 cell14.setCellValue(progressStats.getDesignCommissionIssueTime());
-                cell15.setCellValue("");
+                cell15.setCellValue(progressStats.getLimitDate());
                 cell16.setCellValue(progressStats.getOnSiteConfess());
                 cell17.setCellValue(progressStats.getConfessCompleteTime());
                 cell18.setCellValue(progressStats.getIncludeReserve());

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

@@ -8,7 +8,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -78,7 +80,6 @@ public class ExcelImportUtil {
         int lastRow = importUtil.getLastDataRowNum();
         List<ProgressStats> list = new ArrayList<ProgressStats>();
         ProgressStats progressStats = null;
-
         for (int i = 3; i <= lastRow; i++) {
             progressStats = new ProgressStats();
             Row row = importUtil.getRow(i);
@@ -92,23 +93,31 @@ public class ExcelImportUtil {
                     progressStats.setInspectDepartmentReview((String) importUtil.getCellValue(row, 9));//是否通过运检部评审
                     progressStats.setInspectDepartmentReviewTime((String) importUtil.getCellValue(row, 10));//通过运检部评审时间
                     progressStats.setReleaseReserveTime((String) importUtil.getCellValue(row, 11));//运检部下达储备时间
+//                    progressStats.setLimitDate(format.parse((String) importUtil.getCellValue(row, 14)).toString());//初设提交限定日期
+                    progressStats.setLimitDate(dateFormat((String) importUtil.getCellValue(row, 14)));//初设提交限定日期
                     progressStats.setOnSiteConfess((String) importUtil.getCellValue(row, 15));//是否进行现场交底
-                    progressStats.setConfessCompleteTime((String) importUtil.getCellValue(row, 16));//交底完成时间
+//                    progressStats.setConfessCompleteTime(format.parse((String) importUtil.getCellValue(row, 16)).toString());//交底完成时间
+                    progressStats.setConfessCompleteTime(dateFormat((String) importUtil.getCellValue(row, 16)));//交底完成时间
                     progressStats.setProvincialCompanyReview((String) importUtil.getCellValue(row, 30));//省公司评审-是否参加省公司评审
                     progressStats.setProvincialCompanyReviewBatch((String) importUtil.getCellValue(row, 31));//省公司评审-省公司评审批次
                     progressStats.setPassProvincialCompanyReview((String) importUtil.getCellValue(row, 32));//省公司评审-是否通过省公司评审
                     progressStats.setCauseAnalysis((String) importUtil.getCellValue(row, 33));//省公司评审-未通过原因分析
                     progressStats.setDesignChange((String) importUtil.getCellValue(row, 34));//省公司评审-是否需设计变更
                     progressStats.setDrawingReview((String) importUtil.getCellValue(row, 35));//图纸联合审查-是否进行图纸审查
-                    progressStats.setReviewDate((String) importUtil.getCellValue(row, 36));//图纸联合审查-审图日期
+//                    progressStats.setReviewDate(format.parse((String) importUtil.getCellValue(row, 36)).toString());//图纸联合审查-审图日期
+                    progressStats.setReviewDate(dateFormat((String) importUtil.getCellValue(row, 36)));//图纸联合审查-审图日期
                     progressStats.setPassDrawingReview((String) importUtil.getCellValue(row, 37));//图纸联合审查-是否通过图纸审查
                     progressStats.setReviewComment((String) importUtil.getCellValue(row, 38));//图纸联合审查-未通过审图意见
-                    progressStats.setApprovedDate((String) importUtil.getCellValue(row, 39));//图纸联合审查-通过审核日期
+//                    progressStats.setApprovedDate(format.parse((String) importUtil.getCellValue(row, 39)).toString());//图纸联合审查-通过审核日期
+                    progressStats.setApprovedDate(dateFormat((String) importUtil.getCellValue(row, 39)));//图纸联合审查-通过审核日期
                     progressStats.setJointReviewDesignChange((String) importUtil.getCellValue(row, 40));//图纸联合审查-是否需设计变更
                     progressStats.setFormalDrawing((String) importUtil.getCellValue(row, 43));//是否打印正式图纸
-                    progressStats.setDrawingDate((String) importUtil.getCellValue(row, 44));//通知出图日期
-                    progressStats.setTransferProjectCenterDate((String) importUtil.getCellValue(row, 45));//正式图纸移交项目中心日期
-                    progressStats.setTransferToConstructionUnitDate((String) importUtil.getCellValue(row, 46));//正式图纸移交施工单位日期
+//                    progressStats.setDrawingDate(format.parse((String) importUtil.getCellValue(row, 44)).toString());//通知出图日期
+                    progressStats.setDrawingDate(dateFormat((String) importUtil.getCellValue(row, 44)));//通知出图日期
+//                    progressStats.setTransferProjectCenterDate(format.parse((String) importUtil.getCellValue(row, 45)).toString());//正式图纸移交项目中心日期
+                    progressStats.setTransferProjectCenterDate(dateFormat((String) importUtil.getCellValue(row, 45)));//正式图纸移交项目中心日期
+//                    progressStats.setTransferToConstructionUnitDate(format.parse((String) importUtil.getCellValue(row, 46)).toString());//正式图纸移交施工单位日期
+                    progressStats.setTransferToConstructionUnitDate(dateFormat((String) importUtil.getCellValue(row, 46)));//正式图纸移交施工单位日期
 
                     list.add(progressStats);
                 }
@@ -155,4 +164,11 @@ public class ExcelImportUtil {
         }
         return list;
     }
+
+    public static String dateFormat(String time) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date parse = format.parse(time);
+        String format1 = format.format(parse);
+        return format1;
+    }
 }

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

@@ -129,17 +129,31 @@ public class ProgressStatsController extends BaseController {
                 stats.setDrawAudit("");
                 stats.setReasonForFailure("");
                 stats.setPassAuditDate(null);
-                stats.setChangeDesign("");
                 //设置是否完成审核，是否通过专家审核，未通过原因分析，通过审核日期，是否需设计变更
                 stats.setCompleteReview("");
                 stats.setExpertReview("");
                 stats.setEstimateReasonForFailure("");
                 stats.setEstimatePassAuditDate(null);
-                stats.setEstimateChangeDesign("");
                 //设置图纸是否定稿，定稿日期
                 stats.setDrawingFinalize("");
                 stats.setFinalDate(null);
+                //设置是否需设计变更
+                stats.setChangeDesign("");
             }else {
+                stats.setChangeDesign("");
+                //根据节点名称查找技经人员审预算
+                List<History> ysHistory = statsService.getHistoryByActName(procInsId, "技经人员审预算");
+                if (ysHistory.size()>0){
+                    String ysEndTime = ysHistory.get(ysHistory.size() - 1).getEndTime();
+                    //判断是哪条流程线
+                    HistoryVarinst ysProcInstId = statsService.getByProcInstId(ysEndTime, procInsId);
+                    //不通过的状态
+                    if (ysProcInstId.getName().equals("!pass")){
+                        stats.setChangeDesign("不通过");
+                    }
+                }
+
+
                 //根据procInsId查出当前流程名称
                 String name = statsService.getByExecuteId(procInsId);
                 if (name == null){
@@ -174,7 +188,6 @@ public class ProgressStatsController extends BaseController {
                         stats.setDrawAudit("");
                         stats.setReasonForFailure("");
                         stats.setPassAuditDate(null);
-                        stats.setChangeDesign("");
                     }else {
                         //根据时间来查找下一个节点的(联合审图下一步)信息
                         History historyByTime = statsService.getHistoryByTime(endTime02, procInsId);
@@ -186,14 +199,12 @@ public class ProgressStatsController extends BaseController {
                                 stats.setDrawAudit("是");
                                 stats.setReasonForFailure("");
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("否");
                             }else if (historyByTime.getName().equals("设计单位上传施工图纸")){
                                 //不通过
                                 stats.setCompleteDraw("否");
                                 stats.setDrawAudit("不通过");
                                 stats.setReasonForFailure(comment.getMessage());
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("是");
                             }
                         }else {
                             //还有一种是  取消、待定的情况  流程结束
@@ -204,12 +215,10 @@ public class ProgressStatsController extends BaseController {
                                 stats.setDrawAudit("取消");
                                 stats.setReasonForFailure(comment.getMessage());
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("是");
                             }else if (byProcInstId.getName().equals("rural")){
                                 stats.setDrawAudit("待定");
                                 stats.setReasonForFailure(comment.getMessage());
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("是");
                             }
                         }
                     }
@@ -218,7 +227,6 @@ public class ProgressStatsController extends BaseController {
                     stats.setDrawAudit("");
                     stats.setReasonForFailure("");
                     stats.setPassAuditDate(null);
-                    stats.setChangeDesign("");
                 }
                 //设置是否完成审核，是否通过专家审核，未通过原因分析，通过审核日期，是否需设计变更  概预算审核
                 //在历史表中根据节点名称查找是否就行了概预算审核
@@ -231,7 +239,6 @@ public class ProgressStatsController extends BaseController {
                         stats.setExpertReview("");
                         stats.setEstimateReasonForFailure("");
                         stats.setEstimatePassAuditDate(null);
-                        stats.setEstimateChangeDesign("");
                         //设置图纸是否定稿，定稿日期
                         stats.setDrawingFinalize("");
                         stats.setFinalDate(null);
@@ -245,7 +252,6 @@ public class ProgressStatsController extends BaseController {
                             stats.setExpertReview("是");
                             stats.setEstimateReasonForFailure("");
                             stats.setEstimatePassAuditDate(endTime03);
-                            stats.setEstimateChangeDesign("否");
                             //设置图纸是否定稿，定稿日期
                             stats.setDrawingFinalize("是");
                             stats.setFinalDate(endTime03);
@@ -255,7 +261,6 @@ public class ProgressStatsController extends BaseController {
                             stats.setExpertReview("否");
                             stats.setEstimateReasonForFailure(comment.getMessage());
                             stats.setEstimatePassAuditDate(endTime03);
-                            stats.setEstimateChangeDesign("是");
                             //设置图纸是否定稿，定稿日期
                             stats.setDrawingFinalize("否");
                             stats.setFinalDate("");
@@ -266,7 +271,6 @@ public class ProgressStatsController extends BaseController {
                     stats.setExpertReview("");
                     stats.setEstimateReasonForFailure("");
                     stats.setEstimatePassAuditDate(null);
-                    stats.setEstimateChangeDesign("");
                     //设置图纸是否定稿，定稿日期
                     stats.setDrawingFinalize("");
                     stats.setFinalDate(null);
@@ -363,13 +367,11 @@ public class ProgressStatsController extends BaseController {
                 stats.setDrawAudit("");
                 stats.setReasonForFailure("");
                 stats.setPassAuditDate(null);
-                stats.setChangeDesign("");
                 //设置是否完成审核，是否通过专家审核，未通过原因分析，通过审核日期，是否需设计变更
                 stats.setCompleteReview("");
                 stats.setExpertReview("");
                 stats.setEstimateReasonForFailure("");
                 stats.setEstimatePassAuditDate(null);
-                stats.setEstimateChangeDesign("");
                 //设置图纸是否定稿，定稿日期
                 stats.setDrawingFinalize("");
                 stats.setFinalDate(null);
@@ -408,7 +410,6 @@ public class ProgressStatsController extends BaseController {
                         stats.setDrawAudit("");
                         stats.setReasonForFailure("");
                         stats.setPassAuditDate(null);
-                        stats.setChangeDesign("");
                     }else {
                         //根据时间来查找下一个节点的(联合审图下一步)信息
                         History historyByTime = statsService.getHistoryByTime(endTime02, procInsId);
@@ -420,14 +421,12 @@ public class ProgressStatsController extends BaseController {
                                 stats.setDrawAudit("是");
                                 stats.setReasonForFailure("");
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("否");
                             }else if (historyByTime.getName().equals("设计单位上传施工图纸")){
                                 //不通过
                                 stats.setCompleteDraw("否");
                                 stats.setDrawAudit("不通过");
                                 stats.setReasonForFailure(comment.getMessage());
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("是");
                             }
                         }else {
                             //还有一种是  取消、待定的情况  流程结束
@@ -438,12 +437,10 @@ public class ProgressStatsController extends BaseController {
                                 stats.setDrawAudit("取消");
                                 stats.setReasonForFailure(comment.getMessage());
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("是");
                             }else if (byProcInstId.getName().equals("rural")){
                                 stats.setDrawAudit("待定");
                                 stats.setReasonForFailure(comment.getMessage());
                                 stats.setPassAuditDate(endTime02);
-                                stats.setChangeDesign("是");
                             }
                         }
                     }
@@ -452,7 +449,6 @@ public class ProgressStatsController extends BaseController {
                     stats.setDrawAudit("");
                     stats.setReasonForFailure("");
                     stats.setPassAuditDate(null);
-                    stats.setChangeDesign("");
                 }
                 //设置是否完成审核，是否通过专家审核，未通过原因分析，通过审核日期，是否需设计变更  概预算审核
                 //在历史表中根据节点名称查找是否就行了概预算审核
@@ -465,7 +461,6 @@ public class ProgressStatsController extends BaseController {
                         stats.setExpertReview("");
                         stats.setEstimateReasonForFailure("");
                         stats.setEstimatePassAuditDate(null);
-                        stats.setEstimateChangeDesign("");
                         //设置图纸是否定稿，定稿日期
                         stats.setDrawingFinalize("");
                         stats.setFinalDate(null);
@@ -479,7 +474,6 @@ public class ProgressStatsController extends BaseController {
                             stats.setExpertReview("是");
                             stats.setEstimateReasonForFailure("");
                             stats.setEstimatePassAuditDate(endTime03);
-                            stats.setEstimateChangeDesign("否");
                             //设置图纸是否定稿，定稿日期
                             stats.setDrawingFinalize("是");
                             stats.setFinalDate(endTime03);
@@ -489,7 +483,6 @@ public class ProgressStatsController extends BaseController {
                             stats.setExpertReview("否");
                             stats.setEstimateReasonForFailure(comment.getMessage());
                             stats.setEstimatePassAuditDate(endTime03);
-                            stats.setEstimateChangeDesign("是");
                             //设置图纸是否定稿，定稿日期
                             stats.setDrawingFinalize("否");
                             stats.setFinalDate("");
@@ -500,7 +493,6 @@ public class ProgressStatsController extends BaseController {
                     stats.setExpertReview("");
                     stats.setEstimateReasonForFailure("");
                     stats.setEstimatePassAuditDate(null);
-                    stats.setEstimateChangeDesign("");
                     //设置图纸是否定稿，定稿日期
                     stats.setDrawingFinalize("");
                     stats.setFinalDate(null);

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveManage/reserveManagementForm.jsp

@@ -23,6 +23,7 @@
 		    var owner = $("#ownerReserveFullTime").val();
 		    var ownerDistribut = $("#ownerDistributionNerworkFullTime").val();
 		    var ownerProjectManager = $("#ownerProjectManager").val();
+			var materialSoleDuty = $("#materialSoleDuty").val();
 		    var technicalStaff = $("#technicalStaff").val();
 		    var operation = $("#operationAndMaintenancePersonnel").val();
 		    var designer = $("#designer").val();
@@ -47,6 +48,8 @@
 				jp.error("请填写运维人员")
 			}else if (null==designer||""==designer){
 				jp.error("请填写设计人员")
+			}else if (null==materialSoleDuty||""==materialSoleDuty){
+				jp.error("请填写业主物资专职")
 			}
 
 
@@ -198,20 +201,26 @@
 				</td>
 			</tr>
 			<tr>
+				<td class="width-15 active"><label class=""><font color="red">*</font>业主物资专职：</label></td>
+				<td class="width-35">
+					<form:input path="materialSoleDuty" htmlEscape="false" class="form-control"/>
+				</td>
 				<td class="width-15 active"><label class=""><font color="red">*</font>技经人员：</label></td>
 				<td class="width-35">
 					<form:input path="technicalStaff" htmlEscape="false" 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="operationAndMaintenancePersonnel" htmlEscape="false" 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="designer" htmlEscape="false" class="form-control"/>
 				</td>
+			</tr>
+			<tr>
 				<td class="width-15 active"><label class="">概算编制人员：</label></td>
 				<td class="width-35">
 					<form:input path="budgetPreparer" htmlEscape="false" class="form-control"/>

src/main/webapp/webpage/modules/cg/reservemanagementcenter/reserveManage/reserveManage/reserveManagementInformation.js

@@ -204,13 +204,18 @@ $(document).ready(function () {
                     title: '业主配网</br>专职',
 
                 },
-/*设计及评审情况*/
+                /*设计及评审情况*/
                 {
                     field: 'ownerProjectManager',
                     width:80,
                     title: '业主项目</br>经理',
 
                 },{
+                    field: 'materialSoleDuty',
+                    width:80,
+                    title: '业主物资</br>专职',
+
+                },{
                     field: 'technicalStaff',
                     width:80,
                     title: '技经人员',

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

@@ -23,6 +23,7 @@
 			var owner = $("#ownerReserveFullTime").val();
 			var ownerDistribut = $("#ownerDistributionNerworkFullTime").val();
 			var ownerProjectManager = $("#ownerProjectManager").val();
+			var materialSoleDuty = $("#materialSoleDuty").val();
 			var technicalStaff = $("#technicalStaff").val();
 			var operation = $("#operationAndMaintenancePersonnel").val();
 			var designer = $("#designer").val();
@@ -47,6 +48,8 @@
 				jp.error("请填写运维人员")
 			}else if (null==designer||""==designer){
 				jp.error("请填写设计人员")
+			}else if (null==materialSoleDuty||""==materialSoleDuty){
+				jp.error("请填写业主物资专职")
 			}
 
 
@@ -73,157 +76,158 @@
 	</script>
 </head>
 <body class="bg-white">
-		<form:form id="inputForm" modelAttribute="reserveManagement" class="form-horizontal">
-		<form:hidden path="id"/>
-		<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" class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">项目性质：</label></td>
-					<td class="width-35">
-						<form:input path="projectNature" htmlEscape="false" 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"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">区域：</label></td>
-					<td class="width-35">
-						<form:input path="district" htmlEscape="false"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">项目分组：</label></td>
-					<td class="width-35">
-						<form:input path="projectGroup" htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">储备批次：</label></td>
-					<td class="width-35">
-						<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">供电区域：</label></td>
-					<td class="width-35">
-						<form:input path="blockSupply" htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">网格编号：</label></td>
-					<td class="width-35">
-						<form:input path="gridNumber" htmlEscape="false"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">单元格编号：</label></td>
-					<td class="width-35">
-						<form:input path="cellNumber" htmlEscape="false"    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="projectReserveId" readonly="true" htmlEscape="false"    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"    class="form-control required"/>
-					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
-					<td class="width-35">
-						<form:input path="constructionNecessityAndContent" htmlEscape="false"    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"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">线路名称：</label></td>
-					<td class="width-35">
-						<form:input path="circuitName" htmlEscape="false"    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"    class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="">需求类型：</label></td>
-					<td class="width-35">
-						<form:input path="requirementType" htmlEscape="false"    class="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="">费用估算：</label></td>
-					<td class="width-35">
-						<form:input path="costEstimate" htmlEscape="false"    class="form-control number money"/>
-					</td>
-					<td class="width-15 active"><label class="">备注：</label></td>
-					<td class="width-35">
-						<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
-					</td>
-				</tr>
+<form:form id="inputForm" modelAttribute="reserveManagement" class="form-horizontal">
+	<form:hidden path="id"/>
+	<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" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">项目性质：</label></td>
+			<td class="width-35">
+				<form:input path="projectNature" htmlEscape="false" class="form-control"/>
+			</td>
 
-				<tr>
-					<td colspan="4" class="width-15 active"><label class="">储备人员流转信息：</label></td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class=""><font color="red">*</font>需求提报人：</label></td>
-					<td class="width-35">
-						<form:input path="requester" htmlEscape="false" class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>业主储备专职：</label></td>
-					<td class="width-35">
-						<form:input path="ownerReserveFullTime" htmlEscape="false" 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="ownerDistributionNerworkFullTime" htmlEscape="false" class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>业主项目经理：</label></td>
-					<td class="width-35">
-						<form:input path="ownerProjectManager" htmlEscape="false" 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="technicalStaff" htmlEscape="false" class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>运维人员：</label></td>
-					<td class="width-35">
-						<form:input path="operationAndMaintenancePersonnel" maxlength="200" 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="designer" htmlEscape="false" class="form-control"/>
-					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>概算编制人员：</label></td>
-					<td class="width-35">
-						<form:input path="budgetPreparer" htmlEscape="false" 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="uninterruptedWorkSurveyPersonnel" readonly="true" htmlEscape="false" class="form-control"/>
-					</td>
-				</tr>
-		 	</tbody>
-		</table>
-	</form:form>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">需求单位：</label></td>
+			<td class="width-35">
+				<form:input path="demandUnit" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">区域：</label></td>
+			<td class="width-35">
+				<form:input path="district" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">项目分组：</label></td>
+			<td class="width-35">
+				<form:input path="projectGroup" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">储备批次：</label></td>
+			<td class="width-35">
+				<form:input path="reserveBatches" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">供电区域：</label></td>
+			<td class="width-35">
+				<form:input path="blockSupply" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">网格编号：</label></td>
+			<td class="width-35">
+				<form:input path="gridNumber" htmlEscape="false"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">单元格编号：</label></td>
+			<td class="width-35">
+				<form:input path="cellNumber" htmlEscape="false"    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="projectReserveId" htmlEscape="false"    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"    class="form-control required"/>
+			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>建设必要性及内容：</label></td>
+			<td class="width-35">
+				<form:input path="constructionNecessityAndContent" htmlEscape="false"    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"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">线路名称：</label></td>
+			<td class="width-35">
+				<form:input path="circuitName" htmlEscape="false"    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"    class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class="">需求类型：</label></td>
+			<td class="width-35">
+				<form:input path="requirementType" htmlEscape="false"    class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">费用估算：</label></td>
+			<td class="width-35">
+				<form:input path="costEstimate" htmlEscape="false"    class="form-control number money"/>
+			</td>
+			<td class="width-15 active"><label class="">备注：</label></td>
+			<td class="width-35">
+				<form:textarea path="basicRemarks" htmlEscape="false" rows="3" maxlength="200" 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=""><font color="red">*</font>需求提报人：</label></td>
+			<td class="width-35">
+				<form:input path="requester" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>业主储备专职：</label></td>
+			<td class="width-35">
+				<form:input path="ownerReserveFullTime" htmlEscape="false" 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="ownerDistributionNerworkFullTime" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>业主项目经理：</label></td>
+			<td class="width-35">
+				<form:input path="ownerProjectManager" htmlEscape="false" 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="materialSoleDuty" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>技经人员：</label></td>
+			<td class="width-35">
+				<form:input path="technicalStaff" htmlEscape="false" 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="operationAndMaintenancePersonnel" htmlEscape="false" class="form-control"/>
+			</td>
+			<td class="width-15 active"><label class=""><font color="red">*</font>设计人员：</label></td>
+			<td class="width-35">
+				<form:input path="designer" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		<tr>
+			<td class="width-15 active"><label class="">概算编制人员：</label></td>
+			<td class="width-35">
+				<form:input path="budgetPreparer" htmlEscape="false" class="form-control"/>
+			</td>
+		</tr>
+		</tbody>
+	</table>
+</form:form>
 </body>
 </html>

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

@@ -183,6 +183,12 @@ $(document).ready(function () {
 
                 },
                 {
+                    field: 'limitDate',
+                    width:160,
+                    title: '初设提交<br>限定日期',
+
+                },
+                {
                     field: 'onSiteConfess',
                     width:100,
                     title: '是否进行<br>现场交底',