Merge remote-tracking branch 'origin/master'

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

@@ -1524,7 +1524,7 @@ public class ActTaskService extends BaseService {
                 vars.put("design", UserUtils.getByUserName(user.getAssignment().getDesigner()).getLoginName());
             }
         } else {
-            vars.put("return", true);
+            vars.put("importTable", true);
             vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
         }
         // 设置意见
@@ -2057,6 +2057,7 @@ public class ActTaskService extends BaseService {
         } else {
             vars.put("design", UserUtils.getByUserName(user.getAssignment().getInspectionUnit()).getLoginName());
         }
+        vars.put("pass", "yes".equals(flag) ? true : false);
         act.preUpdate();
         // 对不同环节的业务逻辑进行操作
         String taskDefKey = act.getTaskDefKey();
@@ -3409,4 +3410,136 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
+
+    /**
+     * 导入工程量
+     */
+    @Transactional(readOnly = false)
+    public void engineering(Act act, Construction construction) {
+        Map<String, Object> vars = Maps.newHashMap();
+        vars.put("no", false);
+        vars.put("pass", false);
+        vars.put("rural", false);
+        vars.put("administrative", false);
+        vars.put("civil", false);
+        String flag = act.getFlag();
+        if ("yes".equals(flag)) {
+            String processingType = construction.getQuantity().getProcessingType();
+            if ("".equals(processingType)) {
+                vars.put("pass", true);
+            } else {
+                String[] split = processingType.split(",");
+                for (String a : split) {
+                    if ("农村政处".equals(a)) {
+                        vars.put("rural", true);
+                    }
+                    if ("行政政处".equals(a)) {
+                        vars.put("administrative", true);
+                    }
+                    if ("民事政处".equals(a)) {
+                        vars.put("civil", true);
+                    }
+                }
+            }
+        } else {
+            vars.put("no", true);
+        }
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    /**
+     * 政处是否自己进行
+     */
+    @Transactional(readOnly = false)
+    public void ruralOffice(Act act) {
+        Map<String, Object> vars = Maps.newHashMap();
+        String flag = act.getFlag();
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        vars.put("design", UserUtils.getByUserName(user.getAssignment().getDistributionPolicy()).getLoginName());
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    /**
+     * 农村专职判断
+     */
+    @Transactional(readOnly = false)
+    public void ruralJudge(Act act) {
+        Map<String, Object> vars = Maps.newHashMap();
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        String flag = act.getFlag();
+        vars.put("conditions",false);
+        vars.put("close",false);
+        vars.put("pass",false);
+        if ("conditions".equals(flag)) {
+            vars.put("conditions", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        if ("close".equals(flag)) {
+            vars.put("close", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        if ("pass".equals(flag)) {
+            vars.put("pass", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getDistributionPolicy()).getLoginName());
+        }
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    @Transactional(readOnly = false)
+    public void ruralFiles(Act act, Construction construction) {
+        Map<String, Object> vars = Maps.newHashMap();
+        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        String ifBorrow = construction.getIfBorrow();
+        vars.put("pay", false);
+        vars.put("loan", false);
+        if ("否".equals(ifBorrow)) {
+            vars.put("pay", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        if ("是".equals(ifBorrow)) {
+            vars.put("loan", true);
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
+        // 设置意见
+        act.preUpdate();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    /**
+     * 交底:是否借款
+     */
+    @Transactional(readOnly = false)
+    public void ruralLoan(Act act) {
+        // 设置意见
+        act.setComment(("yes".equals(act.getFlag()) ? "[同意] " : "[驳回] ") + act.getComment());
+        act.preUpdate();
+        // 提交流程任务
+        Map<String, Object> vars = Maps.newHashMap();
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
+
+    /**
+     * 交底:是否支付
+     */
+    @Transactional(readOnly = false)
+    public void ruralPays(Act act) {
+        // 设置意见
+        act.setComment(("yes".equals(act.getFlag()) ? "[同意] " : "[驳回] ") + act.getComment());
+        act.preUpdate();
+        // 提交流程任务
+        Map<String, Object> vars = Maps.newHashMap();
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
 }

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

@@ -531,7 +531,105 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 交底:项目经理交底内容
+     * 导入工程量
+     */
+    @ResponseBody
+    @RequestMapping(value = "engineering")
+    public AjaxJson engineering(Act act, Construction construction) {
+        AjaxJson j = new AjaxJson();
+        try {
+            Construction construction1 = constructionService.get(construction);
+            if (construction1.getQuantity() == null) {
+                j.setSuccess(false);
+                j.setMsg("请先导入工程量");
+                return j;
+            }
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.engineering(act,construction1);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
+     * 政处是否自己进行
+     */
+    @ResponseBody
+    @RequestMapping(value = "ruralOffice")
+    public AjaxJson ruralOffice(Act act, Construction construction) {
+        AjaxJson j = new AjaxJson();
+        try {
+            constructionService.updateIfSelf(construction);
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.ruralOffice(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
+     * 农村专职判断
+     */
+    @ResponseBody
+    @RequestMapping(value = "ruralJudge")
+    public AjaxJson ruralJudge(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.ruralJudge(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
+     * 农村上传文件
+     */
+    @ResponseBody
+    @RequestMapping(value = "ruralFiles")
+    public AjaxJson ruralFiles(Act act,String path,String path1, String reserveProjectName,Construction construction) {
+        AjaxJson j = new AjaxJson();
+        try {
+            constructionService.updateIfBorrow(construction);
+            if (path != null && !"".equals(path)) {
+                UploadImages uploadImages = new UploadImages();
+                uploadImages.setPath(path);
+                uploadImages.setUid(UserUtils.getUser().getName());
+                uploadImages.setImgName("22");
+                uploadImages.setProcInsId(act.getProcInsId());
+                uploadImages.setReserveProjectName(reserveProjectName);
+                constructionService.uploadSave(uploadImages);
+            }
+            if (path1 != null && !"".equals(path1)) {
+                UploadImages uploadImages = new UploadImages();
+                uploadImages.setPath(path1);
+                uploadImages.setUid(UserUtils.getUser().getName());
+                uploadImages.setImgName("23");
+                uploadImages.setProcInsId(act.getProcInsId());
+                uploadImages.setReserveProjectName(reserveProjectName);
+                constructionService.uploadSave(uploadImages);
+            }
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.ruralFiles(act,construction);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
+     * 交底:是否借款
      */
     @ResponseBody
     @RequestMapping(value = "divideForm")
@@ -547,6 +645,40 @@ public class ActTaskController extends BaseController {
         return j;
     }
 
+    /**
+     * 交底:是否借款
+     */
+    @ResponseBody
+    @RequestMapping(value = "ruralLoan")
+    public AjaxJson ruralLoan(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            act.setComment(URLDecoder.decode(act.getComment(), "UTF-8"));
+            actTaskService.ruralLoan(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
+     * 交底:是否支付
+     */
+    @ResponseBody
+    @RequestMapping(value = "ruralPays")
+    public AjaxJson ruralPays(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            act.setComment(URLDecoder.decode(act.getComment(), "UTF-8"));
+            actTaskService.ruralPays(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
 
     /**
      * 是否可以政策处理（农场/民事）

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

@@ -21,6 +21,10 @@ public class Construction extends ActEntity<Construction> {
     private String projectId;
     //项目名称
     private String projectName;
+    //是否自己处理
+    private String ifSelf;
+    //是否需要借款
+    private String ifBorrow;
     //项目基础信息表
     private BasicInformation basicInformation;
     //施工任务分配信息
@@ -55,6 +59,22 @@ public class Construction extends ActEntity<Construction> {
         this.projectName = projectName;
     }
 
+    public String getIfSelf() {
+        return ifSelf;
+    }
+
+    public void setIfSelf(String ifSelf) {
+        this.ifSelf = ifSelf;
+    }
+
+    public String getIfBorrow() {
+        return ifBorrow;
+    }
+
+    public void setIfBorrow(String ifBorrow) {
+        this.ifBorrow = ifBorrow;
+    }
+
     public BasicInformation getBasicInformation() {
         return basicInformation;
     }

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

@@ -0,0 +1,49 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+/**
+ * 土建工程量实体类
+ * */
+public class EngineeringAmount extends DataEntity<EngineeringAmount> {
+    //储备项目名称
+    private String reserveProjectName;
+    //形式
+    private String civilWorks;
+    //物料
+    private String civilMaterials;
+    //单位
+    private String civilUnit;
+
+    public String getReserveProjectName() {
+        return reserveProjectName;
+    }
+
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getCivilWorks() {
+        return civilWorks;
+    }
+
+    public void setCivilWorks(String civilWorks) {
+        this.civilWorks = civilWorks;
+    }
+
+    public String getCivilMaterials() {
+        return civilMaterials;
+    }
+
+    public void setCivilMaterials(String civilMaterials) {
+        this.civilMaterials = civilMaterials;
+    }
+
+    public String getCivilUnit() {
+        return civilUnit;
+    }
+
+    public void setCivilUnit(String civilUnit) {
+        this.civilUnit = civilUnit;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+/**
+ * 其它工程量实体类
+ * */
+public class OtherAmount  extends DataEntity<OtherAmount> {
+    //储备项目名称
+    private String reserveProjectName;
+    //形式
+    private String otherWorks;
+    //物料
+    private String otherMaterials;
+    //单位
+    private String otherUnit;
+
+    public String getReserveProjectName() {
+        return reserveProjectName;
+    }
+
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getOtherWorks() {
+        return otherWorks;
+    }
+
+    public void setOtherWorks(String otherWorks) {
+        this.otherWorks = otherWorks;
+    }
+
+    public String getOtherMaterials() {
+        return otherMaterials;
+    }
+
+    public void setOtherMaterials(String otherMaterials) {
+        this.otherMaterials = otherMaterials;
+    }
+
+    public String getOtherUnit() {
+        return otherUnit;
+    }
+
+    public void setOtherUnit(String otherUnit) {
+        this.otherUnit = otherUnit;
+    }
+}

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

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

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

@@ -6,12 +6,15 @@ package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
+import javax.print.attribute.standard.MediaSize;
 import java.util.List;
 
 /**
@@ -35,7 +38,12 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     void newSave(Construction construction);
 
     //根据储备项目暂定名称修改项目状态
-    void updateStatus(Construction construction);
+    void updateStatus(String reserveProjectName);
+
+    /**
+     * 根据项目定义号修改项目的土建流程状态
+     * */
+    void updateAdvStatus(String projectId);
 
     /**
      * 根据流程定义修改项目关闭状态
@@ -70,6 +78,13 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
      */
     List<UploadImages> findUploadPage(UploadImages uploadImages);
 
+    /**
+     * 政处是否自己运行
+     */
+    void updateIfSelf(Construction construction);
+
+    void updateIfBorrow(Construction construction);
+
     //根据流程定义号查询项目需求名称
     String idProjectName(@Param("procInsId") String procInsId);
 
@@ -96,4 +111,44 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     List<Role> roleListByName(String name);
 
     void updateOIPI(Construction construction);
+
+    /**
+     * 土建工程量信息列表
+     */
+    List<EngineeringAmount> engineeringTable(EngineeringAmount engineeringAmount);
+
+    /**
+     * 其它工程量信息列表
+     */
+    List<OtherAmount> otherTable(OtherAmount otherAmount);
+
+    /**
+     * 土建工程量修改
+     * */
+    void EngAmountSave(EngineeringAmount engineeringAmount);
+
+    /**
+     * 其它工程量修改
+     * */
+    void addOther(OtherAmount otherAmount);
+
+    /**
+     * 根据id查找土建工程量信息
+     */
+    EngineeringAmount getEngAmount(EngineeringAmount engineeringAmount);
+
+    /**
+     * 根据id查找其它工程量信息
+     */
+    OtherAmount getOtherAmount(OtherAmount otherAmount);
+
+    /**
+     * 删除土建工程量信息
+     */
+    void delEngAmount(String id);
+
+    /**
+     * 删除其它工程量信息
+     */
+    void delOtherAmount(String id);
 }

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

@@ -6,6 +6,8 @@
         a.id AS "id",
 		a.proc_ins_id AS "procInsId",
 		a.reserveProjectName AS "reserveProjectName",
+        a.ifSelf as "ifSelf",
+        a.ifBorrow as "ifBorrow",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -149,6 +151,7 @@
         LEFT JOIN sys_user updateBy ON updateBy.id = a.update_by
     </sql>
 
+
     <resultMap type="Construction" id="ConstructionResult" autoMapping="true">
         <result column="reason" property="reason" typeHandler="com.jeeplus.core.mapper.ConvertBlobTypeHandler"/>
     </resultMap>
@@ -589,6 +592,16 @@
             </otherwise>
         </choose>
     </select>
+    <update id="updateIfSelf">
+        update xm_construction_clarificaiton
+        set ifSelf = #{ifSelf}
+        where proc_ins_id = #{procInsId};
+    </update>
+    <update id="updateIfBorrow">
+        update xm_construction_clarificaiton
+        set ifBorrow = #{ifBorrow}
+        where proc_ins_id = #{procInsId};
+    </update>
     <update id="updateOIPI">
         update xm_disclose_conclusion
         set create_date = now()
@@ -600,6 +613,11 @@
         where reserveProjectName =
               (select reserveProjectName from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
     </update>
+    <update id="updateAdvStatus">
+        update xm_material_project
+        set advanceStatus = '1'
+        where projectId = #{projectId};
+    </update>
     <insert id="quantityInsert">
         replace into xm_project_quantity
         (
@@ -649,4 +667,157 @@
             )
         </foreach>
     </insert>
+    <insert id="EngAmountSave">
+        insert into
+            xm_engineering_amount (
+                id,
+                create_by,
+                create_date,
+                update_by,
+                update_date,
+                del_flag,
+                remarks,
+                reserveProjectName,
+                civilWorks,
+                civilMaterials,
+                civilUnit
+            )
+        values (
+                #{id},
+                #{createBy.id},
+                #{createDate},
+                #{updateBy.id},
+                #{updateDate},
+                #{delFlag},
+                #{remarks},
+                #{reserveProjectName},
+                #{civilWorks},
+                #{civilMaterials},
+                #{civilUnit}
+             )ON DUPLICATE KEY UPDATE
+                update_by = #{updateBy.id},
+                update_date = #{updateDate},
+                reserveProjectName = #{reserveProjectName},
+                civilWorks = #{civilWorks},
+                civilMaterials = #{civilMaterials},
+                civilUnit = #{civilUnit}
+    </insert>
+    <insert id="addOther">
+        insert into
+            xm_other_amount (
+            id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            del_flag,
+            remarks,
+            reserveProjectName,
+            otherWorks,
+            otherMaterials,
+            otherUnit
+        )
+        values (
+               #{id},
+               #{createBy.id},
+               #{createDate},
+               #{updateBy.id},
+               #{updateDate},
+               #{delFlag},
+               #{remarks},
+               #{reserveProjectName},
+               #{otherWorks},
+               #{otherMaterials},
+               #{otherUnit}
+           )ON DUPLICATE KEY UPDATE
+             update_by = #{updateBy.id},
+             update_date = #{updateDate},
+             reserveProjectName = #{reserveProjectName},
+             otherWorks = #{otherWorks},
+             otherMaterials = #{otherMaterials},
+             otherUnit = #{otherUnit}
+    </insert>
+    <select id="engineeringTable"
+            resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount">
+        select id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        reserveProjectName,
+        civilWorks,
+        civilmaterials,
+        civilUnit
+        from xm_engineering_amount
+        <where>
+            1=1
+            <if test="reserveProjectName !=null and reserveProjectName !='' ">
+                and reserveProjectName = #{reserveProjectName}
+            </if>
+        </where>
+    </select>
+    <select id="otherTable" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount">
+        select id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        reserveProjectName,
+        otherWorks,
+        otherMaterials,
+        otherUnit
+        from xm_other_amount
+        <where>
+            1=1
+            <if test="reserveProjectName !=null and reserveProjectName !='' ">
+                and reserveProjectName = #{reserveProjectName}
+            </if>
+        </where>
+    </select>
+    <select id="getEngAmount"
+            resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount">
+        select id,
+               create_by,
+               create_date,
+               update_by,
+               update_date,
+               del_flag,
+               remarks,
+               reserveProjectName,
+               civilWorks,
+               civilMaterials,
+               civilUnit
+        from xm_engineering_amount
+        where id = #{id};
+    </select>
+    <select id="getOtherAmount"
+            resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount">
+        select id,
+               create_by,
+               create_date,
+               update_by,
+               update_date,
+               del_flag,
+               remarks,
+               reserveProjectName,
+               otherWorks,
+               otherMaterials,
+               otherUnit
+        from xm_other_amount
+        where id = #{id};
+    </select>
+    <delete id="delEngAmount">
+        delete
+        from xm_engineering_amount
+        where id = #{id}
+    </delete>
+    <delete id="delOtherAmount">
+        delete
+        from xm_other_amount
+        where id = #{id}
+    </delete>
 </mapper>

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

@@ -4,7 +4,7 @@
     
 	<sql id="constructionColumns">
 		a.id AS "id",
-		a.uId AS "uid",
+		a.uid AS "uid",
 		a.imgName AS "imgName",
 		a.path AS "path",
 		a.proc_ins_id AS "procInsId",
@@ -85,26 +85,15 @@
 	</select>
 	
 	<select id="findList" resultType="UploadImages" >
-		SELECT a.*,<include refid="projectColumns"/>
+		SELECT a.*
 		FROM xm_upolad_images a
-		LEFT JOIN xm_project_details b
-		on a.projectId = b.id
 		<where>
 			<if test="dataScope != null and dataScope != ''">
 				${dataScope}
 			</if>
-			<if test="uId != null and uId != ''">
-				AND a.uId = #{uId}
-			</if>
 			<if test="imgName!=null and imgName!=''">
 				AND a.imgName = #{imgName}
 			</if>
-			<if test="project.requireName != null and project.requireName != ''">
-				and b.require_name =#{project.requireName}
-			</if>
-			<if test="project.projectId != null and project.projectId != ''">
-				and b.project_id =#{project.projectId}
-			</if>
 			<if test="procInsId!=null and procInsId!=''">
 				and a.proc_ins_id = #{procInsId}
 			</if>
@@ -120,7 +109,7 @@
 	</select>
 
 	<select id="findMaterialImg" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages">
-		select imgName,path,proc_ins_id,uId from xm_upolad_images where proc_ins_id = #{procInsId}
+		select imgName,path,proc_ins_id,uid from xm_upolad_images where proc_ins_id = #{procInsId}
 	</select>
 	
 	<select id="findAllList" resultType="UploadImages" >
@@ -152,7 +141,7 @@
 			imgName,
 			path,
 			proc_ins_id,
-			uId,
+			uid,
 			projectId
 		) VALUES (
 			#{id},
@@ -165,7 +154,7 @@
 			#{imgName},
 			#{path},
 			#{procInsId},
-			#{uId},
+			#{uid},
 			#{projectId}
 		)
 	</insert>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -6,11 +6,15 @@ package com.jeeplus.modules.sg.managementcenter.activiti.service;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
+import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.test.pic.entity.TestPic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,7 +75,20 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		constructionMapper.quantityInsert(constructionList);
 	}
 
-	
+	/**
+	 * 政处是否自己运行
+	 */
+	@Transactional(readOnly = false)
+	public void updateIfSelf(Construction construction) {
+		constructionMapper.updateIfSelf(construction);
+	}
+
+	@Transactional(readOnly = false)
+	public void updateIfBorrow(Construction construction) {
+		constructionMapper.updateIfBorrow(construction);
+	}
+
+
 	@Transactional(readOnly = false)
 	public void save(Construction construction) {
 		super.save(construction);
@@ -125,8 +142,16 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 
 	//根据储备项目暂定名称修改项目状态
 	@Transactional(readOnly = false)
-	public void updateStatus(Construction construction) {
-		constructionMapper.updateStatus(construction);
+	public void updateStatus(String reserveProjectName) {
+		constructionMapper.updateStatus(reserveProjectName);
+	}
+
+	/**
+	 * 根据项目定义号修改项目的土建流程状态
+	 * */
+	@Transactional(readOnly = false)
+	public void updateAdvStatus(String projectId) {
+		constructionMapper.updateAdvStatus(projectId);
 	}
 
 	/**
@@ -197,4 +222,79 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 	public void updateOIPI(Construction construction) {
 		constructionMapper.updateOIPI(construction);
 	}
+
+	/**
+	 * 土建工程量信息
+	 */
+	public Page<EngineeringAmount> engineeringTable(Page<EngineeringAmount> page, EngineeringAmount engineeringAmount) {
+		dataRuleFilter(engineeringAmount);
+		engineeringAmount.setPage(page);
+		page.setList(constructionMapper.engineeringTable(engineeringAmount));
+		return page;
+	}
+
+	/**
+	 * 其它工程量信息
+	 */
+	public Page<OtherAmount> otherTable(Page<OtherAmount> page, OtherAmount otherAmount) {
+		dataRuleFilter(otherAmount);
+		otherAmount.setPage(page);
+		page.setList(constructionMapper.otherTable(otherAmount));
+		return page;
+	}
+
+	/**
+	 * 查找土建工程量信息
+	 */
+	public EngineeringAmount getEngAmount(EngineeringAmount engineeringAmount) {
+		return constructionMapper.getEngAmount(engineeringAmount);
+	}
+
+	/**
+	 * 查找其它工程量信息
+	 * */
+	public OtherAmount getOtherAmount(OtherAmount otherAmount) {
+		return constructionMapper.getOtherAmount(otherAmount);
+	}
+
+
+	/**
+	 * 土建工程量修改
+	 * */
+	@Transactional(readOnly = false)
+	public void EngAmountSave(EngineeringAmount engineeringAmount) {
+		if (engineeringAmount.getId() == null || "".equals(engineeringAmount.getId())) {
+			engineeringAmount.preInsert();
+		}
+		constructionMapper.EngAmountSave(engineeringAmount);
+	}
+
+	/**
+	 * 其它工程量修改
+	 * */
+	@Transactional(readOnly = false)
+	public void addOther(OtherAmount otherAmount) {
+		if (otherAmount.getId() == null || "".equals(otherAmount.getId())) {
+			otherAmount.preInsert();
+		}
+		constructionMapper.addOther(otherAmount);
+	}
+
+	/**
+	 * 删除土建工程量信息
+	 * */
+	@Transactional(readOnly = false)
+	public void delEngAmount(String id) {
+		constructionMapper.delEngAmount(id);
+	}
+
+	/**
+	 * 删除其它工程量信息
+	 * */
+	@Transactional(readOnly = false)
+	public void delOtherAmount(String id) {
+		constructionMapper.delOtherAmount(id);
+	}
+
+
 }

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

@@ -1,18 +1,26 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
 import com.google.common.collect.Maps;
+import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
+import com.jeeplus.modules.sys.entity.DictValue;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.activiti.engine.repository.ProcessDefinition;
 
 import java.io.Serializable;
 import java.util.Map;
 
+/**
+ * 施工交底流程结束，自动判断发送政策处理流程
+ */
 public class EndTaskListen implements Serializable, ExecutionListener {
     /**
      * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
@@ -30,7 +38,38 @@ public class EndTaskListen implements Serializable, ExecutionListener {
             //获取流程定义号
             String processInstanceId = delegateExecution.getProcessInstanceId();
             //根据流程定义号获取项目信息
-//            Project idConProc = projectService.findIdConProc(processInstanceId);
+            Project projectProc = projectService.findByProcInsId(processInstanceId);
+            String projectId = projectProc.getProjectId();
+            String projectName = projectProc.getProjectName();
+            //判断是否有项目定义号和项目名称（没有不予发送领料流程）
+            if ("".equals(projectId) || "".equals(projectName)) {
+
+            } else {
+                if (!"0".equals(projectProc.getAcquisitionStatus())) {
+                    //获取项目第几次发起领料
+                    String number = showListService.findNumber(projectId);
+                    int i = Integer.parseInt(number);
+                    int a = i + 1;
+                    showList.setTheNumber(String.valueOf(a));
+                    DictValue dic = MyActiviUtils.findDic();
+                    String value = dic.getValue();
+                    showList.setsVersion(value);
+                    showList.setProjectId(projectId);
+                } else {
+                    showList.setTheNumber("1");
+                    showList.setProjectId(projectId);
+                }
+                showListService.updateAcqStatus(projectProc.getReserveProjectName());
+                //保存数据
+                showListService.save(showList);
+                // 启动物资领料流程
+                Map<String, Object> vars = Maps.newHashMap();
+                vars.put("manager", UserUtils.getByUserName(projectProc.getAssignment().getOwnerManager()).getLoginName());
+                String procDefId = projectService.findDefId("wzll");
+                ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
+            }
 //            String id = idConProc.getId();
 //            String constructionUnitManage = idConProc.getConstructionUnitManage();
             //获取项目第几次发起领料
@@ -46,21 +85,10 @@ public class EndTaskListen implements Serializable, ExecutionListener {
 //                String value = dic.getValue();
 //                showList.setsVersion(value);
 //            }
-            //保存数据
-            showListService.save(showList);
-            String acqStatus = showListService.findAcqStatus(showList);
-            if ("0".equals(acqStatus)) {
-                showListService.updateAcqStatus(showList);
-            }
+
             //根据流程定义号修改项目的施工交底状态
 //            projectService.updateStatusBy("2", processInstanceId);
-            // 启动物资领料流程
-            Map<String, Object> vars = Maps.newHashMap();
-//            vars.put("manager", UserUtils.getByUserName(constructionUnitManage).getLoginName());
-//            String procDefId = projectService.findDefId("wzll");
-//            ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
-//            String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-//            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
+
         } catch (Exception e) {
             e.printStackTrace();
         }

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

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

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

@@ -18,9 +18,7 @@ import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
 import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
 import com.jeeplus.modules.sg.financial.erpcredit.util.ExportUtil;
 import com.jeeplus.modules.sg.financial.erpcredit.util.ImportUtil;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Quantity;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.*;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
@@ -36,7 +34,6 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sys.entity.User;
@@ -47,6 +44,7 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -167,7 +165,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 交底:运行人员审核图纸
-     * */
+     */
     @RequestMapping(value = "auditDrawings")
     public String auditDrawings(Construction construction, Model model) {
 
@@ -177,7 +175,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 交底:运行单位经理审核方案
-     * */
+     */
     @RequestMapping(value = "designUpload")
     public String designUpload(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -186,7 +184,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 设计单位人员重新设计
-     * */
+     */
     @RequestMapping(value = "operatorUploadList")
     public String operatorUploadList(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -195,7 +193,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 运行经理审核设计变更后
-     * */
+     */
     @RequestMapping(value = "managerUploadList")
     public String managerUploadList(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -204,7 +202,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 配网经理审核设计变更后
-     * */
+     */
     @RequestMapping(value = "afterDistribution")
     public String afterDistribution(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -365,6 +363,24 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "editEng")
     public String editEng(Construction construction, Model model) {
+        Quantity quantity = construction.getQuantity();
+        if (construction.getQuantity() != null) {
+            if (construction.getQuantity().getProcessingType() != null && construction.getQuantity().getProcessingType() != "") {
+                String processingType = construction.getQuantity().getProcessingType();
+                String[] split = processingType.split(",");
+                List<String> processList = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    String s = split[i].toString();
+                    processList.add(s);
+                }
+                construction.getQuantity().setProcessingTypeList(processList);
+            }
+        }
+        List<String> courseList = new ArrayList<String>();
+        courseList.add("行政政处");
+        courseList.add("农村政处");
+        courseList.add("民事政处");
+        model.addAttribute("courseList", courseList);
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/editEng";
     }
@@ -399,8 +415,248 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 下载施工交底模板文件
+     * 农村政处开始页面
+     * */
+    @RequestMapping(value = "ruralOffice")
+    public String ruralOffice(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralOffice";
+    }
+
+    /**
+     * 农村专职判断
+     * */
+    @RequestMapping(value = "ruralJudge")
+    public String ruralJudge(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralJudge";
+    }
+
+    /**
+     * 农村上传文件
      * */
+    @RequestMapping(value = "ruralFiles")
+    public String ruralFiles(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralFiles";
+    }
+
+    /**
+     * 农村是否借款
+     * */
+    @RequestMapping(value = "ruralLoan")
+    public String ruralLoan(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralLoan";
+    }
+
+    /**
+     * 农村是否支付
+     * */
+    @RequestMapping(value = "ruralPays")
+    public String ruralPays(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralPays";
+    }
+
+    /**
+     * 行政政处开始页面
+     * */
+    @RequestMapping(value = "administrativeOffice")
+    public String administrativeOffice(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralOffice";
+    }
+
+    /**
+     * 行政专职判断
+     * */
+    @RequestMapping(value = "administrativeJudge")
+    public String administrativeJudge(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralJudge";
+    }
+
+    /**
+     * 行政上传文件
+     * */
+    @RequestMapping(value = "administrativeFiles")
+    public String administrativeFiles(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralFiles";
+    }
+
+    /**
+     * 行政是否借款
+     * */
+    @RequestMapping(value = "administrativeLoan")
+    public String administrativeLoan(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralLoan";
+    }
+
+    /**
+     * 行政是否支付
+     * */
+    @RequestMapping(value = "administrativePays")
+    public String administrativePays(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralPays";
+    }
+
+    /**
+     * 民事政处开始页面
+     * */
+    @RequestMapping(value = "civilOffice")
+    public String civilOffice(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralOffice";
+    }
+
+    /**
+     * 民事专职判断
+     * */
+    @RequestMapping(value = "civilJudge")
+    public String civilJudge(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralJudge";
+    }
+
+    /**
+     * 民事上传文件
+     * */
+    @RequestMapping(value = "civilFiles")
+    public String civilFiles(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralFiles";
+    }
+
+    /**
+     * 民事是否借款
+     * */
+    @RequestMapping(value = "civilLoan")
+    public String civilLoan(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralLoan";
+    }
+
+    /**
+     * 民事是否支付
+     * */
+    @RequestMapping(value = "civilPays")
+    public String civilPays(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/ruralPays";
+    }
+
+    /**
+     * 土建工程量数据列表
+     * */
+    @ResponseBody
+    @RequestMapping(value = "engineeringTable")
+    public Map<String, Object> engineeringTable(EngineeringAmount engineeringAmount, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<EngineeringAmount> page = constructionService.engineeringTable(new Page<EngineeringAmount>(request, response), engineeringAmount);
+        return getBootstrapData(page);
+    }
+
+    /**
+     * 其它工程量数据列表
+     * */
+    @ResponseBody
+    @RequestMapping(value = "otherTable")
+    public Map<String, Object> otherTable(OtherAmount otherAmount, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<OtherAmount> page = constructionService.otherTable(new Page<OtherAmount>(request, response), otherAmount);
+        return getBootstrapData(page);
+    }
+
+
+    /**
+     * 土建工程量修改页面
+     * */
+    @RequestMapping(value = "editEngAmount")
+    public String editEngAmount(EngineeringAmount engineeringAmount, Model model) {
+        if (!"".equals(engineeringAmount.getId()) && engineeringAmount.getId() != null) {
+            engineeringAmount = constructionService.getEngAmount(engineeringAmount);
+        }
+        model.addAttribute("engineeringAmount", engineeringAmount);
+        return "modules/sg/managementcenter/activiti/editEngAmount";
+    }
+
+    /**
+     * 其它工程量修改页面
+     * */
+    @RequestMapping(value = "editOther")
+    public String editOther(OtherAmount otherAmount, Model model) {
+        if (!"".equals(otherAmount.getId()) && otherAmount.getId() != null) {
+            otherAmount = constructionService.getOtherAmount(otherAmount);
+        }
+        model.addAttribute("otherAmount", otherAmount);
+        return "modules/sg/managementcenter/activiti/editOther";
+    }
+
+    /**
+     * 土建工程量添加，修改
+     * */
+    @ResponseBody
+    @RequestMapping(value = "EngAmountSave")
+    public AjaxJson EngAmountSave(EngineeringAmount engineeringAmount, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        try {
+            constructionService.EngAmountSave(engineeringAmount);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
+        }
+        return j;
+    }
+
+    /**
+     * 其它工程量添加，修改
+     * */
+    @ResponseBody
+    @RequestMapping(value = "addOther")
+    public AjaxJson addOther(OtherAmount otherAmount, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        try {
+            constructionService.addOther(otherAmount);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
+        }
+        return j;
+    }
+
+    /**
+     * 土建工程量删除
+     * */
+    @ResponseBody
+    @RequestMapping(value = "delEngAmount")
+    public AjaxJson delEngAmount(String id) {
+        AjaxJson j = new AjaxJson();
+        constructionService.delEngAmount(id);
+        j.setMsg("删除工程量成功");
+        return j;
+    }
+
+    /**
+     * 其它工程量删除
+     * */
+    @ResponseBody
+    @RequestMapping(value = "delOtherAmount")
+    public AjaxJson delOtherAmount(String id) {
+        AjaxJson j = new AjaxJson();
+        constructionService.delOtherAmount(id);
+        j.setMsg("删除工程量成功");
+        return j;
+    }
+
+    /**
+     * 下载施工交底模板文件
+     */
     @RequestMapping(value = "excelOut")
     public void excelStandardTemplateOut(HttpServletRequest request,
                                          HttpServletResponse response) throws IOException {
@@ -438,10 +694,10 @@ public class ConstructionController extends BaseController {
 
     /**
      * 下载工程量模板文件
-     * */
+     */
     @RequestMapping(value = "excelQuantity")
     public void excelOutQuantity(HttpServletRequest request,
-                                         HttpServletResponse response) throws IOException {
+                                 HttpServletResponse response) throws IOException {
         String fileName = "quantity.xlsx";
         String filePath = getClass().getResource("/freemarker/" + fileName).getPath();
         File f = new File(filePath);
@@ -475,7 +731,7 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 保存请假申请
+     * 发起施工交底流程
      */
     @ResponseBody
     @RequestMapping(value = "save")
@@ -510,7 +766,7 @@ public class ConstructionController extends BaseController {
             //循环项目信息
             for (Project each : listById) {
                 if (each.getAssignment() == null) {
-                    info += each.getReserveProjectName() + "未填写施工任务分配信息";
+                    info += "<" + each.getReserveProjectName() + ">" + "未填写施工任务分配信息\t";
                     continue;
                 }
                 //查询是否有此配网项目经理人员（表中暂无配网项目经理人员信息）
@@ -522,7 +778,7 @@ public class ConstructionController extends BaseController {
                     construction.setReserveProjectName(each.getReserveProjectName());
                     constructionService.newSave(construction);//保存
                     //根据储备项目暂定名称修改项目状态
-                    constructionService.updateStatus(construction);
+                    constructionService.updateStatus(construction.getReserveProjectName());
                     // 启动流程
                     ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
                     String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
@@ -558,6 +814,36 @@ public class ConstructionController extends BaseController {
     }
 
     @ResponseBody
+    @RequestMapping(value = "engSave")
+    public AjaxJson engSave(Construction construction, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        List<String> processingTypeList = construction.getQuantity().getProcessingTypeList();
+        String processType = "";
+        for (int i = 0; i < processingTypeList.size(); i++) {
+            processType += processingTypeList.get(i) + ",";
+        }
+        if (construction.getQuantity().getPolicyIssues().equals("是")) {
+            construction.getQuantity().setProcessingType(processType);
+        } else {
+            construction.getQuantity().setProcessingType("");
+            construction.getQuantity().setProcessingDescription("");
+        }
+        construction.getQuantity().setReserveProjectName(construction.getReserveProjectName());
+        try {
+            List<Construction> constructionList = new ArrayList<>();
+            constructionList.add(construction);
+            constructionService.quantityInsert(constructionList);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
+        }
+        return j;
+    }
+
+
+    @ResponseBody
     @RequestMapping(value = "importDisclose")
     public AjaxJson importDisclose(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
         AjaxJson j = new AjaxJson();
@@ -572,7 +858,7 @@ public class ConstructionController extends BaseController {
             ImportExcel ei = new ImportExcel(file, 0, 0);
             Disclose disclose;
             int lastDataRowNum = ei.getLastDataRowNum();
-            for (int i = 3; i <=lastDataRowNum; i++) {
+            for (int i = 3; i <= lastDataRowNum; i++) {
                 construction = new Construction();
                 disclose = new Disclose();
                 Row row = ei.getRow(i);
@@ -625,12 +911,60 @@ public class ConstructionController extends BaseController {
                 disclose.setOtherAdjusted(ei.getCellValue(row, 21).toString());
                 //其他方案调整原因描述
                 disclose.setDescriptionReasons(ei.getCellValue(row, 22).toString());
+                //是否存在难以解决的政处
+                disclose.setDifficultResolve(ei.getCellValue(row, 233).toString());
+                //是否需要进行设计变更
+                disclose.setDesignChanges(ei.getCellValue(row, 24).toString());
+                //是否需要进行项目关闭
+                disclose.setNeedsClosed(ei.getCellValue(row, 25).toString());
+                //政处问题描述
+                disclose.setAffairsDescription(ei.getCellValue(row, 26).toString());
+                //是否需要规划报批（150米及以上土建）
+                disclose.setPlanningRequired(ei.getCellValue(row, 27).toString());
+                //是否涉及高铁、高速
+                disclose.setHighSpeed(ei.getCellValue(row, 28).toString());
+                //是否存在复杂民事政处
+                disclose.setAffairsOffice(ei.getCellValue(row, 29).toString());
+                //图纸方案是否存在前置条件
+                disclose.setPreconditions(ei.getCellValue(row, 30).toString());
+                //前置条件描述
+                disclose.setPreconditionDescription(ei.getCellValue(row, 31).toString());
+                //是否需要定制物资
+                disclose.setCustomizedMaterials(ei.getCellValue(row, 32).toString());
+                //是否能定制
+                disclose.setCustomizedCan(ei.getCellValue(row, 33).toString());
+                //定制原因描述
+                disclose.setReasonDescription(ei.getCellValue(row, 34).toString());
+                //定制物资描述
+                disclose.setMaterialDescription(ei.getCellValue(row, 35).toString());
+                //拆旧物资是否与设计一致
+                disclose.setDemolitionMaterials(ei.getCellValue(row, 36).toString());
+                //型号不一致描述
+                disclose.setModelDescription(ei.getCellValue(row, 37).toString());
+                //数量不一致描述
+                disclose.setQuantityDescription(ei.getCellValue(row, 38).toString());
+                //图纸标注是否存在问题
+                disclose.setDrawingAnnotation(ei.getCellValue(row, 39).toString());
+                //图纸标注问题描述
+                disclose.setDrawingProblem(ei.getCellValue(row, 40).toString());
+                //是否存在停电问题
+                disclose.setPowerOutage(ei.getCellValue(row, 41).toString());
+                //停电问题问题描述
+                disclose.setPowerProblem(ei.getCellValue(row, 42).toString());
+                //是否邻近带电线路
+                disclose.setNearLiveLine(ei.getCellValue(row, 43).toString());
+                //是否下穿高压线路
+                disclose.setHighVoltageLine(ei.getCellValue(row, 44).toString());
+                //是否存在复杂管线
+                disclose.setComplexPipeline(ei.getCellValue(row, 45).toString());
+                //是否涉及复杂停电
+                disclose.setComplicatedPower(ei.getCellValue(row, 46).toString());
                 construction.setDisclose(disclose);
                 constructionList.add(construction);
             }
             //比对当前节点可以导入交底结论的信息
             List<Construction> criteriaList = new ArrayList<>();
-            for (Construction c:activityList) {
+            for (Construction c : activityList) {
                 for (Construction n : constructionList) {
                     if (c.getReserveProjectName().equals(n.getReserveProjectName())) {
                         criteriaList.add(n);
@@ -645,7 +979,7 @@ public class ConstructionController extends BaseController {
             List<Construction> insertList = (List<Construction>) stringObjectMap.get("newConList");
             if (insertList.size() > 0) {
                 for (Construction c : insertList) {
-                    for (Construction n:activityList) {
+                    for (Construction n : activityList) {
                         if (c.getReserveProjectName().equals(n.getReserveProjectName())) {
                             sendList.add(n);
                             c.getAct().setProcInsId(n.getProcInsId());
@@ -673,33 +1007,33 @@ public class ConstructionController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "uploadData")
-    public Map<String, Object> uploadData(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model,String procInsId) {
-		if (procInsId!=null&&procInsId!="") {
-			uploadImages.setProcInsId(procInsId);
-		}
-		//查询出所有的附件信息
-		Page<UploadImages> page = constructionService.findUploadPage(new Page<UploadImages>(request, response), uploadImages);
-		//当判定系统为linux的时候
-		if (Global.SYS_TYPE.equals("2")) {
-			List<UploadImages> list = page.getList();
-			for (UploadImages upload:
-				 list) {
-				String a = "";
-				String path = upload.getPath();
-				String[] split = path.split("\\|");
-				for (int i = 0; i < split.length; i++) {
-					a += "http://" + request.getServerName() + split[i] + "|";
-				}
-				upload.setPath(a);
-			}
-		}
-		List<UploadImages> list1 = page.getList();
-		for (UploadImages images : list1) {
-			String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType","");
-			images.setImgName(dictLabels);
-		}
-		List<UploadImages> list = page.getList();
-		//循环list
+    public Map<String, Object> uploadData(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model, String procInsId) {
+        if (procInsId != null && procInsId != "") {
+            uploadImages.setProcInsId(procInsId);
+        }
+        //查询出所有的附件信息
+        Page<UploadImages> page = constructionService.findUploadPage(new Page<UploadImages>(request, response), uploadImages);
+        //当判定系统为linux的时候
+        if (Global.SYS_TYPE.equals("2")) {
+            List<UploadImages> list = page.getList();
+            for (UploadImages upload :
+                    list) {
+                String a = "";
+                String path = upload.getPath();
+                String[] split = path.split("\\|");
+                for (int i = 0; i < split.length; i++) {
+                    a += "http://" + request.getServerName() + split[i] + "|";
+                }
+                upload.setPath(a);
+            }
+        }
+        List<UploadImages> list1 = page.getList();
+        for (UploadImages images : list1) {
+            String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType", "");
+            images.setImgName(dictLabels);
+        }
+        List<UploadImages> list = page.getList();
+        //循环list
         return getBootstrapData(page);
     }
 
@@ -708,7 +1042,7 @@ public class ConstructionController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "btnMaterial")
-    public  AjaxJson  btnMaterial(MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+    public AjaxJson btnMaterial(MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
         AjaxJson j = new AjaxJson();
         ImportExcel mo = new ImportExcel(file, 1, "模块表");
         ImportExcel importExcel = new ImportExcel(file, 1, "领料清单");
@@ -725,11 +1059,11 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 导入物料表
+     * 导入工程量
      */
     @ResponseBody
     @RequestMapping(value = "importQuantity")
-    public  AjaxJson  importQuantity(MultipartFile file,HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
+    public AjaxJson importQuantity(MultipartFile file, HttpServletResponse response, HttpServletRequest request) throws IOException, InvalidFormatException {
         AjaxJson j = new AjaxJson();
         List<Construction> constructionList = new ArrayList<>();
         Construction construction;
@@ -834,16 +1168,29 @@ public class ConstructionController extends BaseController {
                     if ("".equals(processingType)) {
                         flag += "政策处理类型不能为空\t";
                         can = false;
+                    } else {
+                        String[] split = processingType.split(",");
+                        for (String a : split) {
+                            if ("行政政处".equals(a) || "农村政处".equals(a) || "民事政处".equals(a)) {
+
+                            } else {
+                                flag += "政策处理类型填写有误\t";
+                                can = false;
+                            }
+                        }
                     }
                     if ("".equals(processingDescription)) {
                         flag += "政策处理描述不能为空\t";
                         can = false;
                     }
+                } else {
+                    construction.getQuantity().setProcessingType("");
+                    construction.getQuantity().setProcessingDescription("");
                 }
                 if (can) {
                     constructionList.add(construction);
                 } else {
-                    allFlag += quantity.getReserveProjectName() + flag + "\n";
+                    allFlag += "<" + quantity.getReserveProjectName() + ">" + flag + "\n";
                 }
             }
             if (constructionList.size() > 0) {

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

@@ -190,13 +190,9 @@ public class UploadController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model,String procInsId) {
-		/*if (procInsId!=null&&procInsId!="") {
+		if (procInsId!=null&&procInsId!="") {
 			uploadImages.setProcInsId(procInsId);
 		}
-		if (uploadImages.getProject() == null) {
-			Project1 project = new Project1();
-			uploadImages.setProject(project);
-		}
 		//查询出所有的附件信息
 		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
 		//当判定系统为linux的时候
@@ -218,9 +214,6 @@ public class UploadController extends BaseController {
 			String dictLabels = DictUtils.getDictLabel(images.getImgName(), "uploadFileType","");
 			images.setImgName(dictLabels);
 		}
-		List<UploadImages> list = page.getList();
-		//循环list*/
-		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
 		return getBootstrapData(page);
 	}
 

src/main/java/com/jeeplus/modules/sg/managementcenter/project/entity/Project.java

@@ -28,6 +28,8 @@ public class Project extends DataEntity<Project> {
     private String status;
     //领料状态
     private String acquisitionStatus;
+    //土建状态
+    private String advanceStatus;
     //施工状态
     private String constructionStatus;
     //是否项目关闭
@@ -35,9 +37,11 @@ public class Project extends DataEntity<Project> {
     //结算状态
     private String settStatus;
     //判断项目是否可以提前发起领料
-    private Integer earlyMaterial;
+    private String earlyMaterial;
     //判断项目是否可以提前施工
-    private Integer preConstruction;
+    private String preConstruction;
+    //判断项目是否可以提前土建
+    private String advanceConstruction;
 
     public String getReserveProjectName() {
         return reserveProjectName;
@@ -119,6 +123,14 @@ public class Project extends DataEntity<Project> {
         this.acquisitionStatus = acquisitionStatus;
     }
 
+    public String getAdvanceStatus() {
+        return advanceStatus;
+    }
+
+    public void setAdvanceStatus(String advanceStatus) {
+        this.advanceStatus = advanceStatus;
+    }
+
     public String getConstructionStatus() {
         return constructionStatus;
     }
@@ -143,19 +155,27 @@ public class Project extends DataEntity<Project> {
         this.settStatus = settStatus;
     }
 
-    public Integer getEarlyMaterial() {
+    public String getEarlyMaterial() {
         return earlyMaterial;
     }
 
-    public void setEarlyMaterial(Integer earlyMaterial) {
+    public void setEarlyMaterial(String earlyMaterial) {
         this.earlyMaterial = earlyMaterial;
     }
 
-    public Integer getPreConstruction() {
+    public String getPreConstruction() {
         return preConstruction;
     }
 
-    public void setPreConstruction(Integer preConstruction) {
+    public void setPreConstruction(String preConstruction) {
         this.preConstruction = preConstruction;
     }
+
+    public String getAdvanceConstruction() {
+        return advanceConstruction;
+    }
+
+    public void setAdvanceConstruction(String advanceConstruction) {
+        this.advanceConstruction = advanceConstruction;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -5,6 +5,8 @@ package com.jeeplus.modules.sg.managementcenter.project.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
 import com.jeeplus.modules.sg.managementcenter.project.entity.PickingRequisition;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
@@ -88,6 +90,11 @@ public interface ProjectMapper extends BaseMapper<Project> {
     Project findPlanByName(String name);
 
     /**
+     * 根据名称查询该计划的id，用于流程在表中添加procInsId
+     * */
+    String findPlanIdByName(String name);
+
+    /**
      * 根据名称查询项目立项信息
      */
     Project findApprovalByName(String id);
@@ -132,6 +139,8 @@ public interface ProjectMapper extends BaseMapper<Project> {
      */
     Project getApproval(Project project);
 
+
+
     /**
      * 查找系统中所有人员信息
      */
@@ -153,14 +162,21 @@ public interface ProjectMapper extends BaseMapper<Project> {
      */
     String reserveProjectNameById(String id);
 
+
+    Project findByProcInsId(String procInsId);
+
+    /**
+     * 获取项目基础信息根据id
+     */
+    Project findMaterialProject(String id);
     /*#################################################################################################*/
 
-    void updateStatus(Project project);
+
 
     /**
-     * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
+     * 根据改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
      * */
-    void updateStatusBy(@Param("status") String status,@Param("procInsId") String procInsId);
+    void updateStatusBy(String acquisitionStatus,String projectId);
 
     void  updateStatusByClose(@Param("close") String close,@Param("procInsId") String procInsid);
 

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -9,11 +9,13 @@
 		a.projectName,
         a.status,
         a.acquisitionStatus,
+        a.advanceStatus,
         a.constructionStatus,
         a.whetherCloseStatus,
         a.settStatus,
         a.earlyMaterial,
-        a.preConstruction
+        a.preConstruction,
+        a.advanceConstruction
     </sql>
     <sql id="basicColumns">
         b.id as `basicInformation.id`,
@@ -175,6 +177,9 @@
             <if test="acquisitionStatus!=null and acquisitionStatus !=''">
                 and a.acquisitionStatus = #{acquisitionStatus}
             </if>
+            <if test="advanceStatus!=null and advanceStatus !=''">
+                and a.advanceStatus = #{advanceStatus}
+            </if>
             <if test="constructionStatus!=null and constructionStatus !=''">
                 and a.constructionStatus = #{constructionStatus}
             </if>
@@ -190,6 +195,9 @@
             <if test="preConstruction!=null and preConstruction !=''">
                 and a.preConstruction = #{preConstruction}
             </if>
+            <if test="advanceConstruction!=null and advanceConstruction!=''">
+                and a.advanceConstruction = #{advanceConstruction}
+            </if>
             ${dataScope}
         </where>
     </select>
@@ -258,6 +266,7 @@
     <select id="findProcess" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
         select status,
                acquisitionStatus,
+               advanceStatus,
                constructionStatus,
                whetherCloseStatus,
                settStatus,
@@ -653,7 +662,8 @@
 
     <select id="findPlanByName" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
         select
-        <include refid="planColumns"/>
+        <include refid="planColumns"/>,
+        <include refid="assignmentColumns"/>
         from xm_material_project a
         left join xm_project_basicinformation b
         on a.reserveProjectName = b.reserveProjectName
@@ -664,6 +674,7 @@
         WHERE d.reserveProjectName = #{name}
     </select>
 
+
     <select id="findApprovalByName" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
         select
         <include refid="projectColumns"/>,
@@ -1119,9 +1130,9 @@
 
     <!--根据项目名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底-->
     <update id="updateStatusBy">
-        update xm_project_details
-        set status = #{status}
-        where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+        update xm_material_project
+        set acquisitionStatus = #{acquisitionStatus}
+        where projectId = #{projectId}
     </update>
     <!-- 修改项目关闭状态-->
     <update id="updateStatusByClose">
@@ -1130,13 +1141,6 @@
         where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
     </update>
 
-    <!--修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底-->
-    <update id="updateStatus">
-        update xm_project_details
-        set status = #{status}
-        where id = #{id};
-    </update>
-
     <!--修改项目领料状态状态0未发起-->
     <update id="updateAcquisitionStatus">
         update xm_project_details
@@ -1187,7 +1191,8 @@
         select
         <include refid="assignmentColumns"/>
         FROM xm_project_assignment c
-        WHERE reserveProjectName = (select reserveProjectName from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+        WHERE reserveProjectName = (select reserveProjectName from xm_construction_clarificaiton where proc_ins_id =
+        #{procInsId});
     </select>
 
     <select id="findWZUser" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
@@ -1331,7 +1336,8 @@
           and projectName != ''
     </select>
     <select id="reserveProjectNameById" resultType="java.lang.String">
-        select reserveProjectName from xm_material_project
+        select reserveProjectName
+        from xm_material_project
         where id = #{id}
     </select>
     <select id="demandByProcInsId" resultType="java.lang.String">
@@ -1340,4 +1346,29 @@
         where reserveProjectName =
               (select reserveProjectName from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
     </select>
+    <select id="findPlanIdByName" resultType="java.lang.String">
+        select id
+        from xm_construction_clarificaiton
+        where reserveProjectName = #{name};
+    </select>
+    <select id="findByProcInsId" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+        select a.reserveProjectName,
+        a.projectId,
+        a.projectName,
+        a.acquisitionStatus,
+        <include refid="assignmentColumns"/>
+        from xm_material_project a
+        LEFT JOIN xm_construction_clarificaiton b
+        on a.reserveProjectName = b.reserveProjectName
+        left join xm_project_assignment c
+        on a.reserveProjectName = c.reserveProjectName
+        where b.proc_ins_id = #{procInsId}
+    </select>
+    <select id="findMaterialProject"
+            resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+        select id, projectId, projectName
+        from xm_material_project
+        where id = #{id};
+    </select>
+
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -3,6 +3,8 @@
  */
 package com.jeeplus.modules.sg.managementcenter.project.service;
 
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.EngineeringAmount;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.OtherAmount;
 import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
@@ -59,6 +61,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	}
 
 
+
 	/**
 	 * 修改项目前期基础信息
 	 * */
@@ -174,6 +177,13 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	}
 
 	/**
+	 * 根据名称查询该计划的id，用于流程在表中添加procInsId
+	 */
+	public String findPlanIdByName(String name) {
+		return projectMapper.findPlanIdByName(name);
+	}
+
+	/**
 	 * 根据名称查询项目立项信息
 	 */
 	public Project findApprovalByName(String name) {
@@ -238,7 +248,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	public Project findUser(String procInsId) {
 		return projectMapper.findUser(procInsId);
 	}
-	/*public Project get(String id) {
+
+/*	public Project get(String id) {
 		Project project1 = super.get(id);
 		return project1;
 	}
@@ -270,17 +281,17 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		return projectMapper.findListById(proListId);
 	}
 
-	*//**
+	*
 	 * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
-	 *//*
+
 	@Transactional(readOnly = false)
 	public void updateStatusBy(String status, String procInsId) {
 		projectMapper.updateStatusBy(status,procInsId);
 	}
 
-	*//**
+	*
 	 * 根据项目需求名称修改项目关闭状态
-	 *//*
+
 	@Transactional(readOnly = false)
 	public void updateStatusByClose(String close,String procInsId){
 		projectMapper.updateStatusByClose(close,procInsId);
@@ -386,5 +397,17 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		return projectMapper.findDefId(key);
 	}
 
+	/**
+	 * 根据流程定义号获取项目信息
+	 * */
+	public Project findByProcInsId(String procInsId) {
+		return projectMapper.findByProcInsId(procInsId);
+	}
 
+	/**
+	 * 获取项目基础信息根据id
+	 */
+	public Project findMaterialProject(String id) {
+		return projectMapper.findMaterialProject(id);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProjectImportUtil.java

@@ -358,11 +358,8 @@ public class ProjectImportUtil {
      */
     public static Map<String, Object> planValidation(ImportExcel ei, int lastDataRowNum) {
         HashMap<String, Object> hashMap = new HashMap<String, Object>();
-        List<Project> afterValidation = new ArrayList<>();
         Project project = null;
-        String str = "";
         String flagStr = "";
-        Boolean flag = false;
         //获取所有的已有项目信息-比对，项目名称项目的数据进行数据比对
         List<Project> compareList = new ArrayList<>();
         List<Project> noCompareList = new ArrayList<>();
@@ -378,8 +375,11 @@ public class ProjectImportUtil {
                     Project assByName = projectMapper.findAssByName(reserveProjectName);
                     Project basicByName = projectMapper.findProByName(reserveProjectName);
                     if (assByName == null || basicByName == null) {
-                        flagStr +=  reserveProjectName + "请先填写对应的项目前期基本信息/施工任务分配信息\n";
+                        flagStr += reserveProjectName + "请先填写对应的项目前期基本信息/施工任务分配信息\n";
                         continue;
+                    } else {
+                        project.setAssignment(assByName.getAssignment());
+                        project.setBasicInformation(basicByName.getBasicInformation());
                     }
                     project.setDisclosurePlan(new DisclosurePlan());
                     project.setReserveProjectName(reserveProjectName);
@@ -390,12 +390,11 @@ public class ProjectImportUtil {
                     project.getDisclosurePlan().setLiveSurveyContact((String) ei.getCellValue(row, 10));
                     project.getDisclosurePlan().setInspector((String) ei.getCellValue(row, 11));
                     project.getDisclosurePlan().setDisclosurePlanDate((String) ei.getCellValue(row, 12));
-                    //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
                     Project proByName = projectMapper.findPlanByName(reserveProjectName);
                     if (proByName != null) {
                         Boolean aBoolean = checkProcess(reserveProjectName);
                         if (!aBoolean) {
-                            flagStr += proByName.getBasicInformation().getReserveProjectName() + "项目流程运行中，不能更改信息\n";
+                            flagStr += reserveProjectName + "项目流程运行中，不能更改信息\n";
                             continue;
                         }
                         noCompareList.add(project);
@@ -441,10 +440,11 @@ public class ProjectImportUtil {
         Project process = projectMapper.findProcess(name);
         String status = process.getStatus();
         String acquisitionStatus = process.getAcquisitionStatus();
+        String advanceStatus = process.getAdvanceStatus();
         String constructionStatus = process.getConstructionStatus();
         String whetherCloseStatus = process.getWhetherCloseStatus();
         String settStatus = process.getSettStatus();
-        if ("0".equals(status) && "0".equals(acquisitionStatus) && "0".equals(constructionStatus) && "0".equals(whetherCloseStatus) && "0".equals(settStatus)) {
+        if ("0".equals(status) && "0".equals(acquisitionStatus) && "0".equals(constructionStatus) && "0".equals(whetherCloseStatus) && "0".equals(settStatus) && "0".equals(advanceStatus)) {
             return true;
         } else {
             return false;

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -12,8 +12,13 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.google.common.collect.Maps;
 import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.modules.act.service.ActProcessService;
+import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.oa.service.OaNotifyService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.service.MaterialInventoryService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
@@ -22,6 +27,8 @@ import com.jeeplus.modules.sg.managementcenter.project.service.PickingRequisitio
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.util.ProjectImportUtil;
 import com.jeeplus.modules.sys.service.SystemService;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +69,15 @@ public class ProjectController extends BaseController {
     @Autowired
     private SystemService systemService;
 
+    @Autowired
+    private ActProcessService actProcessService;
+
+    @Autowired
+    private ActTaskService actTaskService;
+
+    @Autowired
+    private ConstructionService constructionService;
+
     @ModelAttribute
     public Project get(@RequestParam(required = false) String id) {
         Project entity = null;
@@ -209,17 +225,6 @@ public class ProjectController extends BaseController {
     @RequiresPermissions("sg:managementcenter:project:list")
     @RequestMapping(value = "data")
     public Map<String, Object> data(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
-/*		//获取登录名
-		String loginName = UserUtils.getUser().getLoginName();//获取登录名
-		String name = UserUtils.getUser().getName();//获取登录名
-		if (!"admin".equals(loginName)){
-			if ("".equals(project1.getRequireName())){
-				project1.setLoginNameFindStats("1");
-				project1.setLoginNameFind(name);
-			}
-		}
-		HttpSession session = request.getSession();
-		session.setAttribute("projectEpo", project);*/
         Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
         return getBootstrapData(page);
     }
@@ -261,6 +266,10 @@ public class ProjectController extends BaseController {
 		project1.setPreConstruction(1);
 		//未进行施工流程
 		project1.setConstructionStatus("0");*/
+        project.setStatus("2");
+        project.setWhetherCloseStatus("0");
+        project.setAdvanceStatus("0");
+        project.setAdvanceConstruction("1");
         Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
         return getBootstrapData(page);
     }
@@ -508,19 +517,34 @@ public class ProjectController extends BaseController {
                 j.setMsg("请填写对应的前期基本信息/施工任务分配信息");
                 return j;
             } else {
+                project.setBasicInformation(basicByName.getBasicInformation());
+                project.setAssignment(assByName.getAssignment());
                 Project planByName = projectService.findPlanByName(reserveProjectName);
                 List<Project> projectList = new ArrayList<>();
                 //判断是不是空，是空insert新数据，不是空update数据
                 projectList.add(project);
                 if (planByName != null) {
-                    projectService.updatePlanList(projectList);
+//                    projectService.updatePlanList(projectList);
+                    j.setSuccess(true);
+                    j.setMsg("保存成功");
                 } else {
                     projectService.insertPlanList(projectList);
+                    Construction construction = new Construction();
+                    construction.setReserveProjectName(project.getReserveProjectName());
+                    constructionService.newSave(construction);
+                    constructionService.updateStatus(project.getReserveProjectName());
+                    Map<String, Object> vars = Maps.newHashMap();
+                    vars.put("design", UserUtils.getByUserName(project.getAssignment().getConstructionManage()).getLoginName());
+                    //发送流程，更改项目状态
+                    String procDefId = projectService.findDefId("sgjd");
+                    ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                    String title = project.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                    String ByName = projectService.findPlanIdByName(construction.getReserveProjectName());
+                    actTaskService.startProcess(p.getKey(), "xm_construction_clarificaiton", ByName, title, vars);
+                    j.setSuccess(true);
+                    j.setMsg("流程发送成功");
                 }
-                j.setSuccess(true);
-                j.setMsg("保存成功");
             }
-
         } else {
             j.setSuccess(false);
             j.setMsg("项目流程运行中不可修改信息");
@@ -712,20 +736,27 @@ public class ProjectController extends BaseController {
             if (afterValidation.size() > 0) {
                 projectService.insertPlanList(afterValidation);
             }
-            if (noCompareList.size() > 0) {
+/*            if (noCompareList.size() > 0) {
                 projectService.updatePlanList(noCompareList);
-            }
+            }*/
             int i = afterValidation.size() + noCompareList.size();
             List<Project> processList = new ArrayList<>();
             if (afterValidation.size() > 0) {
                 processList.addAll(afterValidation);
             }
-            if (noCompareList.size() > 0) {
-                processList.addAll(noCompareList);
-            }
+            String procDefId = projectService.findDefId("sgjd");
             for (Project project : processList) {
-
+                Construction construction = new Construction();
+                construction.setReserveProjectName(project.getReserveProjectName());
+                constructionService.newSave(construction);
+                constructionService.updateStatus(project.getReserveProjectName());
+                Map<String, Object> vars = Maps.newHashMap();
+                vars.put("design", UserUtils.getByUserName(project.getAssignment().getConstructionManage()).getLoginName());
                 //发送流程，更改项目状态
+                ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                String title = project.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                String planByName = projectService.findPlanIdByName(construction.getReserveProjectName());
+                actTaskService.startProcess(p.getKey(), "xm_construction_clarificaiton", planByName, title, vars);
             }
             //将不可修改的值重新获取
             j.setMsg("已成功导入" + i + "条记录\n" + errorMsg);

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/entity/NonPower.java

@@ -0,0 +1,41 @@
+package com.jeeplus.modules.sg.materialmodule.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
+
+/**
+ * 土建实体类
+ * */
+public class NonPower extends ActEntity<NonPower> {
+    //项目定义号
+    private String projectId;
+    //项目名称
+    private String projectName;
+    //项目基础信息
+    private BasicInformation basicInformation;
+
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public BasicInformation getBasicInformation() {
+        return basicInformation;
+    }
+
+    public void setBasicInformation(BasicInformation basicInformation) {
+        this.basicInformation = basicInformation;
+    }
+}

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/MaterialModuleMapper.java

@@ -14,11 +14,6 @@ import java.util.Date;
 import java.util.List;
 
 
-/**
- * 请假表单MAPPER接口
- * @author lgf
- * @version 2018-06-12
- */
 @MyBatisMapper
 public interface MaterialModuleMapper extends BaseMapper<MaterialModule> {
 

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/NonPowerMapper.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.materialmodule.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+
+@MyBatisMapper
+public interface NonPowerMapper extends BaseMapper<NonPower> {
+
+}

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/xml/NonPowerMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.materialmodule.activiti.mapper.NonPowerMapper">
+
+	<sql id="basicColumns">
+		b.id as `basicInformation.id`,
+        b.reserveProjectName as `basicInformation.reserveProjectName`,
+		b.municipalCompany AS `basicInformation.municipalCompany`,
+		b.countyCompany AS `basicInformation.countyCompany`,
+		b.projectNature AS `basicInformation.projectNature`,
+		b.demandUnit AS `basicInformation.demandUnit`,
+		b.operationUnit AS `basicInformation.operationUnit`,
+		b.powerSupplyArea AS `basicInformation.powerSupplyArea`,
+		b.gridNumber AS `basicInformation.gridNumber`,
+		b.cellNumber AS `basicInformation.cellNumber`,
+		b.projectReserveNo AS `basicInformation.projectReserveNo`,
+		b.gridProjectNo AS `basicInformation.gridProjectNo`,
+		b.erpNo AS `basicInformation.erpNo`,
+		b.necessityContent AS `basicInformation.necessityContent`,
+		b.subStationName AS `basicInformation.subStationName`,
+		b.lineName AS `basicInformation.lineName`,
+		b.projectType AS `basicInformation.projectType`,
+		b.whetherSummer AS `basicInformation.whetherSummer`,
+		b.basicDescription AS `basicInformation.basicDescription`,
+		b.workAreaRemarks AS `basicInformation.workAreaRemarks`
+	</sql>
+
+    <select id="get" resultType="NonPower">
+		select
+		a.id,
+		a.projectId,
+		p.projectName,
+		<include refid="basicColumns"/>
+		from xm_nonpower_process a
+		LEFT JOIN xm_material_project p
+		on a.projectId = p.projectId
+		LEFT JOIN xm_project_basicinformation b
+		on p.reserveProjectName = b.reserveProjectName
+		where a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="NonPower">
+		select
+		a.id,
+		a.projectId,
+		p.projectName,
+		<include refid="basicColumns"/>
+		from xm_nonpower_process a
+		LEFT JOIN xm_material_project p
+		on a.projectId = p.projectId
+		LEFT JOIN xm_project_basicinformation b
+		on p.reserveProjectName = b.reserveProjectName
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+
+
+    <insert id="insert">
+		insert into xm_nonpower_process (
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			remarks,
+			proc_ins_id,
+			projectId
+		)values
+			(
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{remarks},
+			#{procInsId},
+			#{projectId}
+			)
+	</insert>
+</mapper>

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/service/NonPowerService.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.materialmodule.activiti.service;
+
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
+import com.jeeplus.modules.sg.materialmodule.activiti.mapper.MaterialModuleMapper;
+import com.jeeplus.modules.sg.materialmodule.activiti.mapper.NonPowerMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 请假表单Service
+ *
+ * @author lgf
+ * @version 2018-06-12
+ */
+@Service
+@Transactional(readOnly = true)
+public class NonPowerService extends CrudService<NonPowerMapper, NonPower> {
+    @Autowired
+    private NonPowerMapper nonPowerMapper;
+
+    @Override
+    public NonPower get(String id) {
+        return super.get(id);
+    }
+}

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/web/MaterialModuleController.java

@@ -8,6 +8,7 @@ import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.repository.ProcessDefinition;

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/web/NonPowerController.java

@@ -0,0 +1,158 @@
+package com.jeeplus.modules.sg.materialmodule.activiti.web;
+
+import com.google.common.collect.Maps;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.act.service.ActProcessService;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
+import com.jeeplus.modules.sg.materialmodule.activiti.entity.NonPower;
+import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
+import com.jeeplus.modules.sg.materialmodule.activiti.service.NonPowerService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping(value = "${adminPath}/nonPower")
+public class NonPowerController extends BaseController {
+    @Autowired
+    private NonPowerService nonPowerService;
+    @Autowired
+    private ActProcessService actProcessService;
+    @Autowired
+    private ActTaskService actTaskService;
+    @Autowired
+    private ProjectService projectService;
+    @Autowired
+    private ConstructionService constructionService;
+
+    @ModelAttribute
+    public NonPower get(@RequestParam(required = false) String id) {
+        NonPower entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = nonPowerService.get(id);
+        }
+        if (entity == null) {
+            entity = new NonPower();
+        }
+        return entity;
+    }
+
+
+    /***************************************土建流程*************************************************/
+
+    /**
+     * 土建流程发起页面
+     */
+    @RequestMapping(value = "nonPowerForm")
+    public String nonPowerForm(NonPower nonPower, Model model) {
+        model.addAttribute("nonPower", nonPower);
+        return "modules/sg/materialmodule/activiti/nonPowerForm";
+    }
+
+    /**
+     * 土建开工流程
+     */
+    @RequestMapping(value = "nonPowerStart")
+    public String nonPowerStart(NonPower nonPower, Model model) {
+        model.addAttribute("nonPower", nonPower);
+        return "modules/sg/materialmodule/activiti/nonPowerStart";
+    }
+
+    /**
+     * 土建竣工
+     */
+    @RequestMapping(value = "nonPowerEnd")
+    public String nonPowerEnd(NonPower nonPower, Model model) {
+        model.addAttribute("nonPower", nonPower);
+        return "modules/sg/materialmodule/activiti/nonPowerEnd";
+    }
+
+    /**
+     * 在线验收
+     */
+    @RequestMapping(value = "acceptance")
+    public String acceptance(NonPower nonPower, Model model) {
+        model.addAttribute("nonPower", nonPower);
+        return "modules/sg/materialmodule/activiti/acceptance";
+    }
+
+    /**
+     * 审核土建竣工
+     */
+    @RequestMapping(value = "nonRePowerEnd")
+    public String nonRePowerEnd(NonPower nonPower, Model model) {
+        model.addAttribute("nonPower", nonPower);
+        return "modules/sg/materialmodule/activiti/nonRePowerEnd";
+    }
+
+    /**
+     * 发起土建流程
+     */
+    @ResponseBody
+    @RequestMapping(value = "save")
+    public AjaxJson save(NonPower nonPower, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(nonPower);
+        if (StringUtils.isNotBlank(errMsg)) {
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+        /**
+         * 流程审批
+         */
+        if (StringUtils.isBlank(nonPower.getId())) {
+            if ("".equals(nonPower.getProjectId())) {
+                j.setSuccess(false);
+                j.setMsg("请选择项目");
+                return j;
+            }
+            Project project = new Project();
+            project.setId(nonPower.getProjectId());
+            //通过项目id获取项目定义号，项目名称及人员信息
+            Project materialProject = projectService.getAss(project);
+            //定义vars用于指派流程走向
+            Map<String, Object> vars = Maps.newHashMap();
+            //获取项目定义号
+            String projectId = materialProject.getProjectId();
+            vars.put("design", UserUtils.getByUserName(materialProject.getAssignment().getConstructionManage()).getLoginName());
+            //保存基础信息到流程表中
+            nonPower.setProjectId(projectId);
+            nonPowerService.save(nonPower);
+            //根据项目定义号修改项目的土建流程状态
+            constructionService.updateAdvStatus(nonPower.getProjectId());
+            // 启动流程
+            ProcessDefinition p = actProcessService.getProcessDefinition(nonPower.getAct().getProcDefId());
+            String title = nonPower.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+            actTaskService.startProcessNew(p.getKey(), "xm_nonpower_process", nonPower.getId(), title, vars);
+            //新增或编辑表单保存
+            j.setMsg("发起流程审批成功!");
+            j.getBody().put("targetUrl", "/act/task/process/");
+        }
+        return j;
+    }
+    /***************************************土建流程*************************************************/
+}
+
+

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/ShowListMapper.java

@@ -124,12 +124,12 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
     /**
      * 修改项目状态表示开启领料
      */
-    void updateAcqStatus(ShowList showList);
+    void updateAcqStatus(String reserveProjectName);
 
     /**
      * 查询是否已经发起过领料
      * */
-    String findAcqStatus(ShowList showList);
+    String findAcqStatus(String reserveProjectName);
 
 
     List<ExportListing> exportListing(List<String> list);

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -364,11 +364,12 @@
 	</select>
 
     <update id="updateAcqStatus">
-		update xm_project_details set acquisition_status = 1 where id = #{projectId};
+		update xm_material_project set acquisitionStatus = '1',status = '2' where reserveProjectName = #{reserveProjectName};
 	</update>
 
     <select id="findAcqStatus" resultType="java.lang.String">
-		select acquisition_status from xm_project_details where id = #{projectId};
+			select acquisitionStatus from xm_material_project
+			where reserveProjectName = #{reserveProjectName}
 	</select>
 
     <select id="exportListing" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ExportListing">

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/ShowListService.java

@@ -188,12 +188,12 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 	}
 
 	@Transactional(readOnly = false)
-	public void updateAcqStatus(ShowList showList) {
-		showListMapper.updateAcqStatus(showList);
+	public void updateAcqStatus(String reserveProjectName) {
+		showListMapper.updateAcqStatus(reserveProjectName);
 	}
 
-	public String findAcqStatus(ShowList showList) {
-		return showListMapper.findAcqStatus(showList);
+	public String findAcqStatus(String reserveProjectName) {
+		return showListMapper.findAcqStatus(reserveProjectName);
 	}
 
 	public List<ExportListing> exportListing(List<String> list) {

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

@@ -1,8 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
-	/**
-	 * 配网专职提交申请页面
-	 * */
+
 	$(document).ready(function() {
 		jp.ajaxForm("#inputForm",function(data){
 			if(data.success){

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

@@ -45,7 +45,6 @@
 							</tr>
 							</tbody>
 						</table>
-
 						<div class="form-group">
 							<div class="col-lg-3"></div>
 							<c:if test="${construction.act.startTask}">

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

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

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

@@ -0,0 +1,112 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>土建工程量修改页面</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <style type="text/css">
+        input::-webkit-input-placeholder {
+            color: red !important;
+        }
+
+        input::-moz-placeholder { /* Mozilla Firefox 19+ */
+            color: red !important;
+        }
+
+        input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+            color: red !important;
+        }
+
+        input:-ms-input-placeholder { /* Internet Explorer 10-11 */
+            color: red !important;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $('#beginDate').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+            $('#endDate').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+        });
+
+        function save() {
+            var b = check();
+            if (!b) {
+                jp.error("请正确填写信息");
+                return false;
+            }
+            jp.loading();
+            jp.post("${ctx}/managementcenter/activiti/EngAmountSave", $("#inputForm").serialize(), function (data) {
+                if (data.success) {
+                    jp.getParent().refresh();
+                    var dialogIndex = parent.layer.getFrameIndex(window.name); //获取窗口索引
+                    parent.layer.close(dialogIndex);
+                    jp.success(data.msg);
+                } else {
+                    jp.error(data.msg);
+                }
+            });
+        }
+
+        function check() {
+            var flag = true;
+            var civilWorks = $('#civilWorks').val();
+            var civilMaterials = $('#civilMaterials').val();
+            var civilUnit = $('#civilUnit').val();
+                if (civilWorks == "") {
+                    flag = false;
+                }
+                if (civilMaterials == "") {
+                    flag = false;
+                }
+                if (civilUnit == "") {
+                    flag = false;
+                }
+            return flag;
+        }
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="engineeringAmount" action="" method="post"
+                               class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <form:hidden path="reserveProjectName"/>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 形式：</label></td>
+                                <td class="width-35">
+                                    <form:input id="civilWorks" path="civilWorks"
+                                                cssClass="form-control" placeholder="形式不能为空"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">物料信息：</label></td>
+                                <td class="width-35">
+                                    <form:input id="civilMaterials" path="civilMaterials"
+                                                cssClass="form-control" placeholder="物料信息不能为空"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 数量：</label></td>
+                                <td class="width-35">
+                                    <form:input id="civilUnit" path="civilUnit"
+                                                cssClass="form-control" placeholder="数量不能为空"/>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,112 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>其它工程量修改页面</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <style type="text/css">
+        input::-webkit-input-placeholder {
+            color: red !important;
+        }
+
+        input::-moz-placeholder { /* Mozilla Firefox 19+ */
+            color: red !important;
+        }
+
+        input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+            color: red !important;
+        }
+
+        input:-ms-input-placeholder { /* Internet Explorer 10-11 */
+            color: red !important;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $('#beginDate').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+            $('#endDate').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+        });
+
+        function save() {
+            var b = check();
+            if (!b) {
+                jp.error("请正确填写信息");
+                return false;
+            }
+            jp.loading();
+            jp.post("${ctx}/managementcenter/activiti/addOther", $("#inputForm").serialize(), function (data) {
+                if (data.success) {
+                    jp.getParent().refresh();
+                    var dialogIndex = parent.layer.getFrameIndex(window.name); //获取窗口索引
+                    parent.layer.close(dialogIndex);
+                    jp.success(data.msg);
+                } else {
+                    jp.error(data.msg);
+                }
+            });
+        }
+
+        function check() {
+            var flag = true;
+            var otherWorks = $('#otherWorks').val();
+            var otherMaterials = $('#otherMaterials').val();
+            var otherUnit = $('#otherUnit').val();
+                if (otherWorks == "") {
+                    flag = false;
+                }
+                if (otherMaterials == "") {
+                    flag = false;
+                }
+                if (otherUnit == "") {
+                    flag = false;
+                }
+            return flag;
+        }
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="otherAmount" action="" method="post"
+                               class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <form:hidden path="reserveProjectName"/>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 形式：</label></td>
+                                <td class="width-35">
+                                    <form:input id="otherWorks" path="otherWorks"
+                                                cssClass="form-control" placeholder="形式不能为空"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">物料信息：</label></td>
+                                <td class="width-35">
+                                    <form:input id="otherMaterials" path="otherMaterials"
+                                                cssClass="form-control" placeholder="物料信息不能为空"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 数量：</label></td>
+                                <td class="width-35">
+                                    <form:input id="otherUnit" path="otherUnit"
+                                                cssClass="form-control" placeholder="数量不能为空"/>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

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

@@ -1,82 +1,314 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-	<script>
+<script>
+/**
+ * 项目经理组织交底页面
+ * */
+$(document).ready(function () {
+    window.operateEvents = {
+        'click #editEngAmount': function (e, value, row, index) {
+            jp.openSaveDialog('修改土建工程量', "${ctx}/managementcenter/activiti/editEngAmount?id="+row.id , '1000px', '800px');
+        },
+        'click #delEngAmount': function (e, value, row, index) {
+            jp.confirm('确认要删除该工程量吗？', function(){
+                jp.loading();
+                jp.get("${ctx}/managementcenter/activiti/delEngAmount?id=" + row.id, function(data){
+                    if(data.success){
+                        $('#engineeringTable').bootstrapTable('refresh');
+                        jp.success(data.msg);
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+            })
+        },
+        'click #editOtherAmount': function (e, value, row, index) {
+            jp.openSaveDialog('修改其它工程量', "${ctx}/managementcenter/activiti/editOther?id="+row.id , '1000px', '800px');
+        },
+        'click #delOtherAmount': function (e, value, row, index) {
+            jp.confirm('确认要删除该工程量吗？', function(){
+                jp.loading();
+                jp.get("${ctx}/managementcenter/activiti/delOtherAmount?id=" + row.id, function(data){
+                    if(data.success){
+                        $('#otherTable').bootstrapTable('refresh');
+                        jp.success(data.msg);
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+            })
+        }
+    };
+    $('#engineeringTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: false,
+        //显示刷新按钮
+        showRefresh: false,
+        //显示切换手机试图按钮
+        showToggle: false,
+        //显示 内容列下拉框
+        showColumns: false,
+        //显示到处按钮
+        showExport: false,
+        //显示切换分页按钮
+        showPaginationSwitch: false,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber:1,
+        //每页的记录行数（*）
+        pageSize: 5,
+        //可供选择的每页的行数（*）
+        pageList: [10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/managementcenter/activiti/engineeringTable?reserveProjectName=${construction.reserveProjectName}",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        //queryParamsType:'',
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams : function(params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+            searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger:"right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onContextMenuItem: function(row, $el){
+        },
+        onClickRow: function(row, $el){
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns: [{
+            field: 'civilWorks',
+            title: '形式',
+        },{
+            field: 'civilMaterials',
+            title: '物料',
+        },{
+            field: 'civilUnit',
+            title: '数量',
+        },{
+            field: 'operate',
+            title: '操作',
+            width: '160px',
+            events: operateEvents,
+            formatter: function operateFormatter(value, row, index) {
+                return [
+                    '<input id="editEngAmount" type="button" value="修改" class="btn btn-default">',
+                    '<input id="delEngAmount" type="button" value="删除" class="btn btn-default">',
+                ].join('');
+            }
+        }]
+    });
+
+
+    $('#otherTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: false,
+        //显示刷新按钮
+        showRefresh: false,
+        //显示切换手机试图按钮
+        showToggle: false,
+        //显示 内容列下拉框
+        showColumns: false,
+        //显示到处按钮
+        showExport: false,
+        //显示切换分页按钮
+        showPaginationSwitch: false,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber:1,
+        //每页的记录行数（*）
+        pageSize: 5,
+        //可供选择的每页的行数（*）
+        pageList: [10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/managementcenter/activiti/otherTable?reserveProjectName=${construction.reserveProjectName}",
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        //queryParamsType:'',
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams : function(params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+            searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger:"right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onContextMenuItem: function(row, $el){
+        },
+        onClickRow: function(row, $el){
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns: [{
+            field: 'otherWorks',
+            title: '形式',
+        },{
+            field: 'otherMaterials',
+            title: '物料',
+        },{
+            field: 'otherUnit',
+            title: '数量',
+        },{
+            field: 'operate',
+            title: '操作',
+            width: '160px',
+            events: operateEvents,
+            formatter: function operateFormatter(value, row, index) {
+                return [
+                    '<input id="editOtherAmount" type="button" value="修改" class="btn btn-default">',
+                    '<input id="delOtherAmount" type="button" value="删除" class="btn btn-default">',
+                ].join('');
+            }
+        }]
+    });
+    jp.ajaxForm("#inputForm", function (data) {
+        if (data.success) {
+            jp.success(data.msg);
+            jp.go("${ctx}/managementcenter/divide");
+        } else {
+            jp.error(data.msg);
+            $("#inputForm").find("button:submit").button("reset");
+        }
+    });
+
+
+    $('#startTime').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endTime').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    //富文本初始化
+    $('#reason').summernote({
+        height: 300,
+        lang: 'zh-CN',
+        readonly: true,
+        callbacks: {
+            onChange: function (contents, $editable) {
+                $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+            }
+        }
+    });
+
     /**
-     * 项目经理组织交底页面
+     * 导入交底结论
      * */
-    $(document).ready(function () {
-        jp.ajaxForm("#inputForm", function (data) {
-            if (data.success) {
-                jp.success(data.msg);
-                jp.go("${ctx}/managementcenter/divide");
-            } else {
-                jp.error(data.msg);
-                $("#inputForm").find("button:submit").button("reset");
+    $("#btnEng").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入交底结论",
+            content: "${ctx}/tag/importExcel",
+            btn: ['下载模板', '确定', '关闭'],
+            btn1: function () {
+                jp.downloadFile("${ctx}/managementcenter/activiti/excelQuantity");
+            },
+            btn2: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/managementcenter/activiti/importQuantity', function (data) {
+                    if (data.success) {
+                        jp.confirm(data.msg, function () {
+                            jp.close(index);
+                            window.location.reload();
+                        }, function () {
+                            jp.close(index);
+                            window.location.reload();
+                        });
+                    } else {
+                        jp.alert(data.msg);
+                    }
+                });//调用保存事件
+                return false;
+            },
+            btn3: function (index) {
+                jp.close(index);
             }
         });
+    });
+    $("#edit").click(function () {
+        var val = $("#id").val();
+        jp.openSaveDialog('修改工程量', "${ctx}/managementcenter/activiti/editEng?id=" + val, '1000px', '800px');
+    });
 
+    $("#addEng").click(function () {
+        var val = $("#id").val();
+        jp.openSaveDialog('修改工程量', "${ctx}/managementcenter/activiti/editEngAmount?reserveProjectName=${construction.reserveProjectName}", '1000px', '800px');
+    });
 
-        $('#startTime').datetimepicker({
-            format: "YYYY-MM-DD HH:mm:ss"
-        });
-        $('#endTime').datetimepicker({
-            format: "YYYY-MM-DD HH:mm:ss"
-        });
-        //富文本初始化
-        $('#reason').summernote({
-            height: 300,
-            lang: 'zh-CN',
-            readonly: true,
-            callbacks: {
-                onChange: function (contents, $editable) {
-                    $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-                }
-            }
-        });
+    $("#addOther").click(function () {
+        var val = $("#id").val();
+        jp.openSaveDialog('修改工程量', "${ctx}/managementcenter/activiti/editOther?reserveProjectName=${construction.reserveProjectName}", '1000px', '800px');
+    });
 
-        /**
-         * 导入交底结论
-         * */
-        $("#btnEng").click(function () {
-            jp.open({
-                type: 2,
-                area: [500, 200],
-                auto: true,
-                title: "导入交底结论",
-                content: "${ctx}/tag/importExcel",
-                btn: ['下载模板','确定', '关闭'],
-                btn1: function(){
-                    jp.downloadFile("${ctx}/managementcenter/activiti/excelQuantity");
-                },
-                btn2: function (index, layero) {
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/activiti/importQuantity', function (data) {
-                        if (data.success) {
-                            jp.confirm(data.msg, function (){
-                                jp.close(index);
-                                window.location.reload();
-                            }, function () {
-                                jp.close(index);
-                                window.location.reload();
-                            });
-                        } else {
-                            jp.alert(data.msg);
-                        }
-                    });//调用保存事件
-                    return false;
+    $("#agree").click(function () {
+        jp.prompt(" 审批意见", function (message) {
+            jp.post("${ctx}/act/task/engineering",
+                {
+                    "taskId": "${construction.act.taskId}",
+                    "taskName": "${construction.act.taskName}",
+                    "taskDefKey": "${construction.act.taskDefKey}",
+                    "procInsId": "${construction.act.procInsId}",
+                    "procDefId": "${construction.act.procDefId}",
+                    "id":"${construction.id}",
+                    "flag": "yes",
+                    "comment": window.encodeURI(message)
                 },
-                btn3: function (index) {
-                    jp.close(index);
+                function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        jp.go("${ctx}/act/task/todo");
+                    } else {
+                        jp.error(data.msg);
+                    }
                 }
-            });
+            )
         });
-        $("#edit").click(function () {
-            var val = $("#id").val();
-            jp.openSaveDialog('修改工程量', "${ctx}/managementcenter/activiti/editEng?id="+val, '1000px', '800px');
-        });
-    })
+    });
+
+})
 
-    //刷新列表
-    function refresh(){
-        location.reload();
-    }
+//刷新列表
+function refresh() {
+    location.reload();
+}
 </script>

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

@@ -1,471 +1,483 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-	<title>填写部分工程量信息</title>
-	<meta name="decorator" content="ani"/>
-	<!-- SUMMERNOTE -->
-	<%@include file="/webpage/include/summernote.jsp" %>
-	<%@include file="engineering.js"%>
+    <title>填写部分工程量信息</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="engineering.js" %>
 </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="btnEng" class="btn btn-info">
-						<i class="fa fa-folder-open-o"></i> 导入工程量
-					</button>
-					<button id="edit" class="btn btn-danger">
-						<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="construction.quantity.id"/>--%>
-						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
-						<input id="id" type="hidden" value="${fns:unescapeHtml(construction.quantity.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>
+    <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="btnEng" class="btn btn-info">
+                        <i class="fa fa-folder-open-o"></i> 导入工程量
+                    </button>
+                    <button id="edit" class="btn btn-danger">
+                        <i class="fa fa-folder-open-o"></i> 修改工程量
+                    </button>
+                    <button id="addEng" class="btn btn-info">
+                        <i class="fa fa-file-excel-o"></i> 添加土建工程量
+                    </button>
+                    <button id="addOther" class="btn btn-warning">
+                        <i class="fa fa-file-excel-o"></i> 添加其它工程量
+                    </button>
+                    <div>土建工程量</div>
+                    <table id="engineeringTable" data-toolbar="#toolbar"></table>
+                    <div>其它工程量</div>
+                    <table id="otherTable" data-toolbar="#toolbar"></table>
+                    <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)}">
+                        <input type="hidden" value="${fns:unescapeHtml(construction.reserveProjectName)}">
+                        <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.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.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.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.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.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.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.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.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.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.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.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.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>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.includeAutomation)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.wayOf)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.assignmentStyle)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.operationSubstation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.namingNumber)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.blackoutLine)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电范围初步校核 ：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.outageRange)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在政策处理问题：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.policyIssues)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 政策处理类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.processingType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.quantity.processingDescription)}
-								</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>
+                                <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>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 ：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </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>
+                    <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/ruralJudge.jsp

@@ -0,0 +1,535 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>农村专职判断</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#conditions").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/ruralJudge",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "conditions",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+            $("#close").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/ruralJudge",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "close",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+            $("#pass").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/ruralJudge",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "pass",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+        })
+    </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">
+                    <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.ifSelf)}
+                                </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>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 ：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </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="conditions" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="设计变更"/>&nbsp;
+                                <input id="close" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="项目关闭"/>
+                                <input id="pass" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="上传文件"/>
+                                <%--									<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/ruralLoan.jsp

@@ -0,0 +1,486 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>是否借款</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#conditions").click(function () {
+                var val = $("#ifBorrow").val();
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/ruralLoan",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "reserveProjectName": "${construction.reserveProjectName}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                });
+            });
+        });
+    </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">
+                    <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>
+                            </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>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 ：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </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="conditions" class="btn  btn-primary btn-lg btn-parsley" 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/ruralOffice.jsp

@@ -0,0 +1,493 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>农村政处开始页面</title>
+	<meta name="decorator" content="ani"/>
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#agree").click(function () {
+				var val = $("#ifSelf").val();
+				jp.prompt("审核通过", function (message) {
+					jp.post("${ctx}/act/task/ruralOffice",
+						{
+							"taskId": "${construction.act.taskId}",
+							"taskName": "${construction.act.taskName}",
+							"taskDefKey": "${construction.act.taskDefKey}",
+							"procInsId": "${construction.act.procInsId}",
+							"procDefId": "${construction.act.procDefId}",
+							"ifSelf": val,
+							"flag": "yes",
+							"comment": window.encodeURI(message)
+						},
+						function (data) {
+							if (data.success) {
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						}
+					)
+				})
+			});
+		})
+	</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">
+					<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">
+									<form:select path="ifSelf" 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">
+										${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>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.includeAutomation)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.wayOf)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.operationSubstation)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.namingNumber)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.blackoutLine)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right">停电范围初步校核 ：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.outageRange)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">是否存在政策处理问题：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.policyIssues)}
+								</td>
+							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"> 政策处理类型：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.processingType)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+								<td class="width-35">
+										${fns:unescapeHtml(construction.quantity.processingDescription)}
+								</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/ruralPays.jsp

@@ -0,0 +1,486 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>是否支付</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#conditions").click(function () {
+                var val = $("#ifBorrow").val();
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/ruralPays",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "reserveProjectName": "${construction.reserveProjectName}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                });
+            });
+        });
+    </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">
+                    <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>
+                            </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>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.includeAutomation)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">通信方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.wayOf)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 作业方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.assignmentStyle)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.operationSubstation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否需调整命名编号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.namingNumber)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在土建验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.engineeringAcceptance)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 是否存在电气验收：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.electricalAcceptance)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.blackoutLine)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电范围初步校核 ：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.outageRange)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">是否存在政策处理问题：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.policyIssues)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"> 政策处理类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.quantity.processingDescription)}
+                                </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="conditions" class="btn  btn-primary btn-lg btn-parsley" 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/uploadList.js

@@ -104,7 +104,7 @@ $(document).ready(function() {
 					   }
 
 				   },{
-					   field: 'project.requireName',
+					   field: 'reserveProjectName',
 					   title: '项目需求名称',
 					   sortable: true,
 					   sortName: 'requireName',
@@ -121,7 +121,7 @@ $(document).ready(function() {
 					   sortName: 'imgName',
 				   },
 				  {
-				   field: 'uId',
+				   field: 'uid',
 				   title: '上传人员',
 				   sortable: true,
 				   sortName: 'uId',

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

@@ -22,7 +22,7 @@
 	<div id="search-collapse" class="collapse">
 		<div class="accordion-inner">
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
-		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+<%--		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>--%>
 		<input type="hidden" id="path" name="path" value="${uploadImages.path}">
 		<div class="col-sm-4">
 			<label class="label-item single-overflow pull-left" title="文件用途：">文件用途：</label>
@@ -33,11 +33,7 @@
 		</div>
 		<div class="col-sm-4">
 			<label class="label-item single-overflow pull-left" title="项目需求名称：">项目需求名称：</label>
-			<form:input path="project.requireName" cssClass="form-control" htmlEscape="false"/>
-		</div>
-		<div class="col-sm-4">
-			<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
-			<form:input path="project.projectId" cssClass="form-control" htmlEscape="false"/>
+			<form:input path="reserveProjectName" cssClass="form-control" htmlEscape="false"/>
 		</div>
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 			<div style="margin-top:26px">

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerEnd.jsp

@@ -32,7 +32,7 @@
 					<tr>
 						<td class="width-35 active" style="text-align: right">项目名称：</td>
 						<td class="width-35">
-								${materialShow.projectName}
+								${nonPower.projectName}
 						</td>
 					</tr>
 					<tr>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerForm.js

@@ -0,0 +1,34 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	$(document).ready(function() {
+		jp.ajaxForm("#inputForm",function(data){
+			if(data.success){
+				jp.alert(data.msg);
+				jp.go("${ctx}"+ data.body.targetUrl);
+			}else{
+				jp.alert(data.msg);
+				$("#inputForm").find("button:submit").button("reset");
+			}
+		});
+
+
+		$('#acceptDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		$('#examineDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+		//富文本初始化
+		$('#reason').summernote({
+			height: 300,
+			lang: 'zh-CN',
+			callbacks: {
+				onChange: function(contents, $editable) {
+					$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+				}
+			}
+		});
+
+	})
+</script>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/nonPowerForm.jsp

@@ -0,0 +1,75 @@
+<%@ page pageEncoding="UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>土建模块项目发起流程</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="nonPowerForm.js" %>
+</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">
+                        <a class="panelButton" href="#" onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <form:form id="inputForm" modelAttribute="nonPower" action="${ctx}/nonPower/save" method="post"
+                               class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <form:hidden path="act.taskId"/>
+                        <form:hidden path="act.taskName"/>
+                        <form:hidden path="act.taskDefKey"/>
+                        <form:hidden path="act.procInsId"/>
+                        <form:hidden path="act.procDefId"/>
+                        <form:hidden id="flag" path="act.flag" />
+                        <div class="form-group text-center">
+                            <h3> 土建发起流程</h3>
+                        </div>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right"><font
+                                        color="red">*</font>选择项目：</label></td>
+                                <td class="width-35">
+                                        <%--			<sys:itemselect url="${ctx}/sg/managementcenter/project/materialDataPicking" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
+                                                                    title="选择项目号" cssClass="form-control required" fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="false"></sys:itemselect>
+                --%>
+                                    <sys:itemselect url="${ctx}/sg/managementcenter/project/materialDataPicking"
+                                                    id="projectId" name="projectId"
+                                                    value="${project.projectId}"
+                                                    labelName="project.projectId"
+                                                    labelValue="${project.projectId}"
+                                                    title="选择项目号" cssClass="form-control "
+                                                    fieldLabels="${fns:urlEncode('项目需求名称|项目定义号|项目名称')}"
+                                                    fieldKeys="reserveProjectName|projectId|projectName"
+                                                    searchLabels="${fns:urlEncode('储备项目名称')}|${fns:urlEncode('项目定义号')}|${fns:urlEncode('项目名称')}"
+                                                    searchKeys="reserveProjectName|projectId|projectName"
+                                                    isMultiSelected="false"/>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <div class="row">
+                            <div class="col-sm-3"></div>
+                            <div class="col-sm-6">
+                                <div class="form-group text-center">
+                                    <input id="contain" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                           value="提交"/>&nbsp;
+                                </div>
+                            </div>
+                        </div>
+                    </form:form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>