Merge remote-tracking branch 'origin/master'

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

@@ -1472,25 +1472,36 @@ public class ActTaskService extends BaseService {
 
 
     /**
-     * 交底:项目经理交底内容
+     * 交底:项目经理交底内容自动分发
      */
     @Transactional(readOnly = false)
     public void divideForm(Act act) {
         Map<String, Object> vars = Maps.newHashMap();
         act.preUpdate();
         Project user = MyActiviUtils.findUser(act.getProcInsId());
-        vars.put("design", UserUtils.getByUserName(user.getAssignment().getInspectionUnit()).getLoginName());
-        // 对不同环节的业务逻辑进行操作
-//        String taskDefKey = act.getTaskDefKey();
-        vars.put("problem", "yes".equals(act.getFlag()) ? true : false);
+        String flag = act.getFlag();
+        if ("design".equals(flag)) {
+            vars.put("conditions", true);
+            vars.put("close", false);
+            vars.put("noProblem", false);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getRepUnit()).getLoginName());
+        } else if ("closed".equals(flag)) {
+            vars.put("conditions", false);
+            vars.put("close", true);
+            vars.put("noProblem", false);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getDistribution()).getLoginName());
+        } else {
+            vars.put("conditions", false);
+            vars.put("close", false);
+            vars.put("noProblem", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
         // 提交流程任务
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
 
     /**
-     * 配网运行人员设计变更页面
-     *
-     * @param act
+     * 运行单位经理判定设计变更
      */
     @Transactional(readOnly = false)
     public void operator(Act act) {
@@ -1502,7 +1513,6 @@ public class ActTaskService extends BaseService {
         //获取流程id
         String procInsId = act.getProcInsId();
         Project user = MyActiviUtils.findUser(procInsId);
-
         if ("yes".equals(flag)) {
             String demand = MyActiviUtils.demandByProcInsId(procInsId);
             if ("经研所".equals(demand)) {

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

@@ -683,9 +683,7 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 配网运行人员判定设计变更
-     *
-     * @param act
+     * 运行单位经理判定设计变更
      */
     @ResponseBody
     @RequestMapping(value = "operator")

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

@@ -47,6 +47,55 @@ public class Disclose extends ActEntity<Disclose> {
     private String otherAdjusted;
     //其他方案调整原因描述
     private String descriptionReasons;
+    //是否存在难以解决的政处
+    private String difficultResolve;
+    //是否需要进行设计变更
+    private String designChanges;
+    //是否需要进行项目关闭
+    private String needsClosed;
+    //政处问题描述
+    private String affairsDescription;
+    //是否需要规划报批（150米及以上土建）
+    private String planningRequired;
+    //是否涉及高铁、高速
+    private String highSpeed;
+    //是否存在复杂民事政处
+    private String affairsOffice;
+    //图纸方案是否存在前置条件
+    private String preconditions;
+    //前置条件描述
+    private String preconditionDescription;
+    //是否需要定制物资
+    private String customizedMaterials;
+    //是否能定制
+    private String customizedCan;
+    //定制原因描述
+    private String reasonDescription;
+    //定制物资描述
+    private String materialDescription;
+    //拆旧物资是否与设计一致
+    private String demolitionMaterials;
+    //型号不一致描述
+    private String modelDescription;
+    //数量不一致描述
+    private String quantityDescription;
+    //图纸标注是否存在问题
+    private String drawingAnnotation;
+    //图纸标注问题描述
+    private String drawingProblem;
+    //是否存在停电问题
+    private String powerOutage;
+    //停电问题问题描述
+    private String powerProblem;
+    //是否邻近带电线路
+    private String nearLiveLine;
+    //是否下穿高压线路
+    private String highVoltageLine;
+    //是否存在复杂管线
+    private String complexPipeline;
+    //是否涉及复杂停电
+    private String complicatedPower;
+
 
     public String getHasImplemented() {
         return hasImplemented;
@@ -223,4 +272,196 @@ public class Disclose extends ActEntity<Disclose> {
     public void setDescriptionReasons(String descriptionReasons) {
         this.descriptionReasons = descriptionReasons;
     }
+
+    public String getDifficultResolve() {
+        return difficultResolve;
+    }
+
+    public void setDifficultResolve(String difficultResolve) {
+        this.difficultResolve = difficultResolve;
+    }
+
+    public String getDesignChanges() {
+        return designChanges;
+    }
+
+    public void setDesignChanges(String designChanges) {
+        this.designChanges = designChanges;
+    }
+
+    public String getNeedsClosed() {
+        return needsClosed;
+    }
+
+    public void setNeedsClosed(String needsClosed) {
+        this.needsClosed = needsClosed;
+    }
+
+    public String getAffairsDescription() {
+        return affairsDescription;
+    }
+
+    public void setAffairsDescription(String affairsDescription) {
+        this.affairsDescription = affairsDescription;
+    }
+
+    public String getPlanningRequired() {
+        return planningRequired;
+    }
+
+    public void setPlanningRequired(String planningRequired) {
+        this.planningRequired = planningRequired;
+    }
+
+    public String getHighSpeed() {
+        return highSpeed;
+    }
+
+    public void setHighSpeed(String highSpeed) {
+        this.highSpeed = highSpeed;
+    }
+
+    public String getAffairsOffice() {
+        return affairsOffice;
+    }
+
+    public void setAffairsOffice(String affairsOffice) {
+        this.affairsOffice = affairsOffice;
+    }
+
+    public String getPreconditions() {
+        return preconditions;
+    }
+
+    public void setPreconditions(String preconditions) {
+        this.preconditions = preconditions;
+    }
+
+    public String getPreconditionDescription() {
+        return preconditionDescription;
+    }
+
+    public void setPreconditionDescription(String preconditionDescription) {
+        this.preconditionDescription = preconditionDescription;
+    }
+
+    public String getCustomizedMaterials() {
+        return customizedMaterials;
+    }
+
+    public void setCustomizedMaterials(String customizedMaterials) {
+        this.customizedMaterials = customizedMaterials;
+    }
+
+    public String getCustomizedCan() {
+        return customizedCan;
+    }
+
+    public void setCustomizedCan(String customizedCan) {
+        this.customizedCan = customizedCan;
+    }
+
+    public String getReasonDescription() {
+        return reasonDescription;
+    }
+
+    public void setReasonDescription(String reasonDescription) {
+        this.reasonDescription = reasonDescription;
+    }
+
+    public String getMaterialDescription() {
+        return materialDescription;
+    }
+
+    public void setMaterialDescription(String materialDescription) {
+        this.materialDescription = materialDescription;
+    }
+
+    public String getDemolitionMaterials() {
+        return demolitionMaterials;
+    }
+
+    public void setDemolitionMaterials(String demolitionMaterials) {
+        this.demolitionMaterials = demolitionMaterials;
+    }
+
+    public String getModelDescription() {
+        return modelDescription;
+    }
+
+    public void setModelDescription(String modelDescription) {
+        this.modelDescription = modelDescription;
+    }
+
+    public String getQuantityDescription() {
+        return quantityDescription;
+    }
+
+    public void setQuantityDescription(String quantityDescription) {
+        this.quantityDescription = quantityDescription;
+    }
+
+    public String getDrawingAnnotation() {
+        return drawingAnnotation;
+    }
+
+    public void setDrawingAnnotation(String drawingAnnotation) {
+        this.drawingAnnotation = drawingAnnotation;
+    }
+
+    public String getDrawingProblem() {
+        return drawingProblem;
+    }
+
+    public void setDrawingProblem(String drawingProblem) {
+        this.drawingProblem = drawingProblem;
+    }
+
+    public String getPowerOutage() {
+        return powerOutage;
+    }
+
+    public void setPowerOutage(String powerOutage) {
+        this.powerOutage = powerOutage;
+    }
+
+    public String getPowerProblem() {
+        return powerProblem;
+    }
+
+    public void setPowerProblem(String powerProblem) {
+        this.powerProblem = powerProblem;
+    }
+
+    public String getNearLiveLine() {
+        return nearLiveLine;
+    }
+
+    public void setNearLiveLine(String nearLiveLine) {
+        this.nearLiveLine = nearLiveLine;
+    }
+
+    public String getHighVoltageLine() {
+        return highVoltageLine;
+    }
+
+    public void setHighVoltageLine(String highVoltageLine) {
+        this.highVoltageLine = highVoltageLine;
+    }
+
+    public String getComplexPipeline() {
+        return complexPipeline;
+    }
+
+    public void setComplexPipeline(String complexPipeline) {
+        this.complexPipeline = complexPipeline;
+    }
+
+    public String getComplicatedPower() {
+        return complicatedPower;
+    }
+
+    public void setComplicatedPower(String complicatedPower) {
+        this.complicatedPower = complicatedPower;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -72,11 +72,35 @@
 		d.automatedContent as `disclose.automatedContent`,
 		d.automatedAdjustment as `disclose.automatedAdjustment`,
 		d.otherAdjusted as `disclose.otherAdjusted`,
-		d.descriptionReasons as `disclose.descriptionReasons`
+		d.descriptionReasons as `disclose.descriptionReasons`,
+        d.difficultResolve  as `disclose.difficultResolve` ,
+        d.designChanges  as `disclose.designChanges` ,
+        d.needsClosed  as `disclose.needsClosed` ,
+        d.affairsDescription  as `disclose.affairsDescription` ,
+        d.planningRequired  as `disclose.planningRequired` ,
+        d.highSpeed  as `disclose.highSpeed` ,
+        d.affairsOffice  as `disclose.affairsOffice` ,
+        d.preconditions  as `disclose.preconditions` ,
+        d.preconditionDescription  as `disclose.preconditionDescription` ,
+        d.customizedMaterials  as `disclose.customizedMaterials` ,
+        d.customizedCan  as `disclose.customizedCan` ,
+        d.reasonDescription  as `disclose.reasonDescription` ,
+        d.materialDescription  as `disclose.materialDescription` ,
+        d.demolitionMaterials  as `disclose.demolitionMaterials` ,
+        d.modelDescription  as `disclose.modelDescription` ,
+        d.quantityDescription  as `disclose.quantityDescription` ,
+        d.drawingAnnotation  as `disclose.drawingAnnotation` ,
+        d.drawingProblem  as `disclose.drawingProblem` ,
+        d.powerOutage  as `disclose.powerOutage` ,
+        d.powerProblem  as `disclose.powerProblem` ,
+        d.nearLiveLine  as `disclose.nearLiveLine` ,
+        d.highVoltageLine  as `disclose.highVoltageLine` ,
+        d.complexPipeline  as `disclose.complexPipeline` ,
+        d.complicatedPower  as `disclose.complicatedPower`
     </sql>
 
     <sql id="assignmentColumns">
-            g.reserveProjectName as `assignment.reserveProjectName`,
+        g.reserveProjectName as `assignment.reserveProjectName`,
             g.disclosureType as `assignment.disclosureType`,
             g.projectReleaseBatch as `assignment.projectReleaseBatch`,
             g.deliveryDate as `assignment.deliveryDate`,
@@ -207,8 +231,7 @@
 
     <update id="newUpdate">
         UPDATE xm_construction_clarificaiton
-        SET
-            reserveProjectName='1'
+        SET reserveProjectName='1'
         WHERE id = #{id}
     </update>
 
@@ -282,40 +305,64 @@
 
     <insert id="replaceDisclose">
         replace into xm_disclose_conclusion
-            (
-             id,
-             create_by,
-             create_date,
-             update_by,
-             update_date,
-            remarks,
-             del_flag,
-             proc_ins_id,
-             hasImplemented,
-             sceneDescription,
-             isImplement,
-             noImplementation,
-             whetherComplete,
-             drawingDescription,
-             whetherStandard,
-             normativeDrawings,
-             whetherDrawing,
-             problemDescription,
-             whetherChannel,
-             constructionDescription,
-             civilAdjusted,
-             descriptionPlans,
-             descriptionAdjustment,
-             electricalAdjusted,
-             adjustmentDescription,
-             doesChange,
-             automatedContent,
-             automatedAdjustment,
-             otherAdjusted,
-             descriptionReasons
-            )values
-        <foreach collection="list" item="item" index="index" separator="," >
         (
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        remarks,
+        del_flag,
+        proc_ins_id,
+        hasImplemented,
+        sceneDescription,
+        isImplement,
+        noImplementation,
+        whetherComplete,
+        drawingDescription,
+        whetherStandard,
+        normativeDrawings,
+        whetherDrawing,
+        problemDescription,
+        whetherChannel,
+        constructionDescription,
+        civilAdjusted,
+        descriptionPlans,
+        descriptionAdjustment,
+        electricalAdjusted,
+        adjustmentDescription,
+        doesChange,
+        automatedContent,
+        automatedAdjustment,
+        otherAdjusted,
+        descriptionReasons,
+        difficultResolve,
+        designChanges,
+        needsClosed,
+        affairsDescription,
+        planningRequired,
+        highSpeed,
+        affairsOffice,
+        preconditions,
+        preconditionDescription,
+        customizedMaterials,
+        customizedCan,
+        reasonDescription,
+        materialDescription,
+        demolitionMaterials,
+        modelDescription,
+        quantityDescription,
+        drawingAnnotation,
+        drawingProblem,
+        powerOutage,
+        powerProblem,
+        nearLiveLine,
+        highVoltageLine,
+        complexPipeline,
+        complicatedPower
+        )values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
             #{item.id},
             #{item.createBy.id},
             #{item.createDate},
@@ -345,38 +392,59 @@
             #{item.disclose.automatedContent},
             #{item.disclose.automatedAdjustment},
             #{item.disclose.otherAdjusted},
-            #{item.disclose.descriptionReasons}
-        )
+            #{item.disclose.descriptionReasons},
+            #{item.disclose.difficultResolve},
+            #{item.disclose.designChanges},
+            #{item.disclose.needsClosed},
+            #{item.disclose.affairsDescription},
+            #{item.disclose.planningRequired},
+            #{item.disclose.highSpeed},
+            #{item.disclose.affairsOffice},
+            #{item.disclose.preconditions},
+            #{item.disclose.preconditionDescription},
+            #{item.disclose.customizedMaterials},
+            #{item.disclose.customizedCan},
+            #{item.disclose.reasonDescription},
+            #{item.disclose.materialDescription},
+            #{item.disclose.demolitionMaterials},
+            #{item.disclose.modelDescription},
+            #{item.disclose.quantityDescription},
+            #{item.disclose.drawingAnnotation},
+            #{item.disclose.drawingProblem},
+            #{item.disclose.powerOutage},
+            #{item.disclose.powerProblem},
+            #{item.disclose.nearLiveLine},
+            #{item.disclose.highVoltageLine},
+            #{item.disclose.complexPipeline},
+            #{item.disclose.complicatedPower}
+            )
         </foreach>
     </insert>
     <insert id="uploadSave">
-        INSERT INTO xm_upolad_images(
-            id,
-            create_by,
-            create_date,
-            update_by,
-            update_date,
-            remarks,
-            del_flag,
-            imgName,
-            path,
-            proc_ins_id,
-            uid,
-            reserveProjectName
-        ) VALUES (
-                     #{id},
-                     #{createBy.id},
-                     #{createDate},
-                     #{updateBy.id},
-                     #{updateDate},
-                     #{remarks},
-                     #{delFlag},
-                     #{imgName},
-                     #{path},
-                     #{procInsId},
-                     #{uid},
-                     #{reserveProjectName}
-                 )
+        INSERT INTO xm_upolad_images(id,
+                                     create_by,
+                                     create_date,
+                                     update_by,
+                                     update_date,
+                                     remarks,
+                                     del_flag,
+                                     imgName,
+                                     path,
+                                     proc_ins_id,
+                                     uid,
+                                     reserveProjectName)
+        VALUES (#{id},
+                #{createBy.id},
+                #{createDate},
+                #{updateBy.id},
+                #{updateDate},
+                #{remarks},
+                #{delFlag},
+                #{imgName},
+                #{path},
+                #{procInsId},
+                #{uid},
+                #{reserveProjectName})
     </insert>
 
     <select id="findByProcInsId" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
@@ -389,7 +457,7 @@
         on a.reserveProjectName = g.reserveProjectName
         LEFT JOIN xm_disclose_conclusion d
         on a.proc_ins_id = d.proc_ins_id
-        where  a.proc_ins_id in
+        where a.proc_ins_id in
         <foreach collection="list" open="(" close=")" index="item" item="item" separator=",">
             #{item.procInsId}
         </foreach>
@@ -480,9 +548,9 @@
             <if test="dataScope != null and dataScope != ''">
                 ${dataScope}
             </if>
-          <if test="reserveProjectName != null and reserveProjectName != ''">
-              and reserveProjectName = #{reserveProjectName}
-          </if>
+            <if test="reserveProjectName != null and reserveProjectName != ''">
+                and reserveProjectName = #{reserveProjectName}
+            </if>
             <if test="uid != null and uid != ''">
                 AND uid = #{uid}
             </if>
@@ -504,7 +572,8 @@
     </select>
     <update id="updateOIPI">
         update xm_disclose_conclusion
-        set create_date = now() where proc_ins_id = #{procInsId};
+        set create_date = now()
+        where proc_ins_id = #{procInsId};
     </update>
     <update id="updateCloseStatus">
         update xm_material_project

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

@@ -52,61 +52,61 @@ public class MyImportUtils {
             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)) {
                 if (empty(automatedContent) || empty(automatedAdjustment)) {
                     flag = true;
-                    tips +="自动化方案调整内容或自动化工作内容调整有误\t";
+                    tips += "自动化方案调整内容或自动化工作内容调整有误\t";
                 }
             }
             if ("是".equals(otherAdjusted)) {
                 if (empty(descriptionReasons) || empty(descriptionReasons)) {
                     flag = true;
-                    tips +="其他方案调整原因描述有误\t";
+                    tips += "其他方案调整原因描述有误\t";
                 }
             }
             if (flag == true) {
@@ -159,12 +159,53 @@ public class MyImportUtils {
         String doesChange = disclose.getDoesChange();
         String otherAdjusted = disclose.getOtherAdjusted();
 
-        if ("否".equals(hasImplemented) && "是".equals(isImplement) && "是".equals(whetherComplete) && "是".equals(whetherStandard) && "否".equals(whetherDrawing) && "否".equals(whetherChannel) && "否".equals(civilAdjusted) && "否".equals(electricalAdjusted) && "否".equals(doesChange) && "否".equals(otherAdjusted)) {
+        String difficultResolve = disclose.getDifficultResolve();
+        String designChanges = disclose.getDesignChanges();
+        String needsClosed = disclose.getNeedsClosed();
+
+        String preconditions = disclose.getPreconditions();
+        String customizedMaterials = disclose.getCustomizedMaterials();
+        String demolitionMaterials = disclose.getDemolitionMaterials();
+
+
+        if ("否".equals(hasImplemented)
+                && "是".equals(isImplement)
+                && "是".equals(whetherComplete)
+                && "是".equals(whetherStandard)
+                && "否".equals(whetherDrawing)
+                && "否".equals(whetherChannel)
+                && "否".equals(civilAdjusted)
+                && "否".equals(electricalAdjusted)
+                && "否".equals(doesChange)
+                && "否".equals(otherAdjusted)
+                && "否".equals(designChanges)
+                && "否".equals(needsClosed)
+                && "否".equals(preconditions)
+                && "否".equals(customizedMaterials)
+                && "否".equals(demolitionMaterials)) {
             model.addAttribute("noProblem", true);
         } else {
-            if ("是".equals(hasImplemented) || "否".equals(isImplement)) {
+            if ("是".equals(hasImplemented)
+                    || "否".equals(isImplement)
+                    || "是".equals(demolitionMaterials)) {
+                model.addAttribute("closed", true);
+            } else if ("否".equals(whetherComplete)
+                    || "否".equals(whetherStandard)
+                    || "是".equals(whetherDrawing)
+                    || "是".equals(whetherChannel)
+                    || "是".equals(civilAdjusted)
+                    || "是".equals(electricalAdjusted)
+                    || "是".equals(doesChange)
+                    || "是".equals(otherAdjusted)
+                    || "是".equals(preconditions)
+                    || "是".equals(customizedMaterials)) {
+                model.addAttribute("design", true);
+            }
+        }
+        if ("是".equals(difficultResolve)) {
+            if ("是".equals(needsClosed)) {
                 model.addAttribute("closed", true);
-            } else if ("否".equals(whetherComplete) || "否".equals(whetherStandard) || "是".equals(whetherDrawing) || "是".equals(whetherChannel) || "是".equals(civilAdjusted) || "是".equals(electricalAdjusted) || "是".equals(doesChange) || "是".equals(otherAdjusted)) {
+            } else if ("是".equals(designChanges)) {
                 model.addAttribute("design", true);
             }
         }

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

@@ -361,6 +361,15 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/humanReview";
     }
 
+    /**
+     * 导入材料表及拆旧表
+     */
+    @RequestMapping(value = "importTable")
+    public String importTable(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/importTable";
+    }
+
 
     @RequestMapping(value = "excelOut")
     public void excelStandardTemplateOut(HttpServletRequest request,

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/MaterialInfoMapper.java

@@ -16,9 +16,11 @@ import java.util.List;
 @MyBatisMapper
 public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 	int insertList(@Param("list") List<MaterialInfo> list);
+	void insertOldList(@Param("list") List<MaterialInfo> list);
 	List<MaterialInfo> findSat(String batch);
 	List<MaterialInfo> findProjectName();
 	List<MaterialInfo> findByList(@Param("list") List<MaterialProject> list);
 	void deleteByPro(String projectName);
+	void deleteByOld(String projectName);
 
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/mapper/xml/MaterialInfoMapper.xml

@@ -161,7 +161,52 @@
 		)
         </foreach>
 	</insert>
-	
+
+	<insert id="insertOldList">
+		replace INTO xm_material_old_data(
+		id,
+		create_by,
+		create_date,
+		update_by,
+		update_date,
+		remarks,
+		del_flag,
+		project_name,
+		material_code,
+		material_name,
+		extend_description ,
+		unit ,
+		total_count,
+		weight_kg,
+		weight_ton,
+		supply_type,
+		note,
+		state
+		) VALUES
+		<foreach collection="list" item="item" index="index" separator="," >
+			(
+			#{item.id},
+			#{item.createBy.id},
+			#{item.createDate},
+			#{item.updateBy.id},
+			#{item.updateDate},
+			#{item.remarks},
+			#{item.delFlag},
+			#{item.projectName},
+			#{item.materialCode},
+			#{item.materialName},
+			#{item.extendDescription},
+			#{item.unit},
+			#{item.totalCount},
+			#{item.weightKg},
+			#{item.weightTon},
+			#{item.supplyType},
+			#{item.note},
+			#{item.state}
+			)
+		</foreach>
+	</insert>
+
 	<update id="update">
 		UPDATE xm_material_data SET
 			update_by = #{updateBy.id},
@@ -181,6 +226,11 @@
 		DELETE FROM xm_material_data
 		WHERE project_name = #{projectName}
 	</delete>
+
+	<delete id="deleteByOld">
+		DELETE FROM xm_material_old_data
+		WHERE project_name = #{projectName}
+	</delete>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialInfoService.java

@@ -67,6 +67,14 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		}
 		materialInfoMapper.insertList(list);
 	}
+
+	@Transactional(readOnly = false)
+	public void insertOldList(List<MaterialInfo> list) {
+		for(MaterialInfo maintainData : list){
+			maintainData.preInsert();
+		}
+		materialInfoMapper.insertOldList(list);
+	}
 	
 	@Transactional(readOnly = false)
 	public void delete(MaterialInfo materialInfo) {
@@ -94,9 +102,13 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		MaterialProject materialProject1 = new MaterialProject();
 		materialProject1.setReserveProjectName(projectName);
 		List<MaterialProject> materialProjects = materialProjectService.findList(materialProject1);
-		if(materialProjects != null && materialProjects.size() > 0){
-			materialProjectService.delete(materialProjects.get(0));
+		if (materialProjects != null && materialProjects.size() > 0) {
 			materialInfoMapper.deleteByPro(projectName);
+			materialInfoMapper.deleteByOld(projectName);
+		} else {
+			MaterialProject materialProject = new MaterialProject();
+			materialProject.setReserveProjectName(projectName);
+			materialProjectService.save(materialProject);
 		}
 		List<MaterialInfo> materialInfos = getData(importExcel,projectName);   //sheet页数据
 //		List<MaterialInfo> list = replaceDate(materialInfos);          //对比替换数据
@@ -104,9 +116,7 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 //		List<MaterialInfo> standardList = materialInfoMapper.findSat(batch);     //标准库数据
 //		List<MaterialInfo> newList = compareData(list,standardList);    //比对之后的数据
 		saveList(list);
-		MaterialProject materialProject = new MaterialProject();
-		materialProject.setReserveProjectName(projectName);
-        materialProjectService.save(materialProject);
+		insertOldList(list);
 	}
 
 	/**

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

@@ -292,6 +292,135 @@
                                     ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                             </td>
                         </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
                 </form:form>

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

@@ -10,6 +10,38 @@
     <script type="text/javascript">
         $(document).ready(function () {
             $("#agree").click(function () {
+                var closed = true;
+                var design = true;
+                var noProblem = true;
+                var cValue = "";
+                $('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
+                    if ("noProblem" == $(this).val()){
+                        noProblem = false;
+                    }
+                    if ("design" == $(this).val()){
+                        design = false;
+                    }
+                    if ("closed" == $(this).val()){
+                        closed = false;
+                    }
+                    cValue += $(this).val()
+                });
+                if (closed && noProblem && design) {
+                    jp.error("请选择类型");
+                    return false;
+                }
+                if (!noProblem) {
+                    if (!design || !closed) {
+                        jp.error("请正确选择问题类型");
+                        return false;
+                    }
+                }
+                if (!closed) {
+                    if (!design) {
+                        jp.error("项目关闭不可与其它类型同时发起");
+                        return false;
+                    }
+                }
                 jp.prompt(" 审批意见", function (message) {
                     jp.post("${ctx}/act/task/divideForm",
                         {
@@ -18,7 +50,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "flag": "yes",
+                            "flag":cValue,
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
@@ -61,18 +93,12 @@
                             <tr>
                                 <td class="width-15 active"><label class="pull-right">问题类型：</label></td>
                                 <td class="width-35">
-                                    <input type="checkbox" name="favorite" value="pass8"
-                                           <c:if test="${noProblem}">checked="checked"</c:if>
-                                           onclick="return false"> 无问题
-                                    &nbsp;
-                                    <input type="checkbox" name="favorite" value="pass1"
-                                           <c:if test="${design}">checked="checked"</c:if>
-                                           onclick="return false"> 设计变更
-                                    &nbsp;
-                                    <input type="checkbox" name="favorite" value="pass2"
-                                           <c:if test="${closed}">checked="checked"</c:if>
-                                           onclick="return false"> 项目关闭
-                                    &nbsp;
+                                    <input type="checkbox" name="favorite" value="noProblem"
+                                           <c:if test="${noProblem}">checked="checked"</c:if>> 无问题
+                                    <input type="checkbox" name="favorite" value="design"
+                                           <c:if test="${design}">checked="checked"</c:if>> 设计变更
+                                    <input type="checkbox" name="favorite" value="closed"
+                                           <c:if test="${closed}">checked="checked"</c:if>> 项目关闭
                                 </td>
                                 <td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
                                 <td class="width-35">
@@ -290,6 +316,138 @@
                                         ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                                 </td>
                             </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.designChanges)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditions)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </form:form>

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

@@ -42,6 +42,12 @@
                 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', '现场情况描述不能为空');
                 }else {
@@ -96,6 +102,40 @@
                 }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');
+                }
             });
         });
 
@@ -151,6 +191,22 @@
             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;
@@ -195,6 +251,36 @@
                     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 == '') {
+                    flag = false;
+                }
+            }
+            if (powerOutage == '是') {
+                if (powerProblem == '') {
+                    flag = false;
+                }
+            }
             return flag;
         }
     </script>
@@ -380,6 +466,209 @@
                                                 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"
+                                                 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="needsClosed" path="disclose.needsClosed"
+                                                 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-35">
+                                    <form:select id="planningRequired" path="disclose.planningRequired"
+                                                 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-35">
+                                    <form:select id="affairsOffice" path="disclose.affairsOffice"
+                                                 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="preconditions" path="disclose.preconditions"
+                                                 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="preconditionDescription" path="disclose.preconditionDescription"
+                                                cssClass="form-control"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+                                <td class="width-35">
+                                    <form:select id="customizedMaterials" path="disclose.customizedMaterials"
+                                                 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="customizedCan" path="disclose.customizedCan"
+                                                 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="reasonDescription" path="disclose.reasonDescription"
+                                                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>

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

@@ -0,0 +1,415 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>导入材料表和拆旧物资表</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+
+		})
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<h3 class="panel-title">导入材料表和拆旧物资表</h3>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<button id="btnMaterial" class="btn btn-info">
+						<i class="fa fa-folder-open-o"></i> 导入材料表
+					</button>
+					<button id="btnInReason" class="btn btn-info">
+						<i class="fa fa-folder-open-o"></i> 导入拆旧表
+					</button>
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
+							   method="post" class="form-horizontal">
+						<form:hidden path="id"/>
+						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
+						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.reserveProjectName)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">需求单位：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.demandUnit)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectId)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.projectName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">市公司：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.municipalCompany)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 县公司：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.countyCompany)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目性质：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.projectNature)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 需求单位：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.demandUnit)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">运维单位：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.operationUnit)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 供电区域：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.powerSupplyArea)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">网格编号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.gridNumber)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 单元格编号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.cellNumber)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目储备编号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.projectReserveNo)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">电网项目编号</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.gridProjectNo)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.erpNo)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">建设必要性及内容：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.necessityContent)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 变电站名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.subStationName)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">线路名称：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.lineName)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.projectType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否迎峰度夏项目：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.whetherSummer)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 项目基本说明：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.basicDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">工区备注：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.hasImplemented)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 现场情况描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.sceneDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否有实施必要性：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.isImplement)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 实施无必要描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.noImplementation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸是否完整：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.whetherComplete)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 图纸完整性描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.drawingDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">图纸是否规范：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.whetherStandard)}
+								</td>
+								<td class="width-15 active"><label class="pull-right"> 图纸规范性描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.normativeDrawings)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">是否存在典设图问题：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.whetherDrawing)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">典设图问题描述</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.problemDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 是否存在施工通道</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.whetherChannel)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">施工通道情况描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.constructionDescription)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 土建是否需要调整：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.civilAdjusted)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">土建方案变更内容描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.descriptionPlans)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">土建工作量调整内容描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.descriptionAdjustment)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">电气方案是否需要调整：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.electricalAdjusted)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 调整原因描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">自动化是否需要变更：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.doesChange)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 自动化方案调整内容：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.automatedContent)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">自动化工作内容调整：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.automatedAdjustment)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.otherAdjusted)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">其他方案调整原因描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.descriptionReasons)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.difficultResolve)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.designChanges)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.needsClosed)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.affairsDescription)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.planningRequired)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.highSpeed)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.affairsOffice)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditions)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.customizedCan)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.reasonDescription)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.materialDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.modelDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.quantityDescription)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.drawingProblem)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.powerOutage)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.powerProblem)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.complexPipeline)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.complicatedPower)}
+								</td>
+							</tr>
+							</tbody>
+						</table>
+					</form:form>
+						<div class="row">
+							<div class="col-sm-3"></div>
+							<div class="col-sm-6">
+								<div class="form-group text-center">
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
+								</div>
+							</div>
+						</div>
+
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -292,6 +292,135 @@
                                     ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                             </td>
                         </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
                 </form:form>

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

@@ -290,6 +290,138 @@
 										${fns:unescapeHtml(construction.disclose.descriptionReasons)}
 								</td>
 							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.difficultResolve)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.designChanges)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.needsClosed)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.affairsDescription)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.planningRequired)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.highSpeed)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.affairsOffice)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditions)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.customizedCan)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.reasonDescription)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.materialDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.modelDescription)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.quantityDescription)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.drawingProblem)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.powerOutage)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.powerProblem)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+								</td>
+							</tr>
+							<tr>
+
+								<td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.complexPipeline)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.disclose.complicatedPower)}
+								</td>
+							</tr>
 							</tbody>
 						</table>
 					</form:form>

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

@@ -280,6 +280,138 @@
                                     ${fns:unescapeHtml(construction.disclose.descriptionReasons)}
                             </td>
                         </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在难以解决的政处：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.difficultResolve)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否需要进行设计变更：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.designChanges)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否需要进行项目关闭：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.needsClosed)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">政处问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.affairsDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否需要规划报批：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.planningRequired)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否涉及高铁、高速：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.highSpeed)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在复杂民事政处：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.affairsOffice)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">图纸方案是否存在前置条件：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditions)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 前置条件描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.preconditionDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否需要定制物资：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.customizedMaterials)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否能定制：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.customizedCan)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">定制原因描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.reasonDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 定制物资描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.materialDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">拆旧物资是否与设计一致：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.demolitionMaterials)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 型号不一致描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.modelDescription)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">数量不一致描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.quantityDescription)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 图纸标注是否存在问题：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.drawingAnnotation)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">图纸标注问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.drawingProblem)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在停电问题：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.powerOutage)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">停电问题问题描述：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.powerProblem)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否邻近带电线路：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.nearLiveLine)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否下穿高压线路：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.highVoltageLine)}
+                            </td>
+                        </tr>
+                        <tr>
+
+                            <td class="width-15 active"><label class="pull-right"> 是否存在复杂管线：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.complexPipeline)}
+                            </td>
+                            <td class="width-15 active"><label class="pull-right">是否涉及复杂停电：</label></td>
+                            <td class="width-35">
+                                    ${fns:unescapeHtml(construction.disclose.complicatedPower)}
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
                 </form:form>

src/main/webapp/webpage/modules/sg/picking/activiti/pickIng.js

@@ -298,7 +298,7 @@ $(document).ready(function() {
                         if(data.success){
                             jp.success(data.msg);
                             jp.go("${ctx}/picking/activiti/managerExam?taskId="+"${showList.act.taskId}"+
-								"&taskName="+"${showList.act.taskName}"+
+								"&taskdivideFormName="+"${showList.act.taskName}"+
 								"&taskDefKey="+"${showList.act.taskDefKey}"+
 								"&procInsId="+"${showList.act.procInsId}"+
 								"&procDefId="+"${showList.act.procDefId}"