工程量实体类的创建，导入，展示页面，修改页面，批量上传，项目经理判定是否关闭|运行单位经理判定设计变更的流程扭转条件添加，导入施工交底结论表48列的数据格式及非空验证，修改页面的多选框回显联动，

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1523,7 +1523,7 @@ public class ActTaskService extends BaseService {
                 vars.put("design", UserUtils.getByUserName(user.getAssignment().getDesigner()).getLoginName());
             }
         } else {
-            vars.put("return", true);
+            vars.put("importTable", true);
             vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
         }
         // 设置意见
@@ -2056,6 +2056,7 @@ public class ActTaskService extends BaseService {
         } else {
             vars.put("design", UserUtils.getByUserName(user.getAssignment().getInspectionUnit()).getLoginName());
         }
+        vars.put("pass", "yes".equals(flag) ? true : false);
         act.preUpdate();
         // 对不同环节的业务逻辑进行操作
         String taskDefKey = act.getTaskDefKey();
@@ -3396,4 +3397,45 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
+
+    /**
+     * 导入工程量
+     */
+    @Transactional(readOnly = false)
+    public void engineering(Act act, Construction construction) {
+        Map<String, Object> vars = Maps.newHashMap();
+        vars.put("no", false);
+        vars.put("pass", false);
+        vars.put("rural", false);
+        vars.put("administrative", false);
+        vars.put("civil", false);
+        String flag = act.getFlag();
+        if ("yes".equals(flag)) {
+            String processingType = construction.getQuantity().getProcessingType();
+            if ("".equals(processingType)) {
+                vars.put("pass", true);
+            } else {
+                String[] split = processingType.split(",");
+                for (String a : split) {
+                    if ("农村政处".equals(a)) {
+                        vars.put("rural", true);
+                    }
+                    if ("行政政处".equals(a)) {
+                        vars.put("administrative", true);
+                    }
+                    if ("民事政处".equals(a)) {
+                        vars.put("civil", true);
+                    }
+                }
+            }
+        } else {
+            vars.put("no", true);
+        }
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
 }

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -526,6 +526,24 @@ public class ActTaskController extends BaseController {
     }
 
     /**
+     * 导入工程量
+     */
+    @ResponseBody
+    @RequestMapping(value = "importTable")
+    public AjaxJson engineering(Act act, Construction construction) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.engineering(act,construction);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
      * 交底:项目经理交底内容
      */
     @ResponseBody

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Quantity.java

@@ -1,5 +1,7 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.entity;
 
+import java.util.List;
+
 public class Quantity {
     //工程量id
     private String id;
@@ -27,6 +29,7 @@ public class Quantity {
     private String policyIssues;
     //政策处理类型
     private String processingType;
+    private List<String> processingTypeList;
     //政策处理描述
     private String processingDescription;
 
@@ -134,6 +137,14 @@ public class Quantity {
         this.processingType = processingType;
     }
 
+    public List<String> getProcessingTypeList() {
+        return processingTypeList;
+    }
+
+    public void setProcessingTypeList(List<String> processingTypeList) {
+        this.processingTypeList = processingTypeList;
+    }
+
     public String getProcessingDescription() {
         return processingDescription;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -27,74 +27,442 @@ public class MyImportUtils {
         boolean flag = false;
         for (Construction c : constructionList) {
             Disclose disclose = c.getDisclose();
+            //是否已实施
             String hasImplemented = disclose.getHasImplemented();
+            //现场情况描述
             String sceneDescription = disclose.getSceneDescription();
+            //是否有实施必要性
             String isImplement = disclose.getIsImplement();
+            //实施无必要描述
             String noImplementation = disclose.getNoImplementation();
+            //图纸是否完整
             String whetherComplete = disclose.getWhetherComplete();
+            //图纸完整性描述
             String drawingDescription = disclose.getDrawingDescription();
+            //图纸是否规范
             String whetherStandard = disclose.getWhetherStandard();
+            //图纸规范性描述
             String normativeDrawings = disclose.getNormativeDrawings();
+            //是否存在典设图问题
             String whetherDrawing = disclose.getWhetherDrawing();
+            //典设图问题描述
             String problemDescription = disclose.getProblemDescription();
+            //是否存在施工通道
             String whetherChannel = disclose.getWhetherChannel();
+            //施工通道情况描述
             String constructionDescription = disclose.getConstructionDescription();
+            //土建是否需要调整
             String civilAdjusted = disclose.getCivilAdjusted();
+            //土建方案变更内容描述
             String descriptionPlans = disclose.getDescriptionPlans();
+            //土建工作量调整内容描述
             String descriptionAdjustment = disclose.getDescriptionAdjustment();
+            //电气方案是否需要调整
             String electricalAdjusted = disclose.getElectricalAdjusted();
+            //调整原因描述
             String adjustmentDescription = disclose.getAdjustmentDescription();
+            //自动化是否需要变更
             String doesChange = disclose.getDoesChange();
+            //自动化方案调整内容
             String automatedContent = disclose.getAutomatedContent();
+            //自动化工作内容调整
             String automatedAdjustment = disclose.getAutomatedAdjustment();
+            //其他方案是否需要调整
             String otherAdjusted = disclose.getOtherAdjusted();
+            //其他方案调整原因描述
             String descriptionReasons = disclose.getDescriptionReasons();
+            //是否存在难以解决的政处
+            String difficultResolve = disclose.getDifficultResolve();
+            //是否需要进行设计变更
+            String designChanges = disclose.getDesignChanges();
+            //是否需要进行项目关闭
+            String needsClosed = disclose.getNeedsClosed();
+            //政处问题描述
+            String affairsDescription = disclose.getAffairsDescription();
+            //是否需要规划报批（150米及以上土建）
+            String planningRequired = disclose.getPlanningRequired();
+            //是否涉及高铁、高速
+            String highSpeed = disclose.getHighSpeed();
+            //是否存在复杂民事政处
+            String affairsOffice = disclose.getAffairsOffice();
+            //图纸方案是否存在前置条件
+            String preconditions = disclose.getPreconditions();
+            //前置条件描述
+            String preconditionDescription = disclose.getPreconditionDescription();
+            //是否需要定制物资
+            String customizedMaterials = disclose.getCustomizedMaterials();
+            //是否能定制
+            String customizedCan = disclose.getCustomizedCan();
+            //定制原因描述
+            String reasonDescription = disclose.getReasonDescription();
+            //定制物资描述
+            String materialDescription = disclose.getMaterialDescription();
+            //拆旧物资是否与设计一致
+            String demolitionMaterials = disclose.getDemolitionMaterials();
+            //型号不一致描述
+            //String modelDescription = disclose.getModelDescription();
+            //数量不一致描述
+            //String quantityDescription = disclose.getQuantityDescription();
+            //图纸标注是否存在问题
+            String drawingAnnotation = disclose.getDrawingAnnotation();
+            //图纸标注问题描述
+            String drawingProblem = disclose.getDrawingProblem();
+            //是否存在停电问题
+            String powerOutage = disclose.getPowerOutage();
+            //停电问题问题描述
+            String powerProblem = disclose.getPowerProblem();
+            //是否邻近带电线路
+            String nearLiveLine = disclose.getNearLiveLine();
+            //是否下穿高压线路
+            String highVoltageLine = disclose.getHighVoltageLine();
+            //是否存在复杂管线
+            String complexPipeline = disclose.getComplexPipeline();
+            //是否涉及复杂停电
+            String complicatedPower = disclose.getComplicatedPower();
+
+            if (empty(hasImplemented)) {
+                flag = true;
+                tips += "是否已实施不能为空\t";
+            } else {
+                if (!"是".equals(hasImplemented) && !"否".equals(hasImplemented)) {
+                    flag = true;
+                    tips += "是否已实施填写错误\t";
+                }
+            }
+
+            if (empty(isImplement)) {
+                flag = true;
+                tips += "是否有实施必要性不能为空\t";
+            } else {
+                if (!"是".equals(isImplement) && !"否".equals(isImplement)) {
+                    flag = true;
+                    tips += "是否有实施必要性填写错误\t";
+                }
+            }
+
+            if (empty(whetherComplete)) {
+                flag = true;
+                tips += "图纸是否完整不能为空\t";
+            } else {
+                if (!"是".equals(whetherComplete) && !"否".equals(whetherComplete)) {
+                    flag = true;
+                    tips += "图纸是否完整填写错误\t";
+                }
+            }
+
+            if (empty(whetherStandard)) {
+                flag = true;
+                tips += "图纸是否规范不能为空\t";
+            } else {
+                if (!"是".equals(whetherStandard) && !"否".equals(whetherStandard)) {
+                    flag = true;
+                    tips += "图纸是否规范填写错误\t";
+                }
+            }
+
+            if (empty(whetherDrawing)) {
+                flag = true;
+                tips += "是否存在典设图问题不能为空\t";
+            } else {
+                if (!"是".equals(whetherDrawing) && !"否".equals(whetherDrawing)) {
+                    flag = true;
+                    tips += "是否存在典设图问题填写错误\t";
+                }
+            }
+
+            if (empty(whetherChannel)) {
+                flag = true;
+                tips += "是否存在施工通道不能为空\t";
+            } else {
+                if (!"是".equals(whetherChannel) && !"否".equals(whetherChannel)) {
+                    flag = true;
+                    tips += "是否存在施工通道填写错误\t";
+                }
+            }
+
+            if (empty(civilAdjusted)) {
+                flag = true;
+                tips += "土建是否需要调整不能为空\t";
+            } else {
+                if (!"是".equals(whetherChannel) && !"否".equals(whetherChannel)) {
+                    flag = true;
+                    tips += "土建是否需要调整填写错误\t";
+                }
+            }
+
+            if (empty(electricalAdjusted)) {
+                flag = true;
+                tips += "电气方案是否需要调整不能为空\t";
+            } else {
+                if (!"是".equals(electricalAdjusted) && !"否".equals(electricalAdjusted)) {
+                    flag = true;
+                    tips += "电气方案是否需要调整填写错误\t";
+                }
+            }
+
+            if (empty(doesChange)) {
+                flag = true;
+                tips += "自动化是否需要变更不能为空\t";
+            } else {
+                if (!"是".equals(doesChange) && !"否".equals(doesChange)) {
+                    flag = true;
+                    tips += "自动化是否需要变更填写错误\t";
+                }
+            }
+
+            if (empty(otherAdjusted)) {
+                flag = true;
+                tips += "其他方案是否需要调整不能为空\t";
+            } else {
+                if (!"是".equals(otherAdjusted) && !"否".equals(otherAdjusted)) {
+                    flag = true;
+                    tips += "其他方案是否需要调整填写错误\t";
+                }
+            }
+
+            if (empty(difficultResolve)) {
+                flag = true;
+                tips += "是否存在难以解决的政处不能为空\t";
+            } else {
+                if (!"是".equals(difficultResolve) && !"否".equals(difficultResolve)) {
+                    flag = true;
+                    tips += "是否存在难以解决的政处填写错误\t";
+                }
+            }
+
+            if ("是".equals(difficultResolve)) {
+                if (empty(designChanges)) {
+                    flag = true;
+                    tips += "是否需要进行设计变更不能为空\t";
+                } else {
+                    if (!"是".equals(designChanges) && !"否".equals(designChanges)) {
+                        flag = true;
+                        tips += "是否需要进行设计变更填写错误\t";
+                    }
+                }
+
+                if (empty(needsClosed)) {
+                    flag = true;
+                    tips += "是否需要进行项目关闭不能为空\t";
+                } else {
+                    if (!"是".equals(needsClosed) && !"否".equals(needsClosed)) {
+                        flag = true;
+                        tips += "是否需要进行项目关闭填写错误\t";
+                    }
+                }
+                if (empty(affairsDescription)) {
+                    flag = true;
+                    tips += "政处问题描述不能为空\t";
+                }
+            }
+
+            if (empty(planningRequired)) {
+                flag = true;
+                tips += "是否需要规划报批不能为空\t";
+            } else {
+                if (!"是".equals(planningRequired) && !"否".equals(planningRequired)) {
+                    flag = true;
+                    tips += "是否需要规划报批填写错误\t";
+                }
+            }
+
+            if (empty(highSpeed)) {
+                flag = true;
+                tips += "是否涉及高铁、高速不能为空\t";
+            } else {
+                if (!"是".equals(highSpeed) && !"否".equals(highSpeed)) {
+                    flag = true;
+                    tips += "是否涉及高铁、高速填写错误\t";
+                }
+            }
+
+            if (empty(affairsOffice)) {
+                flag = true;
+                tips += "是否存在复杂民事政处不能为空\t";
+            } else {
+                if (!"是".equals(affairsOffice) && !"否".equals(affairsOffice)) {
+                    flag = true;
+                    tips += "是否存在复杂民事政处填写错误\t";
+                }
+            }
+
+            if (empty(preconditions)) {
+                flag = true;
+                tips += "图纸方案是否存在前置条件不能为空\t";
+            } else {
+                if (!"是".equals(preconditions) && !"否".equals(preconditions)) {
+                    flag = true;
+                    tips += "图纸方案是否存在前置条件填写错误\t";
+                }
+            }
+            if ("是".equals(preconditions)) {
+                if (empty(preconditionDescription)) {
+                    flag = true;
+                    tips += "前置条件描述不能为空";
+                }
+            }
+
+            if (empty(customizedMaterials)) {
+                flag = true;
+                tips += "是否需要定制物资不能为空\t";
+            } else {
+                if (!"是".equals(customizedMaterials) && !"否".equals(customizedMaterials)) {
+                    flag = true;
+                    tips += "是否需要定制物资填写错误\t";
+                }
+            }
+
+            if (empty(customizedCan)) {
+                flag = true;
+                tips += "是否能定制不能为空\t";
+            } else {
+                if (!"是".equals(customizedMaterials) && !"否".equals(customizedMaterials)) {
+                    flag = true;
+                    tips += "是否能定制填写错误\t";
+                }
+            }
+
+            if ("是".equals(customizedMaterials)) {
+                if (empty(reasonDescription)) {
+                    flag = true;
+                    tips += "定制原因描述填写错误\t";
+                }
+                if (empty(materialDescription)) {
+                    flag = true;
+                    tips += "定制物资描述填写错误\t";
+                }
+            }
+
+            if (empty(demolitionMaterials)) {
+                flag = true;
+                tips += "拆旧物资是否与设计一致不能为空\t";
+            } else {
+                if (!"是".equals(demolitionMaterials) && !"否".equals(demolitionMaterials)) {
+                    flag = true;
+                    tips += "拆旧物资是否与设计一致填写错误\t";
+                }
+            }
+
+            if (empty(drawingAnnotation)) {
+                flag = true;
+                tips += "图纸标注是否存在问题不能为空\t";
+            } else {
+                if (!"是".equals(drawingAnnotation) && !"否".equals(drawingAnnotation)) {
+                    flag = true;
+                    tips += "图纸标注是否存在问题填写错误\t";
+                }
+            }
+
+            if ("是".equals(drawingAnnotation)) {
+                if (empty(drawingProblem)) {
+                    flag = true;
+                    tips += "图纸标注问题描述不能为空\t";
+                }
+            }
+
+            if (empty(powerOutage)) {
+                flag = true;
+                tips += "是否存在停电问题不能为空\t";
+            } else {
+                if (!"是".equals(powerOutage) && !"否".equals(powerOutage)) {
+                    flag = true;
+                    tips += "是否存在停电问题填写错误\t";
+                }
+            }
+
+            if ("是".equals(powerOutage)) {
+                if (empty(powerProblem)) {
+                    flag = true;
+                    tips += "停电问题问题描述不能为空\t";
+                }
+            }
+
+            if (empty(nearLiveLine)) {
+                flag = true;
+                tips += "是否邻近带电线路不能为空\t";
+            } else {
+                if (!"是".equals(nearLiveLine) && !"否".equals(nearLiveLine)) {
+                    flag = true;
+                    tips += "是否邻近带电线路填写错误\t";
+                }
+            }
+
+            if (empty(highVoltageLine)) {
+                flag = true;
+                tips += "是否下穿高压线路不能为空\t";
+            } else {
+                if (!"是".equals(highVoltageLine) && !"否".equals(highVoltageLine)) {
+                    flag = true;
+                    tips += "是否下穿高压线路填写错误\t";
+                }
+            }
+
+            if (empty(complexPipeline)) {
+                flag = true;
+                tips += "是否存在复杂管线不能为空\t";
+            } else {
+                if (!"是".equals(complexPipeline) && !"否".equals(complexPipeline)) {
+                    flag = true;
+                    tips += "是否存在复杂管线填写错误\t";
+                }
+            }
+
+            if (empty(complicatedPower)) {
+                flag = true;
+                tips += "是否涉及复杂停电不能为空\t";
+            } else {
+                if (!"是".equals(complicatedPower) && !"否".equals(complicatedPower)) {
+                    flag = true;
+                    tips += "是否涉及复杂停电填写错误\t";
+                }
+            }
+
             if ("是".equals(hasImplemented)) {
                 if (empty(sceneDescription)) {
                     flag = true;
-                    tips += "现场情况描述有误\t";
+                    tips += "现场情况描述不能为空\t";
                 }
             }
             if ("否".equals(isImplement)) {
                 if (empty(noImplementation)) {
                     flag = true;
-                    tips += "实施无必要描述有误\t";
+                    tips += "实施无必要不能为空\t";
                 }
             }
             if ("否".equals(whetherComplete)) {
                 if (empty(drawingDescription)) {
                     flag = true;
-                    tips += "图纸完整性描述有误\t";
+                    tips += "图纸完整性不能为空\t";
                 }
             }
             if ("否".equals(whetherStandard)) {
                 if (empty(normativeDrawings)) {
                     flag = true;
-                    tips += "图纸规范性描述有误\t";
+                    tips += "图纸规范性不能为空\t";
                 }
             }
             if ("是".equals(whetherDrawing)) {
                 if (empty(problemDescription)) {
                     flag = true;
-                    tips += "典设图问题描述有误\t";
+                    tips += "典设图问题不能为空\t";
                 }
             }
             if ("是".equals(whetherChannel)) {
                 if (empty(constructionDescription)) {
                     flag = true;
-                    tips += "施工通道情况描述有误\t";
+                    tips += "施工通道情况不能为空\t";
                 }
             }
             if ("是".equals(civilAdjusted)) {
                 if (empty(descriptionPlans) || empty(descriptionAdjustment)) {
                     flag = true;
-                    tips += "土建方案变更内容描述或土建工作量调整内容描述有误\t";
+                    tips += "土建方案变更内容描述或土建工作量调整内容不能为空\t";
                 }
             }
             if ("是".equals(electricalAdjusted)) {
                 if (empty(adjustmentDescription)) {
                     flag = true;
-                    tips += "调整原因描述有误\t";
+                    tips += "调整原因不能为空\t";
                 }
             }
             if ("是".equals(doesChange)) {
@@ -106,9 +474,10 @@ public class MyImportUtils {
             if ("是".equals(otherAdjusted)) {
                 if (empty(descriptionReasons) || empty(descriptionReasons)) {
                     flag = true;
-                    tips += "其他方案调整原因描述有误\t";
+                    tips += "其他方案调整原因不能为空\t";
                 }
             }
+
             if (flag == true) {
                 fin += "<" + c.getReserveProjectName() + ">" + ":" + tips + "</br>";
             } else {
@@ -122,7 +491,11 @@ public class MyImportUtils {
     }
 
     private static boolean empty(String sceneDescription) {
-        return "".equals(sceneDescription) || sceneDescription == null;
+        if ("".equals(sceneDescription) || sceneDescription == null) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     //则现场设备尺寸、最多可扩容尺寸需填写，且默认单位为米

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -167,7 +167,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 交底:运行人员审核图纸
-     * */
+     */
     @RequestMapping(value = "auditDrawings")
     public String auditDrawings(Construction construction, Model model) {
 
@@ -177,7 +177,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 交底:运行单位经理审核方案
-     * */
+     */
     @RequestMapping(value = "designUpload")
     public String designUpload(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -186,7 +186,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 设计单位人员重新设计
-     * */
+     */
     @RequestMapping(value = "operatorUploadList")
     public String operatorUploadList(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -195,7 +195,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 运行经理审核设计变更后
-     * */
+     */
     @RequestMapping(value = "managerUploadList")
     public String managerUploadList(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -204,7 +204,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 配网经理审核设计变更后
-     * */
+     */
     @RequestMapping(value = "afterDistribution")
     public String afterDistribution(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -365,6 +365,24 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "editEng")
     public String editEng(Construction construction, Model model) {
+        Quantity quantity = construction.getQuantity();
+        if (construction.getQuantity() != null) {
+            if (construction.getQuantity().getProcessingType() != null && construction.getQuantity().getProcessingType() != "") {
+                String processingType = construction.getQuantity().getProcessingType();
+                String[] split = processingType.split(",");
+                List<String> processList = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    String s = split[i].toString();
+                    processList.add(s);
+                }
+                construction.getQuantity().setProcessingTypeList(processList);
+            }
+        }
+        List<String> courseList = new ArrayList<String>();
+        courseList.add("行政政处");
+        courseList.add("农村政处");
+        courseList.add("民事政处");
+        model.addAttribute("courseList", courseList);
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/editEng";
     }
@@ -400,7 +418,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 下载施工交底模板文件
-     * */
+     */
     @RequestMapping(value = "excelOut")
     public void excelStandardTemplateOut(HttpServletRequest request,
                                          HttpServletResponse response) throws IOException {
@@ -438,10 +456,10 @@ public class ConstructionController extends BaseController {
 
     /**
      * 下载工程量模板文件
-     * */
+     */
     @RequestMapping(value = "excelQuantity")
     public void excelOutQuantity(HttpServletRequest request,
-                                         HttpServletResponse response) throws IOException {
+                                 HttpServletResponse response) throws IOException {
         String fileName = "quantity.xlsx";
         String filePath = getClass().getResource("/freemarker/" + fileName).getPath();
         File f = new File(filePath);
@@ -558,6 +576,36 @@ public class ConstructionController extends BaseController {
     }
 
     @ResponseBody
+    @RequestMapping(value = "engSave")
+    public AjaxJson engSave(Construction construction, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        List<String> processingTypeList = construction.getQuantity().getProcessingTypeList();
+        String processType = "";
+        for (int i = 0; i < processingTypeList.size(); i++) {
+            processType += processingTypeList.get(i) + ",";
+        }
+        if (construction.getQuantity().getPolicyIssues().equals("是")) {
+            construction.getQuantity().setProcessingType(processType);
+        } else {
+            construction.getQuantity().setProcessingType("");
+            construction.getQuantity().setProcessingDescription("");
+        }
+        construction.getQuantity().setReserveProjectName(construction.getReserveProjectName());
+        try {
+            List<Construction> constructionList = new ArrayList<>();
+            constructionList.add(construction);
+            constructionService.quantityInsert(constructionList);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
+        }
+        return j;
+    }
+
+
+    @ResponseBody
     @RequestMapping(value = "importDisclose")
     public AjaxJson importDisclose(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
         AjaxJson j = new AjaxJson();
@@ -572,7 +620,7 @@ public class ConstructionController extends BaseController {
             ImportExcel ei = new ImportExcel(file, 0, 0);
             Disclose disclose;
             int lastDataRowNum = ei.getLastDataRowNum();
-            for (int i = 3; i <=lastDataRowNum; i++) {
+            for (int i = 3; i <= lastDataRowNum; i++) {
                 construction = new Construction();
                 disclose = new Disclose();
                 Row row = ei.getRow(i);
@@ -625,12 +673,60 @@ public class ConstructionController extends BaseController {
                 disclose.setOtherAdjusted(ei.getCellValue(row, 21).toString());
                 //其他方案调整原因描述
                 disclose.setDescriptionReasons(ei.getCellValue(row, 22).toString());
+                //是否存在难以解决的政处
+                disclose.setDifficultResolve(ei.getCellValue(row, 233).toString());
+                //是否需要进行设计变更
+                disclose.setDesignChanges(ei.getCellValue(row, 24).toString());
+                //是否需要进行项目关闭
+                disclose.setNeedsClosed(ei.getCellValue(row, 25).toString());
+                //政处问题描述
+                disclose.setAffairsDescription(ei.getCellValue(row, 26).toString());
+                //是否需要规划报批（150米及以上土建）
+                disclose.setPlanningRequired(ei.getCellValue(row, 27).toString());
+                //是否涉及高铁、高速
+                disclose.setHighSpeed(ei.getCellValue(row, 28).toString());
+                //是否存在复杂民事政处
+                disclose.setAffairsOffice(ei.getCellValue(row, 29).toString());
+                //图纸方案是否存在前置条件
+                disclose.setPreconditions(ei.getCellValue(row, 30).toString());
+                //前置条件描述
+                disclose.setPreconditionDescription(ei.getCellValue(row, 31).toString());
+                //是否需要定制物资
+                disclose.setCustomizedMaterials(ei.getCellValue(row, 32).toString());
+                //是否能定制
+                disclose.setCustomizedCan(ei.getCellValue(row, 33).toString());
+                //定制原因描述
+                disclose.setReasonDescription(ei.getCellValue(row, 34).toString());
+                //定制物资描述
+                disclose.setMaterialDescription(ei.getCellValue(row, 35).toString());
+                //拆旧物资是否与设计一致
+                disclose.setDemolitionMaterials(ei.getCellValue(row, 36).toString());
+                //型号不一致描述
+                disclose.setModelDescription(ei.getCellValue(row, 37).toString());
+                //数量不一致描述
+                disclose.setQuantityDescription(ei.getCellValue(row, 38).toString());
+                //图纸标注是否存在问题
+                disclose.setDrawingAnnotation(ei.getCellValue(row, 39).toString());
+                //图纸标注问题描述
+                disclose.setDrawingProblem(ei.getCellValue(row, 40).toString());
+                //是否存在停电问题
+                disclose.setPowerOutage(ei.getCellValue(row, 41).toString());
+                //停电问题问题描述
+                disclose.setPowerProblem(ei.getCellValue(row, 42).toString());
+                //是否邻近带电线路
+                disclose.setNearLiveLine(ei.getCellValue(row, 43).toString());
+                //是否下穿高压线路
+                disclose.setHighVoltageLine(ei.getCellValue(row, 44).toString());
+                //是否存在复杂管线
+                disclose.setComplexPipeline(ei.getCellValue(row, 45).toString());
+                //是否涉及复杂停电
+                disclose.setComplicatedPower(ei.getCellValue(row, 46).toString());
                 construction.setDisclose(disclose);
                 constructionList.add(construction);
             }
             //比对当前节点可以导入交底结论的信息
             List<Construction> criteriaList = new ArrayList<>();
-            for (Construction c:activityList) {
+            for (Construction c : activityList) {
                 for (Construction n : constructionList) {
                     if (c.getReserveProjectName().equals(n.getReserveProjectName())) {
                         criteriaList.add(n);
@@ -645,7 +741,7 @@ public class ConstructionController extends BaseController {
             List<Construction> insertList = (List<Construction>) stringObjectMap.get("newConList");
             if (insertList.size() > 0) {
                 for (Construction c : insertList) {
-                    for (Construction n:activityList) {
+                    for (Construction n : activityList) {
                         if (c.getReserveProjectName().equals(n.getReserveProjectName())) {
                             sendList.add(n);
                             c.getAct().setProcInsId(n.getProcInsId());
@@ -673,33 +769,33 @@ public class ConstructionController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "uploadData")
-    public Map<String, Object> uploadData(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model,String procInsId) {
-		if (procInsId!=null&&procInsId!="") {
-			uploadImages.setProcInsId(procInsId);
-		}
-		//查询出所有的附件信息
-		Page<UploadImages> page = constructionService.findUploadPage(new Page<UploadImages>(request, response), uploadImages);
-		//当判定系统为linux的时候
-		if (Global.SYS_TYPE.equals("2")) {
-			List<UploadImages> list = page.getList();
-			for (UploadImages upload:
-				 list) {
-				String a = "";
-				String path = upload.getPath();
-				String[] split = path.split("\\|");
-				for (int i = 0; i < split.length; i++) {
-					a += "http://" + request.getServerName() + split[i] + "|";
-				}
-				upload.setPath(a);
-			}
-		}
-		List<UploadImages> list1 = page.getList();
-		for (UploadImages images : list1) {
-			String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType","");
-			images.setImgName(dictLabels);
-		}
-		List<UploadImages> list = page.getList();
-		//循环list
+    public Map<String, Object> uploadData(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model, String procInsId) {
+        if (procInsId != null && procInsId != "") {
+            uploadImages.setProcInsId(procInsId);
+        }
+        //查询出所有的附件信息
+        Page<UploadImages> page = constructionService.findUploadPage(new Page<UploadImages>(request, response), uploadImages);
+        //当判定系统为linux的时候
+        if (Global.SYS_TYPE.equals("2")) {
+            List<UploadImages> list = page.getList();
+            for (UploadImages upload :
+                    list) {
+                String a = "";
+                String path = upload.getPath();
+                String[] split = path.split("\\|");
+                for (int i = 0; i < split.length; i++) {
+                    a += "http://" + request.getServerName() + split[i] + "|";
+                }
+                upload.setPath(a);
+            }
+        }
+        List<UploadImages> list1 = page.getList();
+        for (UploadImages images : list1) {
+            String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType", "");
+            images.setImgName(dictLabels);
+        }
+        List<UploadImages> list = page.getList();
+        //循环list
         return getBootstrapData(page);
     }
 
@@ -708,7 +804,7 @@ public class ConstructionController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "btnMaterial")
-    public  AjaxJson  btnMaterial(MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+    public AjaxJson btnMaterial(MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
         AjaxJson j = new AjaxJson();
         ImportExcel mo = new ImportExcel(file, 1, "模块表");
         ImportExcel importExcel = new ImportExcel(file, 1, "领料清单");
@@ -725,11 +821,11 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 导入物料表
+     * 导入工程量
      */
     @ResponseBody
     @RequestMapping(value = "importQuantity")
-    public  AjaxJson  importQuantity(MultipartFile file,HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+    public AjaxJson importQuantity(MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
         AjaxJson j = new AjaxJson();
         List<Construction> constructionList = new ArrayList<>();
         Construction construction;
@@ -834,16 +930,29 @@ public class ConstructionController extends BaseController {
                     if ("".equals(processingType)) {
                         flag += "政策处理类型不能为空\t";
                         can = false;
+                    } else {
+                        String[] split = processingType.split(",");
+                        for (String a : split) {
+                            if ("行政政处".equals(a) || "农村政处".equals(a) || "民事政处".equals(a)) {
+
+                            } else {
+                                flag += "政策处理类型填写有误\t";
+                                can = false;
+                            }
+                        }
                     }
                     if ("".equals(processingDescription)) {
                         flag += "政策处理描述不能为空\t";
                         can = false;
                     }
+                } else {
+                    construction.getQuantity().setProcessingType("");
+                    construction.getQuantity().setProcessingDescription("");
                 }
                 if (can) {
                     constructionList.add(construction);
                 } else {
-                    allFlag += quantity.getReserveProjectName() + flag + "\n";
+                    allFlag += "<" + quantity.getReserveProjectName() + ">" + flag + "\n";
                 }
             }
             if (constructionList.size() > 0) {

src/main/webapp/webpage/modules/sg/managementcenter/activiti/editEng.jsp

@@ -31,109 +31,17 @@
                 format: "YYYY-MM-DD HH:mm:ss"
             });
             $('select').change(function () {
-                var hasImplemented = $('#hasImplemented').val();
-                var isImplement = $('#isImplement').val();
-                var whetherComplete = $('#whetherComplete').val();
-                var whetherStandard = $('#whetherStandard').val();
-                var whetherDrawing = $('#whetherDrawing').val();
-                var whetherChannel = $('#whetherChannel').val();
-                var civilAdjusted = $('#civilAdjusted').val();
-                var electricalAdjusted = $('#electricalAdjusted').val();
-                var doesChange = $('#doesChange').val();
-                var otherAdjusted = $('#otherAdjusted').val();
-                var difficultResolve = $('#difficultResolve').val();
-                var preconditions = $('#preconditions').val();
-                var customizedMaterials = $('#customizedMaterials').val();
-                var demolitionMaterials = $('#demolitionMaterials').val();
-                var drawingAnnotation = $('#drawingAnnotation').val();
-                var powerOutage = $('#powerOutage').val();
-                if (hasImplemented == '是') {
-                    $('#sceneDescription').attr('placeholder', '现场情况描述不能为空');
+                var includeAutomation = $('#includeAutomation').val();
+                var policyIssues = $('#policyIssues').val();
+                if (includeAutomation == '是') {
+                    $('#wayOf').attr('placeholder', '通信方式不能为空');
                 } else {
-                    $('#sceneDescription').removeAttr('placeholder');
+                    $('#wayOf').removeAttr('placeholder');
                 }
-                if (isImplement == '否') {
-                    $('#noImplementation').attr('placeholder', '实施无必要描述不能为空');
+                if (policyIssues == '是') {
+                    $("#processingDescription").attr('placeholder', '政策处理描述不能为空');
                 } else {
-                    $('#noImplementation').removeAttr('placeholder');
-                }
-                if (whetherComplete == '否') {
-                    $('#drawingDescription').attr('placeholder', '图纸完整性描述不能为空');
-                } else {
-                    $('#drawingDescription').removeAttr('placeholder');
-                }
-                if (whetherStandard == '否') {
-                    $('#normativeDrawings').attr('placeholder', '图纸规范性描述不能为空');
-                } else {
-                    $('#normativeDrawings').removeAttr('placeholder');
-                }
-                if (whetherDrawing == '是') {
-                    $('#problemDescription').attr('placeholder', '典设图问题描述不能为空');
-                } else {
-                    $('#problemDescription').removeAttr('placeholder');
-                }
-                if (whetherChannel == '是') {
-                    $('#constructionDescription').attr('placeholder', '施工通道情况描述不能为空');
-                } else {
-                    $('#constructionDescription').removeAttr('placeholder');
-                }
-                if (civilAdjusted == '是') {
-                    $('#descriptionPlans').attr('placeholder', '土建方案变更内容描述不能为空');
-                    $('#descriptionAdjustment').attr('placeholder', '土建工作量调整内容描述不能为空');
-                } else {
-                    $('#descriptionPlans').removeAttr('placeholder');
-                    $('#descriptionAdjustment').removeAttr('placeholder');
-                }
-                if (electricalAdjusted == '是') {
-                    $('#adjustmentDescription').attr('placeholder', '调整原因描述不能为空');
-                } else {
-                    $('#adjustmentDescription').removeAttr('placeholder');
-                }
-                if (doesChange == '是') {
-                    $('#automatedContent').attr('placeholder', '自动化方案调整内容不能为空');
-                    $('#automatedAdjustment').attr('placeholder', '自动化工作内容调整不能为空');
-                } else {
-                    $('#automatedContent').removeAttr('placeholder');
-                    $('#automatedAdjustment').removeAttr('placeholder');
-                }
-                if (otherAdjusted == '是') {
-                    $('#descriptionReasons').attr('placeholder', '其他方案调整原因描述不能为空');
-                } else {
-                    $('#descriptionReasons').removeAttr('placeholder');
-                }
-                if (difficultResolve == '是') {
-                    $('#affairsDescription').attr('placeholder', '政处问题描述不能为空');
-                } else {
-                    $('#affairsDescription').removeAttr('placeholder');
-                }
-                if (preconditions == '是') {
-                    $('#preconditionDescription').attr('placeholder', '前置条件描述不能为空');
-                } else {
-                    $('#preconditionDescription').removeAttr('placeholder');
-                }
-                if (customizedMaterials == '是') {
-                    $('#reasonDescription').attr('placeholder', '定制原因描述不能为空');
-                    $('#materialDescription').attr('placeholder', '定制物资描述不能为空');
-                } else {
-                    $('#reasonDescription').removeAttr('placeholder');
-                    $('#materialDescription').removeAttr('placeholder');
-                }
-                if (demolitionMaterials == '是') {
-                    $('#modelDescription').attr('placeholder', '型号不一致描述不能为空');
-                    $('#quantityDescription').attr('placeholder', '数量不一致描述不能为空');
-                } else {
-                    $('#modelDescription').removeAttr('placeholder');
-                    $('#quantityDescription').removeAttr('placeholder');
-                }
-                if (drawingAnnotation == '是') {
-                    $('#drawingProblem').attr('placeholder', '图纸标注问题描述不能为空');
-                } else {
-                    $('#drawingProblem').removeAttr('placeholder');
-                }
-                if (powerOutage == '是') {
-                    $('#powerProblem').attr('placeholder', '停电问题问题描述不能为空');
-                } else {
-                    $('#powerProblem').removeAttr('placeholder');
+                    $("#processingDescription").removeAttr('placeholder');
                 }
             });
         });
@@ -145,7 +53,7 @@
                 return false;
             }
             jp.loading();
-            jp.post("${ctx}/managementcenter/activiti/editConSave", $("#inputForm").serialize(), function (data) {
+            jp.post("${ctx}/managementcenter/activiti/engSave", $("#inputForm").serialize(), function (data) {
                 if (data.success) {
                     jp.getParent().refresh();
                     var dialogIndex = parent.layer.getFrameIndex(window.name); //获取窗口索引
@@ -154,135 +62,27 @@
                 } else {
                     jp.error(data.msg);
                 }
-            })
-        }
-
-        function getVal(groups) {
-            var chk_value = [];//定义一个数组
-            $('input[name="administrationTypeList"]:checked').each(function () {//遍历每一个名字为nodes的复选框，其中选中的执行函数
-                chk_value.push($(this).val());//将选中的值添加到数组chk_value中
             });
-            groups = chk_value.join(";");
-            return groups
         }
 
         function check() {
             var flag = true;
-            var hasImplemented = $('#hasImplemented').val();
-            var sceneDescription = $('#sceneDescription').val();
-            var isImplement = $('#isImplement').val();
-            var noImplementation = $('#noImplementation').val();
-            var whetherComplete = $('#whetherComplete').val();
-            var drawingDescription = $('#drawingDescription').val();
-            var whetherStandard = $('#whetherStandard').val();
-            var normativeDrawings = $('#normativeDrawings').val();
-            var whetherDrawing = $('#whetherDrawing').val();
-            var problemDescription = $('#problemDescription').val();
-            var whetherChannel = $('#whetherChannel').val();
-            var constructionDescription = $('#constructionDescription').val();
-            var civilAdjusted = $('#civilAdjusted').val();
-            var descriptionPlans = $('#descriptionPlans').val();
-            var descriptionAdjustment = $('#descriptionAdjustment').val();
-            var electricalAdjusted = $('#electricalAdjusted').val();
-            var adjustmentDescription = $('#adjustmentDescription').val();
-            var doesChange = $('#doesChange').val();
-            var automatedContent = $('#automatedContent').val();
-            var automatedAdjustment = $('#automatedAdjustment').val();
-            var otherAdjusted = $('#otherAdjusted').val();
-            var descriptionReasons = $('#descriptionReasons').val();
-            var difficultResolve = $('#difficultResolve').val();
-            var affairsDescription = $('#affairsDescription').val();
-            var preconditions = $('#preconditions').val();
-            var preconditionDescription = $('#preconditionDescription').val();
-            var customizedMaterials = $('#customizedMaterials').val();
-            var customizedCan = $('#customizedCan').val();
-            var reasonDescription = $('#reasonDescription').val();
-            var materialDescription = $('#materialDescription').val();
-            var demolitionMaterials = $('#demolitionMaterials').val();
-            var modelDescription = $('#modelDescription').val();
-            var quantityDescription = $('#quantityDescription').val();
-            var drawingAnnotation = $('#drawingAnnotation').val();
-            var drawingProblem = $('#drawingProblem').val();
-            var powerOutage = $('#powerOutage').val();
-            var powerProblem = $('#powerProblem').val();
-
-            if (hasImplemented == '是') {
-                if (sceneDescription == '') {
-                    flag = false;
-                }
-            }
-            if (isImplement == '否') {
-                if (noImplementation == '') {
-                    flag = false;
-                }
-            }
-            if (whetherComplete == '否') {
-                if (drawingDescription == '') {
-                    flag = false;
-                }
-            }
-            if (whetherStandard == '否') {
-                if (normativeDrawings == '') {
-                    flag = false;
-                }
-            }
-            if (whetherDrawing == '是') {
-                if (problemDescription == '') {
-                    flag = false;
-                }
-            }
-            if (whetherChannel == '是') {
-                if (constructionDescription == '') {
-                    flag = false;
-                }
-            }
-            if (civilAdjusted == '是') {
-                if (descriptionPlans == '' || descriptionAdjustment == '') {
-                    flag = false;
-                }
-            }
-            if (electricalAdjusted == '是') {
-                if (adjustmentDescription == '') {
-                    flag = false;
-                }
-            }
-            if (doesChange == '是') {
-                if (automatedContent == '' || automatedAdjustment == '') {
-                    flag = false;
-                }
-            }
-            if (otherAdjusted == '是') {
-                if (descriptionReasons == '') {
-                    flag = false;
-                }
-            }
-            if (difficultResolve == '是') {
-                if (affairsDescription == '') {
-                    flag = false;
-                }
-            }
-            if (preconditions == '是') {
-                if (preconditionDescription == '') {
-                    flag = false;
-                }
-            }
-            if (customizedMaterials == '是' || customizedCan == '是') {
-                if (reasonDescription == '' || materialDescription == '') {
-                    flag = false;
-                }
-            }
-            if (demolitionMaterials == '是') {
-                if (modelDescription == '' || quantityDescription == '') {
-                    flag = false;
-                }
-            }
-            if (drawingAnnotation == '是') {
-                if (drawingProblem == '') {
+            var includeAutomation = $('#includeAutomation').val();
+            var wayOf = $('#wayOf').val();
+            var policyIssues = $('#policyIssues').val();
+            var str = "";
+            $("#check :checked").each(function () {
+                var val = $(this).val();
+                str += val;
+            });
+            var processingDescription = $('#processingDescription').val();
+            if (includeAutomation == '是') {
+                if (wayOf == "") {
                     flag = false;
                 }
             }
-            if (powerOutage == '是') {
-                if (powerProblem == '') {
+            if (policyIssues == "是") {
+                if (str == "" || processingDescription == "") {
                     flag = false;
                 }
             }
@@ -303,182 +103,33 @@
                         <table class="table table-bordered">
                             <tbody>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
-                                <td class="width-35"
-                                <form:input path="quantity.reserveProjectName" readonly="true" cssClass="form-control"/>
-                                </td>
                                 <td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
                                 <td class="width-35">
-                                    <form:input id="includeAutomation" path="quantity.includeAutomation"
-                                                cssClass="form-control required"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right">是否有实施必要性：</label></td>
-                                <td class="width-35">
-                                    <form:select id="wayOf" path="quantity.wayOf" cssClass="form-control">
-                                        <form:option value="是"/>
-                                        <form:option value="否"/>
-                                    </form:select>
-                                        <%--                                    <form:input id="isImplement" path="disclose.isImplement" cssClass="form-control"/>--%>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right"> 实施无必要描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="noImplementation" path="disclose.noImplementation"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right">图纸是否完整：</label></td>
-                                <td class="width-35">
-                                    <form:select id="whetherComplete" path="disclose.whetherComplete"
-                                                 cssClass="form-control">
-                                        <form:option value="是"/>
-                                        <form:option value="否"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right"> 图纸完整性描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="drawingDescription" path="disclose.drawingDescription"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right">图纸是否规范：</label></td>
-                                <td class="width-35">
-                                    <form:select id="whetherStandard" path="disclose.whetherStandard"
-                                                 cssClass="form-control">
-                                        <form:option value="是"/>
-                                        <form:option value="否"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right"> 图纸规范性描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="normativeDrawings" path="disclose.normativeDrawings"
-                                                cssClass="form-control"/>
-
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right">是否存在典设图问题：</label></td>
-                                <td class="width-35">
-                                    <form:select id="whetherDrawing" path="disclose.whetherDrawing"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">典设图问题描述</label></td>
-                                <td class="width-35">
-                                    <form:input id="problemDescription" path="disclose.problemDescription"
-                                                cssClass="form-control"/>
-
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
-                                <td class="width-35">
-                                    <form:select id="whetherChannel" path="disclose.whetherChannel"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">施工通道情况描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="constructionDescription" path="disclose.constructionDescription"
-                                                cssClass="form-control"/>
-
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right"> 土建是否需要调整：</label></td>
-                                <td class="width-35">
-                                    <form:select id="civilAdjusted" path="disclose.civilAdjusted"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">土建方案变更内容描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="descriptionPlans" path="disclose.descriptionPlans"
-                                                cssClass="form-control"/>
-
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right">土建工作量调整内容描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="descriptionAdjustment" path="disclose.descriptionAdjustment"
-                                                cssClass="form-control"/>
-
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">电气方案是否需要调整：</label></td>
-                                <td class="width-35">
-                                    <form:select id="electricalAdjusted" path="disclose.electricalAdjusted"
+                                    <form:select id="includeAutomation" path="quantity.includeAutomation"
                                                  cssClass="form-control">
-                                        <form:option value="否"/>
                                         <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right"> 调整原因描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="adjustmentDescription" path="disclose.adjustmentDescription"
-                                                cssClass="form-control"/>
-
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">自动化是否需要变更：</label></td>
-                                <td class="width-35">
-                                    <form:select id="doesChange" path="disclose.doesChange" cssClass="form-control">
                                         <form:option value="否"/>
-                                        <form:option value="是"/>
                                     </form:select>
                                 </td>
-                            </tr>
-                            <tr>
-                                <td class="width-15 active"><label class="pull-right"> 自动化方案调整内容：</label></td>
-                                <td class="width-35">
-                                    <form:input id="automatedContent" path="disclose.automatedContent"
-                                                cssClass="form-control"/>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">自动化工作内容调整：</label></td>
+                                <td class="width-15 active"><label class="pull-right">通信方式：</label></td>
                                 <td class="width-35">
-                                    <form:input id="automatedAdjustment" path="disclose.automatedAdjustment"
-                                                cssClass="form-control"/>
+                                    <form:input id="wayOf" path="quantity.wayOf"
+                                                cssClass="form-control" placeholder="通信方式不能为空"/>
                                 </td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
                                 <td class="width-35">
-                                    <form:select id="otherAdjusted" path="disclose.otherAdjusted"
+                                    <form:select id="assignmentStyle" path="quantity.assignmentStyle"
                                                  cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
+                                        <form:option value="停电"/>
+                                        <form:option value="带点"/>
+                                        <form:option value="不涉电"/>
                                     </form:select>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">其他方案调整原因描述：</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
                                 <td class="width-35">
-                                    <form:input id="descriptionReasons" path="disclose.descriptionReasons"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
-                                <td class="width-35">
-                                    <form:select id="difficultResolve" path="disclose.difficultResolve"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
-                                <td class="width-35">
-                                    <form:select id="designChanges" path="disclose.designChanges"
+                                    <form:select id="operationSubstation" path="quantity.operationSubstation"
                                                  cssClass="form-control">
                                         <form:option value="否"/>
                                         <form:option value="是"/>
@@ -486,69 +137,47 @@
                                 </td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
                                 <td class="width-35">
-                                    <form:select id="needsClosed" path="disclose.needsClosed"
+                                    <form:select id="namingNumber" path="quantity.namingNumber"
                                                  cssClass="form-control">
                                         <form:option value="否"/>
                                         <form:option value="是"/>
                                     </form:select>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="affairsDescription" path="disclose.affairsDescription"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
                                 <td class="width-35">
-                                    <form:select id="planningRequired" path="disclose.planningRequired"
+                                    <form:select id="engineeringAcceptance" path="quantity.engineeringAcceptance"
                                                  cssClass="form-control">
-                                        <form:option value="否"/>
                                         <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
-                                <td class="width-35">
-                                    <form:select id="highSpeed" path="disclose.highSpeed"
-                                                 cssClass="form-control">
                                         <form:option value="否"/>
-                                        <form:option value="是"/>
                                     </form:select>
                                 </td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
                                 <td class="width-35">
-                                    <form:select id="affairsOffice" path="disclose.affairsOffice"
+                                    <form:select id="electricalAcceptance" path="quantity.electricalAcceptance"
                                                  cssClass="form-control">
                                         <form:option value="否"/>
                                         <form:option value="是"/>
                                     </form:select>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+                                <td class="width-15 active"><label class="pull-right">停电线路：</label></td>
                                 <td class="width-35">
-                                    <form:select id="preconditions" path="disclose.preconditions"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
+                                    <form:input id="blackoutLine" path="quantity.blackoutLine"
+                                                cssClass="form-control" placeholder="不同线路用,分割"/>
                                 </td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核</label></td>
                                 <td class="width-35">
-                                    <form:input id="preconditionDescription" path="disclose.preconditionDescription"
+                                    <form:input id="outageRange" path="quantity.outageRange"
                                                 cssClass="form-control"/>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在政策处理问题</label></td>
                                 <td class="width-35">
-                                    <form:select id="customizedMaterials" path="disclose.customizedMaterials"
+                                    <form:select id="policyIssues" path="quantity.policyIssues"
                                                  cssClass="form-control">
                                         <form:option value="否"/>
                                         <form:option value="是"/>
@@ -556,119 +185,21 @@
                                 </td>
                             </tr>
                             <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+                                <td class="width-15 active"><label class="pull-right">政策处理类型：</label></td>
                                 <td class="width-35">
-                                    <form:select id="customizedCan" path="disclose.customizedCan"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
+                                        <%--                                    <form:input id="processingType" path="quantity.processingType"
+                                                                                        cssClass="form-control"/>--%>
+                                    <div id="check">
+                                        <form:checkboxes id="processingTypeList" path="quantity.processingTypeList"
+                                                         items="${courseList}"/>
+                                    </div>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理描述：</label></td>
                                 <td class="width-35">
-                                    <form:input id="reasonDescription" path="disclose.reasonDescription"
+                                    <form:input id="processingDescription" path="quantity.processingDescription"
                                                 cssClass="form-control"/>
                                 </td>
                             </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="materialDescription" path="disclose.materialDescription"
-                                                cssClass="form-control"/>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
-                                <td class="width-35">
-                                    <form:select id="demolitionMaterials" path="disclose.demolitionMaterials"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="modelDescription" path="disclose.modelDescription"
-                                                cssClass="form-control"/>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="quantityDescription" path="disclose.quantityDescription"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
-                                <td class="width-35">
-                                    <form:select id="drawingAnnotation" path="disclose.drawingAnnotation"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="drawingProblem" path="disclose.drawingProblem"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
-                                <td class="width-35">
-                                    <form:select id="powerOutage" path="disclose.powerOutage"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
-                                <td class="width-35">
-                                    <form:input id="powerProblem" path="disclose.powerProblem"
-                                                cssClass="form-control"/>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
-                                <td class="width-35">
-                                    <form:select id="nearLiveLine" path="disclose.nearLiveLine"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
-                                <td class="width-35">
-                                    <form:select id="highVoltageLine" path="disclose.highVoltageLine"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
-                                <td class="width-35">
-                                    <form:select id="complexPipeline" path="disclose.complexPipeline"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
-                                <td class="width-35">
-                                    <form:select id="complicatedPower" path="disclose.complicatedPower"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
-                                </td>
-                            </tr>
                             </tbody>
                         </table>
                     </form:form>
@@ -679,4 +210,3 @@
 </div>
 </body>
 </html>
-</jsp:root>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/engineering.js

@@ -1,82 +1,106 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-	<script>
-    /**
-     * 项目经理组织交底页面
-     * */
-    $(document).ready(function () {
-        jp.ajaxForm("#inputForm", function (data) {
-            if (data.success) {
-                jp.success(data.msg);
-                jp.go("${ctx}/managementcenter/divide");
-            } else {
-                jp.error(data.msg);
-                $("#inputForm").find("button:submit").button("reset");
-            }
-        });
+<script>
+/**
+ * 项目经理组织交底页面
+ * */
+$(document).ready(function () {
+    jp.ajaxForm("#inputForm", function (data) {
+        if (data.success) {
+            jp.success(data.msg);
+            jp.go("${ctx}/managementcenter/divide");
+        } else {
+            jp.error(data.msg);
+            $("#inputForm").find("button:submit").button("reset");
+        }
+    });
 
 
-        $('#startTime').datetimepicker({
-            format: "YYYY-MM-DD HH:mm:ss"
-        });
-        $('#endTime').datetimepicker({
-            format: "YYYY-MM-DD HH:mm:ss"
-        });
-        //富文本初始化
-        $('#reason').summernote({
-            height: 300,
-            lang: 'zh-CN',
-            readonly: true,
-            callbacks: {
-                onChange: function (contents, $editable) {
-                    $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-                }
+    $('#startTime').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endTime').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    //富文本初始化
+    $('#reason').summernote({
+        height: 300,
+        lang: 'zh-CN',
+        readonly: true,
+        callbacks: {
+            onChange: function (contents, $editable) {
+                $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+            }
+        }
+    });
+
+    /**
+     * 导入交底结论
+     * */
+    $("#btnEng").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入交底结论",
+            content: "${ctx}/tag/importExcel",
+            btn: ['下载模板', '确定', '关闭'],
+            btn1: function () {
+                jp.downloadFile("${ctx}/managementcenter/activiti/excelQuantity");
+            },
+            btn2: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/managementcenter/activiti/importQuantity', function (data) {
+                    if (data.success) {
+                        jp.confirm(data.msg, function () {
+                            jp.close(index);
+                            window.location.reload();
+                        }, function () {
+                            jp.close(index);
+                            window.location.reload();
+                        });
+                    } else {
+                        jp.alert(data.msg);
+                    }
+                });//调用保存事件
+                return false;
+            },
+            btn3: function (index) {
+                jp.close(index);
             }
         });
+    });
+    $("#edit").click(function () {
+        var val = $("#id").val();
+        jp.openSaveDialog('修改工程量', "${ctx}/managementcenter/activiti/editEng?id=" + val, '1000px', '800px');
+    });
 
-        /**
-         * 导入交底结论
-         * */
-        $("#btnEng").click(function () {
-            jp.open({
-                type: 2,
-                area: [500, 200],
-                auto: true,
-                title: "导入交底结论",
-                content: "${ctx}/tag/importExcel",
-                btn: ['下载模板','确定', '关闭'],
-                btn1: function(){
-                    jp.downloadFile("${ctx}/managementcenter/activiti/excelQuantity");
-                },
-                btn2: function (index, layero) {
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/activiti/importQuantity', function (data) {
-                        if (data.success) {
-                            jp.confirm(data.msg, function (){
-                                jp.close(index);
-                                window.location.reload();
-                            }, function () {
-                                jp.close(index);
-                                window.location.reload();
-                            });
-                        } else {
-                            jp.alert(data.msg);
-                        }
-                    });//调用保存事件
-                    return false;
+    $("#agree").click(function () {
+        jp.prompt(" 审批意见", function (message) {
+            jp.post("${ctx}/act/task/engineering",
+                {
+                    "taskId": "${construction.act.taskId}",
+                    "taskName": "${construction.act.taskName}",
+                    "taskDefKey": "${construction.act.taskDefKey}",
+                    "procInsId": "${construction.act.procInsId}",
+                    "procDefId": "${construction.act.procDefId}",
+                    "flag": "yes",
+                    "comment": window.encodeURI(message)
                 },
-                btn3: function (index) {
-                    jp.close(index);
+                function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        jp.go("${ctx}/act/task/todo")
+                    }
                 }
-            });
+            )
         });
-        $("#edit").click(function () {
-            var val = $("#id").val();
-            jp.openSaveDialog('修改工程量', "${ctx}/managementcenter/activiti/editEng?id="+val, '1000px', '800px');
-        });
-    })
+    });
+
+})
+
+//刷新列表
+function refresh() {
+    location.reload();
+}
 
-    //刷新列表
-    function refresh(){
-        location.reload();
-    }
 </script>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/engineering.jsp

@@ -27,9 +27,9 @@
 					</button>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
 							   method="post" class="form-horizontal">
-<%--						<form:hidden path="construction.quantity.id"/>--%>
+						<form:hidden path="id"/>
 						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
-						<input id="id" type="hidden" value="${fns:unescapeHtml(construction.quantity.id)}">
+						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
 						<table class="table table-bordered">
 							<tbody>
 							<tr>
@@ -453,7 +453,7 @@
 							<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="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 								</div>
 							</div>
 						</div>