项目提交

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

@@ -418,11 +418,11 @@ public class ActProcessService extends BaseService {
 	@Transactional(readOnly = false)
 	public void deleteProcIns(String procInsId, String deleteReason) {
 		//根据流程实例ID查询项目需求名称（如果不为空）
-		String s = constructionService.idProjectName(procInsId);
+/*		String s = constructionService.idProjectName(procInsId);
 		if (s != null && s != "") {
 			String status = "0";
-			projectService.updateStatusBy(status, procInsId);
-		}
+//			projectService.updateStatusBy(status, procInsId);
+		}*/
 		//更具需求名称修改项目施工交底状态，为0
 		runtimeService.deleteProcessInstance(procInsId, deleteReason);
 	}

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

@@ -31,19 +31,12 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnel
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.service.PickingRequisitionService;
 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.service.MaterialModuleService;
-import com.jeeplus.modules.sg.picking.activiti.entity.PickList;
 import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.settActivi.service.SettActiviService;
-import com.jeeplus.modules.sys.entity.DictValue;
-import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.SystemService;
-import com.jeeplus.modules.sys.utils.DictUtils;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -76,7 +69,6 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import sun.util.calendar.BaseCalendar;
 
 /**
  * 流程个人任务相关Controller
@@ -149,11 +141,11 @@ public class ActTaskController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "todo/data")
     public Map<String, Object> todoListData(Act act, HttpServletRequest request, HttpServletResponse response, Model model, String xmName) throws Exception {
-/*		Page<HashMap<String,String>> page = actTaskService.todoList(new  Page<HashMap<String,String>>(request, response),act);
-		return getBootstrapData(page);*/
-        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, xmName);
-        Map<String, Object> map = new HashMap<String, Object>();
+        Page<HashMap<String, String>> page = actTaskService.todoList(new Page<HashMap<String, String>>(request, response), act);
         return getBootstrapData(page);
+/*        Page<HashMap<String, String>> page = actTaskService.newTodoList(new Page<HashMap<String, String>>(request, response), act, xmName);
+        Map<String, Object> map = new HashMap<String, Object>();
+        return getBootstrapData(page);*/
     }
 
     /**
@@ -458,12 +450,12 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && !"".equals(pic)) {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传新图纸");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.findUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
+//                uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
@@ -497,18 +489,16 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 项目经理人工任何问题
-     *
-     * @param act
+     * 交底:运行人员审核
      */
     @ResponseBody
-    @RequestMapping(value = "humanReviewTask")
-    public AjaxJson humanReviewTask(Act act) {
+    @RequestMapping(value = "humanReview")
+    public AjaxJson humanReview(Act act) {
         AjaxJson j = new AjaxJson();
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.humanReviewTask(act);
+            actTaskService.humanReview(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -517,17 +507,14 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 项目经理组织交底修改页面
-     *
-     * @param act
+     * 交底:项目经理交底内容
      */
     @ResponseBody
     @RequestMapping(value = "divideForm")
     public AjaxJson divideForm(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
-            act.setComment(comment);
+            act.setComment(URLDecoder.decode(act.getComment(), "UTF-8"));
             actTaskService.divideForm(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -569,11 +556,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传借款单据");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.findUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -618,11 +605,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("2");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.findUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -648,11 +635,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("3");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.findUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -677,11 +664,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("4");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.findUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -701,18 +688,9 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "operator")
-    public AjaxJson operator(Act act, String pic, UploadImages uploadImages) {
+    public AjaxJson operator(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && !"".equals(pic)) {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setuId(UserUtils.getUser().getName());
-                uploadImages.setImgName("1");
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.operator(act);
@@ -744,22 +722,13 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 设计单位人员提交文件
-     *
-     * @param act
+     * 运行单位经理审核方案
      */
     @ResponseBody
     @RequestMapping(value = "designUpload")
-    public AjaxJson designUpload(Act act, String pic, UploadImages uploadImages) {
+    public AjaxJson designUpload(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && pic != "") {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("变更后图纸");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                uploadImagesService.insert(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.designUpload(act);
@@ -771,15 +740,22 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 配网运行人员判断变更后材料
-     *
-     * @param act
+     * 设计单位人员重新设计
      */
     @ResponseBody
     @RequestMapping(value = "operatorUpload")
-    public AjaxJson operatorUpload(Act act) {
+    public AjaxJson operatorUpload(Act act, String path, String reserveProjectName) {
         AjaxJson j = new AjaxJson();
         try {
+            if (path != null && !"".equals(path)) {
+                UploadImages uploadImages = new UploadImages();
+                uploadImages.setPath(path);
+                uploadImages.setUid(UserUtils.getUser().getName());
+                uploadImages.setImgName("1");
+                uploadImages.setProcInsId(act.getProcInsId());
+                uploadImages.setReserveProjectName(reserveProjectName);
+                constructionService.uploadSave(uploadImages);
+            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.operatorUpload(act);
@@ -791,9 +767,7 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 配网项目经理判断变更后材料
-     *
-     * @param act
+     * 运行经理审核设计变更后
      */
     @ResponseBody
     @RequestMapping(value = "managerUpload")
@@ -802,7 +776,6 @@ public class ActTaskController extends BaseController {
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-
             actTaskService.managerUpload(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -813,6 +786,24 @@ public class ActTaskController extends BaseController {
 
 
     /**
+     * 配网经理审核设计变更后
+     */
+    @ResponseBody
+    @RequestMapping(value = "afterDistribution")
+    public AjaxJson afterDistribution(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.afterDistribution(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
      * 施工单位判断变更后材料
      *
      * @param act
@@ -834,8 +825,6 @@ public class ActTaskController extends BaseController {
 
     /**
      * 施工审批
-     *
-     * @param act
      */
     @ResponseBody
     @RequestMapping(value = "audit2")
@@ -853,7 +842,7 @@ public class ActTaskController extends BaseController {
                     discloseService.updateDiscloseByProcInsId(construction);
                 }
             }
-			actTaskService.auditSave2(act);
+            actTaskService.auditSave2(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -874,7 +863,7 @@ public class ActTaskController extends BaseController {
 //		MyNeedList 项目经理组织交底 = MyActiviUtils.findActivity("项目经理组织交底");
         boolean flag = false;
         Disclose dc = new Disclose();
-        dc.setProcInsId(act.getProcInsId());
+       /* dc.setProcInsId(act.getProcInsId());
         Disclose disclose = discloseService.get(dc);
         if (null == disclose) {
             j.setSuccess(false);
@@ -921,7 +910,7 @@ public class ActTaskController extends BaseController {
             actTaskService.auditSave3(act, disclose, flagDesign, flagItemCLose, flagDeal);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
-        }
+        }*/
         j.setMsg("审批成功");
         return j;
     }
@@ -1006,19 +995,19 @@ public class ActTaskController extends BaseController {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.addDepartment(act);
-            projectService.updateStatusBy("0", act.getProcInsId());
-            projectService.updateStatusByClose("1", act.getProcInsId());
+//            projectService.updateStatusBy("0", act.getProcInsId());
+//            projectService.updateStatusByClose("1", act.getProcInsId());
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
-        User user1 = UserUtils.getByUserName(user.getProjectManageRole());
+//        Project user = MyActiviUtils.findUser(act.getProcInsId());
+//        User user1 = UserUtils.getByUserName(user.getProjectManageRole());
         OaNotify oaNotify = new OaNotify();
         oaNotify.setType("4");
         oaNotify.setTitle("施工交底结束（项目关闭）");
         oaNotify.setContent("项目为:[" + construction.getProjectName() + "]的项目已经施工交底完成");
         oaNotify.setStatus("1");
-        oaNotify.setOaNotifyRecordIds(user1.getId());
+//        oaNotify.setOaNotifyRecordIds(user1.getId());
         oaNotifyService.save(oaNotify);
         List<OaNotifyRecord> list = oaNotify.getOaNotifyRecordList();
         for (OaNotifyRecord o : list) {
@@ -1027,7 +1016,7 @@ public class ActTaskController extends BaseController {
                     .getBean(ServletContext.class);
             new SystemInfoSocketHandler().sendMessageToUser(UserUtils.get(o.getUser().getId()).getLoginName(), "收到一条新通知，请到我的通知查看！");
         }
-        j.setMsg("审批成功;已经通知" + user.getProjectManageRole());
+//        j.setMsg("审批成功;已经通知" + user.getProjectManageRole());
         return j;
     }
 
@@ -1051,65 +1040,39 @@ public class ActTaskController extends BaseController {
         return j;
     }
 
-    /*
-        政策处理：施工单位人员上传未覆盖盖章
-     */
+    /***
+     * 项目经理判定是否关闭
+     * */
     @ResponseBody
-    @RequestMapping(value = "coveredTask")
-    public AjaxJson coveredTask(Act act, String pic, UploadImages uploadImages) {
+    @RequestMapping(value = "coveredForm")
+    public AjaxJson coveredForm(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && pic != "") {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("6");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.covered(act);
+            actTaskService.coveredForm(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        if ("yes".equals(act.getFlag())) {
-            j.setMsg("审批成功");
-        } else {
-            j.setMsg("驳回成功");
-        }
+        j.setMsg("审批成功");
         return j;
     }
 
-    /*
-        政策处理：施工单位人员上传盖章施工方案
+    /**
+     * 配网工程专职判定是否关闭
      */
     @ResponseBody
-    @RequestMapping(value = "sealTask")
-    public AjaxJson sealTask(Act act, String pic, UploadImages uploadImages) {
+    @RequestMapping(value = "sealForm")
+    public AjaxJson sealForm(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && pic != "") {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("7");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.seal(act);
+            actTaskService.sealForm(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        if ("yes".equals(act.getFlag())) {
-            j.setMsg("审批成功");
-        } else {
-            j.setMsg("驳回成功");
-        }
+        j.setMsg("审批成功");
         return j;
     }
 
@@ -1136,22 +1099,13 @@ public class ActTaskController extends BaseController {
         政策处理：配网政策处理专职 : 上传收据
      */
     @ResponseBody
-    @RequestMapping(value = "receiptTask")
-    public AjaxJson receiptTask(Act act, String pic, UploadImages uploadImages) {
+    @RequestMapping(value = "receiptForm")
+    public AjaxJson receiptForm(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && pic != "") {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("8");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.receiptTask(act);
+            actTaskService.receiptForm(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -1163,26 +1117,17 @@ public class ActTaskController extends BaseController {
         return j;
     }
 
-    /*
-        政策处理：配网政策处理专职 :上传缴费单
-     */
+    /**
+     * 配网工程专职判定变更或关闭
+     * */
     @ResponseBody
-    @RequestMapping(value = "singleTask")
-    public AjaxJson singleTask(Act act, String pic, UploadImages uploadImages) {
+    @RequestMapping(value = "singleForm")
+    public AjaxJson singleForm(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && pic != "") {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("9");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.singleTask(act);
+            actTaskService.singleForm(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -1190,26 +1135,36 @@ public class ActTaskController extends BaseController {
         return j;
     }
 
-    /*
-        政策处理：配网政策处理专职 :上传借款单据
-     */
+
+    /**
+     * 配网项目经理判定变更或关闭
+     * */
     @ResponseBody
-    @RequestMapping(value = "policyPay1Task")
-    public AjaxJson policyPay1Task(Act act, String pic, UploadImages uploadImages) {
+    @RequestMapping(value = "documentsForm")
+    public AjaxJson documentsForm(Act act) {
+        AjaxJson j = new AjaxJson();
+        try {
+            String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+            act.setComment(comment);
+            actTaskService.documentsForm(act);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        j.setMsg("审批成功");
+        return j;
+    }
+
+    /**
+     * 配网系统专职确认系统关闭
+     * */
+    @ResponseBody
+    @RequestMapping(value = "confirmClose")
+    public AjaxJson confirmClose(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            if (pic != null && !pic.equals("")) {
-                uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("5");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.findUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
-                uploadImagesService.save(uploadImages);
-            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
-            actTaskService.policy1Pay(act);
+            actTaskService.confirmClose(act);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
@@ -1491,15 +1446,15 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "reviewQuantityTask")
-    public AjaxJson reviewQuantityTask(Act act,String pic, UploadImages uploadImages) {
+    public AjaxJson reviewQuantityTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         if (pic != null && pic != "") {
             uploadImages.setPath(pic);
-            uploadImages.setProcInsId(act.getProcInsId());
+//            uploadImages.setProcInsId(act.getProcInsId());
             uploadImages.setImgName("21");
-            uploadImages.setuId(UserUtils.getUser().getName());
-            Project user = MyActiviUtils.findJSUser(act.getProcInsId());
-            uploadImages.setProjectId(user.getId());
+//            uploadImages.setuId(UserUtils.getUser().getName());
+//            Project user = MyActiviUtils.findJSUser(act.getProcInsId());
+//            uploadImages.setProjectId(user.getId());
             uploadImagesService.save(uploadImages);
         }
         actTaskService.reviewQuantity(act);
@@ -1522,13 +1477,22 @@ public class ActTaskController extends BaseController {
     }
 
     /**
-     * 运行人员审核图纸
+     * 经研所判定是否设计变更
      */
     @ResponseBody
     @RequestMapping(value = "auditDrawings")
-    public AjaxJson auditDrawings(Act act) {
+    public AjaxJson auditDrawings(Act act, String path, String reserveProjectName) {
         AjaxJson j = new AjaxJson();
         try {
+            if (path != null && !"".equals(path)) {
+                UploadImages uploadImages = new UploadImages();
+                uploadImages.setPath(path);
+                uploadImages.setUid(UserUtils.getUser().getName());
+                uploadImages.setImgName("1");
+                uploadImages.setProcInsId(act.getProcInsId());
+                uploadImages.setReserveProjectName(reserveProjectName);
+                constructionService.uploadSave(uploadImages);
+            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.auditDrawings(act);
@@ -1585,11 +1549,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("11");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1612,11 +1576,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("14");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1639,11 +1603,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("12");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1666,13 +1630,13 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                Project project = MyActiviUtils.sgFindUser(act.getProcInsId());
-                project.getId();
-                uploadImages.setProcInsId(act.getProcInsId());
+//                Project project1 = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                project1.getId();
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("15");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1752,11 +1716,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("16");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1817,11 +1781,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("13");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1905,16 +1869,16 @@ public class ActTaskController extends BaseController {
             //根据项目信息查询计划开工日期
             String projectName = materialModuleService.findProjectName(procInsId);
             Date specificTime = materialModuleService.findSpecificTime(projectName);
-            Project project = MyActiviUtils.sgFindUser(procInsId);
-            String[] needUser = {project.getConstructionUnitManage()};
-            List<String> listUserId = MyActiviUtils.getListUserId(needUser);
-            List<String> userId = materialModuleService.findUserId(listUserId);
-            String stringJoiningTogether = MyActiviUtils.getStringJoiningTogether(userId);
+//            Project project1 = MyActiviUtils.sgFindUser(procInsId);
+//            String[] needUser = {project1.getConstructionUnitManage()};
+//            List<String> listUserId = MyActiviUtils.getListUserId(needUser);
+//            List<String> userId = materialModuleService.findUserId(listUserId);
+//            String stringJoiningTogether = MyActiviUtils.getStringJoiningTogether(userId);
             OaNotify oaNotify = new OaNotify();
             oaNotify.setType("4");
             oaNotify.setTitle("施工验收流程项目计划信息");
             oaNotify.setStatus("1");
-            oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
+//            oaNotify.setOaNotifyRecordIds(stringJoiningTogether);
             if (specificTime == null) {
                 //根据流程实例id查询对应的项目信息（如果没有，发送通知，没有该项目计划信息）
                 oaNotify.setContent(projectName + "：项目没有对应的计划信息");
@@ -1942,11 +1906,11 @@ public class ActTaskController extends BaseController {
             }
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("17");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1969,11 +1933,11 @@ public class ActTaskController extends BaseController {
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
-                uploadImages.setProcInsId(act.getProcInsId());
+//                uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("18");
-                uploadImages.setuId(UserUtils.getUser().getName());
-                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
-                uploadImages.setProjectId(user.getId());
+//                uploadImages.setuId(UserUtils.getUser().getName());
+//                Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+//                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");

src/main/java/com/jeeplus/modules/oa/service/OaNotifyMaterialService.java

@@ -5,13 +5,8 @@ package com.jeeplus.modules.oa.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.modules.oa.entity.OaNotify;
 import com.jeeplus.modules.oa.entity.OaNotifyMaterial;
 import com.jeeplus.modules.oa.mapper.OaNotifyMaterialMapper;
-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.mapper.PickingRequisitionMapper;
-import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/jeeplus/modules/sg/advence/activiti/entity/Advance.java

@@ -2,8 +2,6 @@ package com.jeeplus.modules.sg.advence.activiti.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.ActEntity;
-import com.jeeplus.core.persistence.DataEntity;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 
 public class Advance extends ActEntity<Advance> {
     private static final long serialVersionUID = 1L;

src/main/java/com/jeeplus/modules/sg/advence/activiti/mapper/AdvanceMapper.java

@@ -6,10 +6,6 @@ package com.jeeplus.modules.sg.advence.activiti.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 请假表单MAPPER接口

src/main/java/com/jeeplus/modules/sg/advence/activiti/service/AdvanceService.java

@@ -4,15 +4,9 @@
 package com.jeeplus.modules.sg.advence.activiti.service;
 
 import java.util.List;
-import java.util.UUID;
 
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.mapper.AdvanceMapper;
-import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
-import io.swagger.models.auth.In;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/jeeplus/modules/sg/advence/activiti/web/AdvanceController.java

@@ -3,33 +3,20 @@
  */
 package com.jeeplus.modules.sg.advence.activiti.web;
 
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-
 import com.google.common.collect.Maps;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.advence.activiti.entity.Advance;
 import com.jeeplus.modules.sg.advence.activiti.service.AdvanceService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
-import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
-import com.jeeplus.modules.sg.managementcenter.project.util.ImportUtil;
-import com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.repository.ProcessDefinition;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -37,16 +24,11 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.json.AjaxJson;
-import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-
-import static com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo.getProjectUtilFlag;
 
 /**
  * 表单Controller
@@ -112,9 +94,9 @@ public class AdvanceController extends BaseController {
 	public String applicationAudit(PickApplication pickApplication, Model model) {
 		String id = pickApplication.getId();
 		String projectId = showListService.selectProjectId(id);
-		Project project = projectService.get(projectId);
+//		Project project1 = projectService.get(projectId);
 		model.addAttribute("pickApplication", pickApplication);
-		model.addAttribute("project", project);
+//		model.addAttribute("project", project1);
 		return "modules/sg/advence/activiti/constructionManager";
 	}
 	/**
@@ -156,8 +138,8 @@ public class AdvanceController extends BaseController {
 		}
 		if (flag) {
 			vars.put("noPass", true);
-			Project project = projectService.get(pickApplication.getProjectId());
-			vars.put("manager", UserUtils.getByUserName(project.getProjectManageRole()).getLoginName());
+//			Project project1 = projectService.get(pickApplication.getProjectId());
+//			vars.put("manager", UserUtils.getByUserName(project1.getProjectManageRole()).getLoginName());
 			j.setMsg("发起流程审批成功!");
 		}else {
 			vars.put("pass", true);

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ValidationUtils.java

@@ -1,7 +1,6 @@
 package com.jeeplus.modules.sg.financial.erpcredit.util;
 
 import com.jeeplus.modules.sg.audit.information.entity.Information;
-import com.jeeplus.modules.sg.audit.information.utils.RandomUtil;
 import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpCredit;
 import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpJudgeAccount;
 import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpJudgeArtificial;
@@ -9,13 +8,7 @@ import com.jeeplus.modules.sg.financial.erpcredit.entity.ErpJudgeExport;
 import com.jeeplus.modules.sg.financial.expense.entity.Expense;
 import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import io.swagger.models.auth.In;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -76,17 +69,17 @@ public class ValidationUtils {
         return "";
     }
     //验证需求基本信息
-    public static String getProjectJudge(List<ErpCredit> erpCredits, List<Project> projects){
+    public static String getProjectJudge(List<ErpCredit> erpCredits, List<Project> project1s){
         List<ErpJudgeAccount> list = new ArrayList<ErpJudgeAccount>();
         ErpJudgeAccount erpProject = new ErpJudgeAccount();
         boolean flag = true;
         for (ErpCredit erpCredit1:erpCredits){
             flag = true;
-            for (Project project:projects){
-                if (erpCredit1.getItemId().equals(project.getProjectNumber())){
+/*            for (Project project1 : project1s){
+                if (erpCredit1.getItemId().equals(project1.getProjectNumber())){
                     flag = false;
                 }
-            }
+            }*/
             if (flag){
                 erpProject = new ErpJudgeAccount();
                 erpProject.setItemId(erpCredit1.getItemId());
@@ -279,23 +272,23 @@ public class ValidationUtils {
     }
 
     //验证资本和成本
-    public static String getTheCostOfCapital(List<ErpCredit> erpCredits,List<Project> projects){
+    public static String getTheCostOfCapital(List<ErpCredit> erpCredits,List<Project> project1s){
         String type = "";
         String strFlag1 = "0";
         String strFlag2 = "0";
-        for (ErpCredit erpCredit:erpCredits){
-            for (Project project:projects){
-                if (erpCredit.getItemId().equals(project.getProjectNumber())){
-                    if (project.getType().equals("配网资本")){
+        /*for (ErpCredit erpCredit:erpCredits){
+            for (Project project1 : project1s){
+                if (erpCredit.getItemId().equals(project1.getProjectNumber())){
+                    if (project1.getType().equals("配网资本")){
                         strFlag1 = "1";
                     }
-                    if (project.getType().equals("配网成本")){
+                    if (project1.getType().equals("配网成本")){
                         strFlag2 = "1";
                     }
                     break;
                 }
             }
-        }
+        }*/
         if (strFlag1.equals("1")&&!strFlag2.equals("1")){
             return "1";//配网资本
         }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/web/ErpCreditController.java

@@ -11,7 +11,6 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.audit.information.service.InformationService;
-import com.jeeplus.modules.sg.audit.information.utils.RandomUtil;
 import com.jeeplus.modules.sg.financial.erpcredit.entity.*;
 import com.jeeplus.modules.sg.financial.erpcredit.service.ErpCreditService;
 import com.jeeplus.modules.sg.financial.erpcredit.util.*;
@@ -21,7 +20,6 @@ import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.financial.settlement.service.DataMaintenanceService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -295,8 +293,8 @@ public class ErpCreditController extends BaseController {
 
 
             //需求基本信息验证
-            List<Project> projects = projectService.findList(new Project());
-			String projectJudge = ValidationUtils.getProjectJudge(erpCredits, projects);
+            List<Project> project1s = projectService.findList(new Project());
+			String projectJudge = ValidationUtils.getProjectJudge(erpCredits, project1s);
             if (!"".equals(projectJudge)){
                 erpCreditService.getFtpList(request,projectJudge);
                 j.setSuccess(false);
@@ -305,7 +303,7 @@ public class ErpCreditController extends BaseController {
                 return j;
             }
             //项目资本和成本验证
-			String theCostOfCapital = ValidationUtils.getTheCostOfCapital(erpCredits, projects);
+			String theCostOfCapital = ValidationUtils.getTheCostOfCapital(erpCredits, project1s);
 			if (theCostOfCapital.equals("3")){
 				j.setSuccess(false);
 				j.setMsg("导入失败,项目不能同时存在资本和成本!");

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

@@ -1,6 +1,8 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Assignment;
+import com.jeeplus.modules.sg.managementcenter.project.entity.BasicInformation;
 import com.jeeplus.modules.sys.entity.User;
 
 import java.util.Date;
@@ -13,113 +15,26 @@ import java.util.List;
  */
 public class Construction extends ActEntity<Construction> {
     private static final long serialVersionUID = 1L;
-    private User tuser;		// 归属用户
-    private String procInsId;		// 流程实例编号
-    private String userName;		// 申请人
-    private String projectId;		// 项目号
-    private String projectName;		// 项目名称
-    private Date acceptDate;		// 接收图纸时间
-    private String examineDate;		// 备注说明
-    private String powerLine;
-    private String blackoutArea;
-    private String projectType;
-    private String powerFailure;
-    private String preliminaryJudgment;
-    private String civilEngineering;
-    private String baseType;
-    private String planApproval;
-    private String transformationType;
-    private String transformationEquipment;
-    private String newNamed;
-    private String putInto;
-    private String electricalConstruction;
-    private String theAssignment;
-    private String automation;
-    private String remote;
-    private String communicationMode;
-    private String inSitu;
-    private String networkCabinet;
-    private String station;
-    private String applyName;
-    //施工通道
-    private String channel;
-    //设备基础是否可以扩容
-    private String capacity;
-    //现场设备尺寸
-    private String sceneSize;
-    //最多可扩容尺寸
-    private String capacitySize;
-    //方案安全隐患
-    private String hiddenDanger;
-    //是否存在低压或通信线等影响施工
-    private String influenceConstruction;
-    //立项重复
-    private String projectRepetition;
-    //是否已实施
-    private String implemented;
-    //变压器无负荷
-    private String transformer;
-    //线路名称一致性
-    private String lineName;
-    //工程量是否一致
-    private String quantities;
-    //设备、开关、杆号一致性
-    private String rodNumber;
-    //政处类型
-    private String administrationType;
-    //政策处理类型回显问题
-    private List<String> administrationTypeList;
-    //是否存在严重政处问题（预判）
-    private String politicalProblem;
-    //前置条件
-    private String precondition;
-    //DTU安放方式核查
-    private String placementMode;
-    //核查环网柜生产日期
-    private String productionDate;
-    //二次是否是集成模块
-    private String integrateModule;
-    //PT是否需要更换
-    private String needReplace;
-    //设备是否有整体改造的必要
-    private String overallTransformation;
-    //
+    //储备项目暂定名称
+    private String reserveProjectName;
+    //项目定义
+    private String projectId;
+    //项目名称
+    private String projectName;
+    //项目基础信息表
+    private BasicInformation basicInformation;
+    //施工任务分配信息
+    private Assignment assignment;
+    //交底结论信息
     private Disclose disclose;
-    //记录需求提出单位
-    private String demandUnit;
 
-    public Disclose getDisclose() {
-        return disclose;
-    }
-
-    public void setDisclose(Disclose disclose) {
-        this.disclose = disclose;
-    }
-
-    public User getTuser() {
-        return tuser;
-    }
-
-    public void setTuser(User tuser) {
-        this.tuser = tuser;
-    }
-
-    @Override
-    public String getProcInsId() {
-        return procInsId;
-    }
-
-    @Override
-    public void setProcInsId(String procInsId) {
-        this.procInsId = procInsId;
-    }
 
-    public String getUserName() {
-        return userName;
+    public String getReserveProjectName() {
+        return reserveProjectName;
     }
 
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
     }
 
     public String getProjectId() {
@@ -138,363 +53,28 @@ public class Construction extends ActEntity<Construction> {
         this.projectName = projectName;
     }
 
-    public Date getAcceptDate() {
-        return acceptDate;
-    }
-
-    public void setAcceptDate(Date acceptDate) {
-        this.acceptDate = acceptDate;
-    }
-
-    public String getExamineDate() {
-        return examineDate;
-    }
-
-    public void setExamineDate(String examineDate) {
-        this.examineDate = examineDate;
-    }
-
-    public String getPowerLine() {
-        return powerLine;
-    }
-
-    public void setPowerLine(String powerLine) {
-        this.powerLine = powerLine;
-    }
-
-    public String getBlackoutArea() {
-        return blackoutArea;
-    }
-
-    public void setBlackoutArea(String blackoutArea) {
-        this.blackoutArea = blackoutArea;
-    }
-
-    public String getProjectType() {
-        return projectType;
-    }
-
-    public void setProjectType(String projectType) {
-        this.projectType = projectType;
-    }
-
-    public String getPowerFailure() {
-        return powerFailure;
-    }
-
-    public void setPowerFailure(String powerFailure) {
-        this.powerFailure = powerFailure;
-    }
-
-    public String getPreliminaryJudgment() {
-        return preliminaryJudgment;
-    }
-
-    public void setPreliminaryJudgment(String preliminaryJudgment) {
-        this.preliminaryJudgment = preliminaryJudgment;
-    }
-
-    public String getCivilEngineering() {
-        return civilEngineering;
-    }
-
-    public void setCivilEngineering(String civilEngineering) {
-        this.civilEngineering = civilEngineering;
-    }
-
-    public String getBaseType() {
-        return baseType;
-    }
-
-    public void setBaseType(String baseType) {
-        this.baseType = baseType;
-    }
-
-    public String getPlanApproval() {
-        return planApproval;
-    }
-
-    public void setPlanApproval(String planApproval) {
-        this.planApproval = planApproval;
-    }
-
-    public String getTransformationType() {
-        return transformationType;
-    }
-
-    public void setTransformationType(String transformationType) {
-        this.transformationType = transformationType;
-    }
-
-    public String getTransformationEquipment() {
-        return transformationEquipment;
-    }
-
-    public void setTransformationEquipment(String transformationEquipment) {
-        this.transformationEquipment = transformationEquipment;
-    }
-
-    public String getNewNamed() {
-        return newNamed;
-    }
-
-    public void setNewNamed(String newNamed) {
-        this.newNamed = newNamed;
-    }
-
-    public String getPutInto() {
-        return putInto;
-    }
-
-    public void setPutInto(String putInto) {
-        this.putInto = putInto;
-    }
-
-    public String getElectricalConstruction() {
-        return electricalConstruction;
-    }
-
-    public void setElectricalConstruction(String electricalConstruction) {
-        this.electricalConstruction = electricalConstruction;
-    }
-
-    public String getTheAssignment() {
-        return theAssignment;
-    }
-
-    public void setTheAssignment(String theAssignment) {
-        this.theAssignment = theAssignment;
-    }
-
-    public String getAutomation() {
-        return automation;
-    }
-
-    public void setAutomation(String automation) {
-        this.automation = automation;
-    }
-
-    public String getRemote() {
-        return remote;
-    }
-
-    public void setRemote(String remote) {
-        this.remote = remote;
-    }
-
-    public String getCommunicationMode() {
-        return communicationMode;
-    }
-
-    public void setCommunicationMode(String communicationMode) {
-        this.communicationMode = communicationMode;
-    }
-
-    public String getInSitu() {
-        return inSitu;
-    }
-
-    public void setInSitu(String inSitu) {
-        this.inSitu = inSitu;
+    public BasicInformation getBasicInformation() {
+        return basicInformation;
     }
 
-    public String getNetworkCabinet() {
-        return networkCabinet;
+    public void setBasicInformation(BasicInformation basicInformation) {
+        this.basicInformation = basicInformation;
     }
 
-    public void setNetworkCabinet(String networkCabinet) {
-        this.networkCabinet = networkCabinet;
+    public Assignment getAssignment() {
+        return assignment;
     }
 
-    public String getStation() {
-        return station;
+    public void setAssignment(Assignment assignment) {
+        this.assignment = assignment;
     }
 
-    public void setStation(String station) {
-        this.station = station;
-    }
-
-    public String getApplyName() {
-        return applyName;
-    }
-
-    public void setApplyName(String applyName) {
-        this.applyName = applyName;
-    }
-
-    public String getChannel() {
-        return channel;
-    }
-
-    public void setChannel(String channel) {
-        this.channel = channel;
-    }
-
-    public String getCapacity() {
-        return capacity;
-    }
-
-    public void setCapacity(String capacity) {
-        this.capacity = capacity;
-    }
-
-    public String getSceneSize() {
-        return sceneSize;
-    }
-
-    public void setSceneSize(String sceneSize) {
-        this.sceneSize = sceneSize;
-    }
-
-    public String getCapacitySize() {
-        return capacitySize;
-    }
-
-    public void setCapacitySize(String capacitySize) {
-        this.capacitySize = capacitySize;
-    }
-
-    public String getHiddenDanger() {
-        return hiddenDanger;
-    }
-
-    public void setHiddenDanger(String hiddenDanger) {
-        this.hiddenDanger = hiddenDanger;
-    }
-
-    public String getInfluenceConstruction() {
-        return influenceConstruction;
-    }
-
-    public void setInfluenceConstruction(String influenceConstruction) {
-        this.influenceConstruction = influenceConstruction;
-    }
-
-    public String getProjectRepetition() {
-        return projectRepetition;
-    }
-
-    public void setProjectRepetition(String projectRepetition) {
-        this.projectRepetition = projectRepetition;
-    }
-
-    public String getImplemented() {
-        return implemented;
-    }
-
-    public void setImplemented(String implemented) {
-        this.implemented = implemented;
-    }
-
-    public String getTransformer() {
-        return transformer;
-    }
-
-    public void setTransformer(String transformer) {
-        this.transformer = transformer;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getQuantities() {
-        return quantities;
-    }
-
-    public void setQuantities(String quantities) {
-        this.quantities = quantities;
-    }
-
-    public String getRodNumber() {
-        return rodNumber;
-    }
-
-    public void setRodNumber(String rodNumber) {
-        this.rodNumber = rodNumber;
-    }
-
-    public String getAdministrationType() {
-        return administrationType;
-    }
-
-    public void setAdministrationType(String administrationType) {
-        this.administrationType = administrationType;
-    }
-
-    public List<String> getAdministrationTypeList() {
-        return administrationTypeList;
-    }
-
-    public void setAdministrationTypeList(List<String> administrationTypeList) {
-        this.administrationTypeList = administrationTypeList;
-    }
-
-    public String getPoliticalProblem() {
-        return politicalProblem;
-    }
-
-    public void setPoliticalProblem(String politicalProblem) {
-        this.politicalProblem = politicalProblem;
-    }
-
-    public String getPrecondition() {
-        return precondition;
-    }
-
-    public void setPrecondition(String precondition) {
-        this.precondition = precondition;
-    }
-
-    public String getPlacementMode() {
-        return placementMode;
-    }
-
-    public void setPlacementMode(String placementMode) {
-        this.placementMode = placementMode;
-    }
-
-    public String getProductionDate() {
-        return productionDate;
-    }
-
-    public void setProductionDate(String productionDate) {
-        this.productionDate = productionDate;
-    }
-
-    public String getIntegrateModule() {
-        return integrateModule;
-    }
-
-    public void setIntegrateModule(String integrateModule) {
-        this.integrateModule = integrateModule;
-    }
-
-    public String getNeedReplace() {
-        return needReplace;
-    }
-
-    public void setNeedReplace(String needReplace) {
-        this.needReplace = needReplace;
-    }
-
-    public String getOverallTransformation() {
-        return overallTransformation;
-    }
-
-    public void setOverallTransformation(String overallTransformation) {
-        this.overallTransformation = overallTransformation;
+    public Disclose getDisclose() {
+        return disclose;
     }
 
-    public String getDemandUnit() {
-        return demandUnit;
+    public void setDisclose(Disclose disclose) {
+        this.disclose = disclose;
     }
 
-    public void setDemandUnit(String demandUnit) {
-        this.demandUnit = demandUnit;
-    }
 }

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

@@ -2,336 +2,225 @@ package com.jeeplus.modules.sg.managementcenter.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
 
-public class Disclose  extends ActEntity<Disclose> {
-    private static final long serialVersionUID = 1L;
-    //需求项目名称
-    private String requireName;
-    //工程编号
-    private String projectNumber;
-    //项目名称
-    private String projectName;
-    //项目定义号
-    private String projectId;
-    //项目信息id
-    private String conId;
-    //施工通道
-    private String channel;
-    //设备基础是否可以扩容
-    private String capacity;
-    //现场设备尺寸
-    private String sceneSize;
-    //最多可扩容尺寸
-    private String capacitySize;
-    //方案安全隐患
-    private String hiddenDanger;
-    //是否存在低压或通信线等影响施工
-    private String influenceConstruction;
-    //立项重复
-    private String projectRepetition;
+public class Disclose extends ActEntity<Disclose> {
     //是否已实施
-    private String implemented;
-    //变压器无负荷
-    private String transformer;
-    //必要性问题说明
-    private String explanationOfNecessity;
-    //线路名称一致性
-    private String lineName;
-    //工程量是否一致
-    private String quantities;
-    //设备、开关、杆号一致性
-    private String rodNumber;
-    //图纸现场不一致说明
-    private String inconsistentDescription;
-    //政处类型
-    private String administrationType;
-    //前置条件
-    private String precondition;
-    //政策处理说明
-    private String policyHandlingInstructions;
-    //DTU安放方式核查
-    private String placementMode;
-    //核查环网柜生产日期
-    private String productionDate;
-    //二次是否是集成模块
-    private String IntegrateModule;
-    //PT是否需要更换
-    private String needReplace;
-    //设备是否有整体改造的必要
-    private String overallTransformation;
-    //记录taskId
-    private String taskId;
-    //其它问题描述
-    private String otherProblem;
-    //已实施内容描述
-    private String implementedContent;
+    private String hasImplemented;
+    //现场情况描述
+    private String sceneDescription;
+    //是否有实施必要性
+    private String isImplement;
+    //实施无必要描述
+    private String noImplementation;
+    //图纸是否完整
+    private String whetherComplete;
+    //图纸完整性描述
+    private String drawingDescription;
+    //图纸是否规范
+    private String whetherStandard;
+    //图纸规范性描述
+    private String normativeDrawings;
+    //是否存在典设图问题
+    private String whetherDrawing;
+    //典设图问题描述
+    private String problemDescription;
+    //是否存在施工通道
+    private String whetherChannel;
+    //施工通道情况描述
+    private String constructionDescription;
+    //土建是否需要调整
+    private String civilAdjusted;
+    //土建方案变更内容描述
+    private String descriptionPlans;
+    //土建工作量调整内容描述
+    private String descriptionAdjustment;
+    //电气方案是否需要调整
+    private String electricalAdjusted;
+    //调整原因描述
+    private String adjustmentDescription;
+    //自动化是否需要变更
+    private String doesChange;
+    //自动化方案调整内容
+    private String automatedContent;
+    //自动化工作内容调整
+    private String automatedAdjustment;
+    //其他方案是否需要调整
+    private String otherAdjusted;
+    //其他方案调整原因描述
+    private String descriptionReasons;
 
-    public String getTaskId() {
-        return taskId;
+    public String getHasImplemented() {
+        return hasImplemented;
     }
 
-    public void setTaskId(String taskId) {
-        this.taskId = taskId;
+    public void setHasImplemented(String hasImplemented) {
+        this.hasImplemented = hasImplemented;
     }
 
-    public String getRequireName() {
-        return requireName;
+    public String getSceneDescription() {
+        return sceneDescription;
     }
 
-    public void setRequireName(String requireName) {
-        this.requireName = requireName;
+    public void setSceneDescription(String sceneDescription) {
+        this.sceneDescription = sceneDescription;
     }
 
-    public String getProjectNumber() {
-        return projectNumber;
+    public String getIsImplement() {
+        return isImplement;
     }
 
-    public void setProjectNumber(String projectNumber) {
-        this.projectNumber = projectNumber;
+    public void setIsImplement(String isImplement) {
+        this.isImplement = isImplement;
     }
 
-    public String getProjectName() {
-        return projectName;
+    public String getNoImplementation() {
+        return noImplementation;
     }
 
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
+    public void setNoImplementation(String noImplementation) {
+        this.noImplementation = noImplementation;
     }
 
-    public String getProjectId() {
-        return projectId;
+    public String getWhetherComplete() {
+        return whetherComplete;
     }
 
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
+    public void setWhetherComplete(String whetherComplete) {
+        this.whetherComplete = whetherComplete;
     }
 
-    public String getExplanationOfNecessity() {
-        return explanationOfNecessity;
+    public String getDrawingDescription() {
+        return drawingDescription;
     }
 
-    public void setExplanationOfNecessity(String explanationOfNecessity) {
-        this.explanationOfNecessity = explanationOfNecessity;
+    public void setDrawingDescription(String drawingDescription) {
+        this.drawingDescription = drawingDescription;
     }
 
-    public String getInconsistentDescription() {
-        return inconsistentDescription;
+    public String getWhetherStandard() {
+        return whetherStandard;
     }
 
-    public void setInconsistentDescription(String inconsistentDescription) {
-        this.inconsistentDescription = inconsistentDescription;
+    public void setWhetherStandard(String whetherStandard) {
+        this.whetherStandard = whetherStandard;
     }
 
-    public String getPolicyHandlingInstructions() {
-        return policyHandlingInstructions;
+    public String getNormativeDrawings() {
+        return normativeDrawings;
     }
 
-    public void setPolicyHandlingInstructions(String policyHandlingInstructions) {
-        this.policyHandlingInstructions = policyHandlingInstructions;
+    public void setNormativeDrawings(String normativeDrawings) {
+        this.normativeDrawings = normativeDrawings;
     }
 
-    public String getConId() {
-        return conId;
+    public String getWhetherDrawing() {
+        return whetherDrawing;
     }
 
-    public void setConId(String conId) {
-        this.conId = conId;
+    public void setWhetherDrawing(String whetherDrawing) {
+        this.whetherDrawing = whetherDrawing;
     }
 
-    public String getChannel() {
-        return channel;
+    public String getProblemDescription() {
+        return problemDescription;
     }
 
-    public void setChannel(String channel) {
-        this.channel = channel;
+    public void setProblemDescription(String problemDescription) {
+        this.problemDescription = problemDescription;
     }
 
-    public String getCapacity() {
-        return capacity;
+    public String getWhetherChannel() {
+        return whetherChannel;
     }
 
-    public void setCapacity(String capacity) {
-        this.capacity = capacity;
+    public void setWhetherChannel(String whetherChannel) {
+        this.whetherChannel = whetherChannel;
     }
 
-    public String getSceneSize() {
-        return sceneSize;
+    public String getConstructionDescription() {
+        return constructionDescription;
     }
 
-    public void setSceneSize(String sceneSize) {
-        this.sceneSize = sceneSize;
+    public void setConstructionDescription(String constructionDescription) {
+        this.constructionDescription = constructionDescription;
     }
 
-    public String getCapacitySize() {
-        return capacitySize;
+    public String getCivilAdjusted() {
+        return civilAdjusted;
     }
 
-    public void setCapacitySize(String capacitySize) {
-        this.capacitySize = capacitySize;
+    public void setCivilAdjusted(String civilAdjusted) {
+        this.civilAdjusted = civilAdjusted;
     }
 
-    public String getHiddenDanger() {
-        return hiddenDanger;
+    public String getDescriptionPlans() {
+        return descriptionPlans;
     }
 
-    public void setHiddenDanger(String hiddenDanger) {
-        this.hiddenDanger = hiddenDanger;
+    public void setDescriptionPlans(String descriptionPlans) {
+        this.descriptionPlans = descriptionPlans;
     }
 
-    public String getInfluenceConstruction() {
-        return influenceConstruction;
+    public String getDescriptionAdjustment() {
+        return descriptionAdjustment;
     }
 
-    public void setInfluenceConstruction(String influenceConstruction) {
-        this.influenceConstruction = influenceConstruction;
+    public void setDescriptionAdjustment(String descriptionAdjustment) {
+        this.descriptionAdjustment = descriptionAdjustment;
     }
 
-    public String getProjectRepetition() {
-        return projectRepetition;
+    public String getElectricalAdjusted() {
+        return electricalAdjusted;
     }
 
-    public void setProjectRepetition(String projectRepetition) {
-        this.projectRepetition = projectRepetition;
+    public void setElectricalAdjusted(String electricalAdjusted) {
+        this.electricalAdjusted = electricalAdjusted;
     }
 
-    public String getImplemented() {
-        return implemented;
+    public String getAdjustmentDescription() {
+        return adjustmentDescription;
     }
 
-    public void setImplemented(String implemented) {
-        this.implemented = implemented;
+    public void setAdjustmentDescription(String adjustmentDescription) {
+        this.adjustmentDescription = adjustmentDescription;
     }
 
-    public String getTransformer() {
-        return transformer;
+    public String getDoesChange() {
+        return doesChange;
     }
 
-    public void setTransformer(String transformer) {
-        this.transformer = transformer;
+    public void setDoesChange(String doesChange) {
+        this.doesChange = doesChange;
     }
 
-    public String getLineName() {
-        return lineName;
+    public String getAutomatedContent() {
+        return automatedContent;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public void setAutomatedContent(String automatedContent) {
+        this.automatedContent = automatedContent;
     }
 
-    public String getQuantities() {
-        return quantities;
+    public String getAutomatedAdjustment() {
+        return automatedAdjustment;
     }
 
-    public void setQuantities(String quantities) {
-        this.quantities = quantities;
+    public void setAutomatedAdjustment(String automatedAdjustment) {
+        this.automatedAdjustment = automatedAdjustment;
     }
 
-    public String getRodNumber() {
-        return rodNumber;
+    public String getOtherAdjusted() {
+        return otherAdjusted;
     }
 
-    public void setRodNumber(String rodNumber) {
-        this.rodNumber = rodNumber;
+    public void setOtherAdjusted(String otherAdjusted) {
+        this.otherAdjusted = otherAdjusted;
     }
 
-    public String getAdministrationType() {
-        return administrationType;
+    public String getDescriptionReasons() {
+        return descriptionReasons;
     }
 
-    public void setAdministrationType(String administrationType) {
-        this.administrationType = administrationType;
-    }
-
-
-    public String getPrecondition() {
-        return precondition;
-    }
-
-    public void setPrecondition(String precondition) {
-        this.precondition = precondition;
-    }
-
-    public String getPlacementMode() {
-        return placementMode;
-    }
-
-    public void setPlacementMode(String placementMode) {
-        this.placementMode = placementMode;
-    }
-
-    public String getProductionDate() {
-        return productionDate;
-    }
-
-    public void setProductionDate(String productionDate) {
-        this.productionDate = productionDate;
-    }
-
-    public String getIntegrateModule() {
-        return IntegrateModule;
-    }
-
-    public void setIntegrateModule(String integrateModule) {
-        IntegrateModule = integrateModule;
-    }
-
-    public String getNeedReplace() {
-        return needReplace;
-    }
-
-    public void setNeedReplace(String needReplace) {
-        this.needReplace = needReplace;
-    }
-
-    public String getOverallTransformation() {
-        return overallTransformation;
-    }
-
-    public void setOverallTransformation(String overallTransformation) {
-        this.overallTransformation = overallTransformation;
-    }
-
-    public String getOtherProblem() {
-        return otherProblem;
-    }
-
-    public void setOtherProblem(String otherProblem) {
-        this.otherProblem = otherProblem;
-    }
-
-    public String getImplementedContent() {
-        return implementedContent;
-    }
-
-    public void setImplementedContent(String implementedContent) {
-        this.implementedContent = implementedContent;
-    }
-
-    @Override
-    public String toString() {
-        return "Disclose{" +
-                "conId='" + conId + '\'' +
-                ", channel='" + channel + '\'' +
-                ", capacity='" + capacity + '\'' +
-                ", sceneSize='" + sceneSize + '\'' +
-                ", capacitySize='" + capacitySize + '\'' +
-                ", hiddenDanger='" + hiddenDanger + '\'' +
-                ", influenceConstruction='" + influenceConstruction + '\'' +
-                ", projectRepetition='" + projectRepetition + '\'' +
-                ", implemented='" + implemented + '\'' +
-                ", transformer='" + transformer + '\'' +
-                ", lineName='" + lineName + '\'' +
-                ", quantities='" + quantities + '\'' +
-                ", rodNumber='" + rodNumber + '\'' +
-                ", administrationType='" + administrationType + '\'' +
-                ", precondition='" + precondition + '\'' +
-                ", placementMode='" + placementMode + '\'' +
-                ", productionDate='" + productionDate + '\'' +
-                ", IntegrateModule='" + IntegrateModule + '\'' +
-                ", needReplace='" + needReplace + '\'' +
-                ", overallTransformation='" + overallTransformation + '\'' +
-                ", explanationOfNecessity='" + explanationOfNecessity + '\'' +
-                ", inconsistentDescription='" + inconsistentDescription + '\'' +
-                ", policyHandlingInstructions='" + policyHandlingInstructions + '\'' +
-                '}';
+    public void setDescriptionReasons(String descriptionReasons) {
+        this.descriptionReasons = descriptionReasons;
     }
 }

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

@@ -1,30 +1,20 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.core.persistence.DataEntity;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 
-public class UploadImages extends ActEntity<UploadImages> {
-    //附近用途
+public class UploadImages extends DataEntity<UploadImages> {
+    //附件用途
     private String imgName;
-    //上传地址
+    //路径
     private String path;
-    //流程定义号
+    //用户信息
+    private String uid;
+    //流程实例id
     private String procInsId;
-    private String uId;
-    //项目名称
-    private String projectName;
-    //项目id
-    private String projectId;
-
-    private Project project;
-
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
+    //项目信息
+    private String reserveProjectName;
 
     public String getImgName() {
         return imgName;
@@ -42,37 +32,27 @@ public class UploadImages extends ActEntity<UploadImages> {
         this.path = path;
     }
 
-    @Override
-    public String getProcInsId() {
-        return procInsId;
+    public String getUid() {
+        return uid;
     }
 
-    @Override
-    public void setProcInsId(String procInsId) {
-        this.procInsId = procInsId;
+    public void setUid(String uid) {
+        this.uid = uid;
     }
 
-    public String getuId() {
-        return uId;
-    }
-
-    public void setuId(String uId) {
-        this.uId = uId;
-    }
-
-    public String getProjectId() {
-        return projectId;
+    public String getProcInsId() {
+        return procInsId;
     }
 
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
     }
 
-    public Project getProject() {
-        return project;
+    public String getReserveProjectName() {
+        return reserveProjectName;
     }
 
-    public void setProject(Project project) {
-        this.project = project;
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
     }
 }

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

@@ -6,10 +6,10 @@ 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.project.entity.Project;
+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 com.jeeplus.modules.test.activiti.entity.OALeave;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,15 +34,41 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     void newSave(Construction construction);
 
-    void updateExamine(Construction construction);
+    //根据储备项目暂定名称修改项目状态
+    void updateStatus(Construction construction);
+
+    /**
+     * 根据流程定义修改项目关闭状态
+     */
+    void updateCloseStatus(String procInsId);
 
     //根据流程id查询项目的需求提出单位
     String demandUnit(String procInsId);
 
+    /**
+     * 修改交底结论
+     */
+    void replaceDisclose(List<Construction> constructionList);
+
+    /**
+     * 根据节点信息，登陆人信息获得所有流程定义号list，通过流程定义号查询所有项目信息
+     * */
+    List<Construction> findByProcInsId(List<Construction> constructionList);
+
+    /**
+     * 保存上传文件信息
+     */
+    void uploadSave(UploadImages uploadImages);
+
+    /**
+     * 上传文件数据
+     */
+    List<UploadImages> findUploadPage(UploadImages uploadImages);
+
     //根据流程定义号查询项目需求名称
     String idProjectName(@Param("procInsId") String procInsId);
 
-    Project findNameByInsID(String procInsId);
+    Project1 findNameByInsID(String procInsId);
 
     String idProjectName2(@Param("procInsId") String procInsId);
 
@@ -59,8 +85,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     List<String> insIdByName4(String projectName);
 
-    void insertDisclose(Construction construction);
-
     List<Construction> findDisclosePage(Construction construction);
 
     //根据用户名查询角色

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

@@ -3,55 +3,111 @@
 <mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper">
 
     <sql id="constructionColumns">
-		a.id AS "id",
+        a.id AS "id",
 		a.proc_ins_id AS "procInsId",
-		a.user_name AS "userName",
-		a.project_id AS "projectId",
-		a.project_name AS "projectName",
-		a.accept_date AS "acceptDate",
-		a.examine_date AS "examineDate",
+		a.reserveProjectName AS "reserveProjectName",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
-		a.del_flag AS "delFlag",
-		a.applyName
-	</sql>
+		a.del_flag AS "delFlag"
+    </sql>
 
-    <sql id="disclose">
-		d.conId AS "disclose.conId",
-		d.channel AS "disclose.channel",
-		d.capacity AS "disclose.capacity",
-		d.sceneSize AS "disclose.sceneSize",
-		d.capacitySize AS "disclose.capacitySize",
-		d.hiddenDanger AS "disclose.hiddenDanger",
-		d.influenceConstruction AS "disclose.influenceConstruction",
-		d.projectRepetition AS "disclose.projectRepetition",
-		d.implemented AS "disclose.implemented",
-		d.transformer AS "disclose.transformer",
-		d.lineName AS "disclose.lineName",
-		d.quantities AS "disclose.quantities",
-		d.rodNumber AS "disclose.rodNumber",
-		d.administrationType AS "disclose.administrationType",
-		d.precondition AS "disclose.precondition",
-		d.placementMode AS "disclose.placementMode",
-		d.productionDate AS "disclose.productionDate",
-		d.IntegrateModule AS "disclose.IntegrateModule",
-		d.needReplace AS "disclose.needReplace",
-		d.overallTransformation AS "disclose.overallTransformation",
-		d.explanationOfNecessity AS "disclose.explanationOfNecessity",
-		d.inconsistentDescription AS "disclose.inconsistentDescription",
-		d.policyHandlingInstructions AS "disclose.policyHandlingInstructions",
-		d.otherProblem AS "disclose.otherProblem",
-		d.implementedContent AS "disclose.implementedContent"
-	</sql>
+    <sql id="basicColumns">
+        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>
 
+    <sql id="projectColumns">
+        c.id as `id`,
+		c.reserveProjectName,
+		c.projectId,
+		c.projectName,
+        c.status,
+        c.acquisitionStatus,
+        c.constructionStatus,
+        c.whetherCloseStatus,
+        c.settStatus,
+        c.earlyMaterial,
+        c.preConstruction
+    </sql>
 
+    <sql id="discloseColumns">
+        d.hasImplemented as `disclose.hasImplemented`,
+		d.sceneDescription as `disclose.sceneDescription`,
+		d.isImplement as `disclose.isImplement`,
+		d.noImplementation as `disclose.noImplementation`,
+		d.whetherComplete as `disclose.whetherComplete`,
+		d.drawingDescription as `disclose.drawingDescription`,
+		d.whetherStandard as `disclose.whetherStandard`,
+		d.normativeDrawings as `disclose.normativeDrawings`,
+		d.whetherDrawing as `disclose.whetherDrawing`,
+		d.problemDescription as `disclose.problemDescription`,
+		d.whetherChannel as `disclose.whetherChannel`,
+		d.constructionDescription as `disclose.constructionDescription`,
+		d.civilAdjusted as `disclose.civilAdjusted`,
+		d.descriptionPlans as `disclose.descriptionPlans`,
+		d.descriptionAdjustment as `disclose.descriptionAdjustment`,
+		d.electricalAdjusted as `disclose.electricalAdjusted`,
+		d.adjustmentDescription as `disclose.adjustmentDescription`,
+		d.doesChange as `disclose.doesChange`,
+		d.automatedContent as `disclose.automatedContent`,
+		d.automatedAdjustment as `disclose.automatedAdjustment`,
+		d.otherAdjusted as `disclose.otherAdjusted`,
+		d.descriptionReasons as `disclose.descriptionReasons`
+    </sql>
+
+    <sql id="assignmentColumns">
+            g.reserveProjectName as `assignment.reserveProjectName`,
+            g.disclosureType as `assignment.disclosureType`,
+            g.projectReleaseBatch as `assignment.projectReleaseBatch`,
+            g.deliveryDate as `assignment.deliveryDate`,
+            g.packageNo as `assignment.packageNo`,
+            g.rate as `assignment.rate`,
+            g.assignedUnit as `assignment.assignedUnit`,
+            g.constructionUnit as `assignment.constructionUnit`,
+            g.constructionSubcontractor as `assignment.constructionSubcontractor`,
+            g.behalf as `assignment.behalf`,
+            g.constructionFullTime as `assignment.constructionFullTime`,
+            g.constructionTechnical as `assignment.constructionTechnical`,
+            g.constructionManage as `assignment.constructionManage`,
+            g.constructionLeader as `assignment.constructionLeader`,
+            g.subcontractingContact as `assignment.subcontractingContact`,
+            g.designer as `assignment.designer`,
+            g.designLeader as `assignment.designLeader`,
+            g.ownerManager as `assignment.ownerManager`,
+            g.distribution as `assignment.distribution`,
+            g.distributionFullTime as `assignment.distributionFullTime`,
+            g.distributionSystem as `assignment.distributionSystem`,
+            g.distributionPolicy as `assignment.distributionPolicy`,
+            g.centerLeader as `assignment.centerLeader`,
+            g.centerTechnical as `assignment.centerTechnical`,
+            g.instituteRole as `assignment.instituteRole`,
+            g.repUnit as `assignment.repUnit`,
+            g.inspectionUnit as `assignment.inspectionUnit`
+    </sql>
 
     <sql id="constructionJoins">
-		LEFT JOIN sys_user updateBy ON updateBy.id = a.update_by
-	</sql>
+        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"/>
@@ -60,43 +116,28 @@
     <select id="get" resultMap="ConstructionResult">
         SELECT
         <include refid="constructionColumns"/>,
-        b.demand_unit AS "demandUnit",
-		b.power_line AS "powerLine",
-		b.power_scope AS "blackoutArea",
-		b.project_type AS "projectType",
-		b.power_flag_package AS "powerFailure",
-		b.preliminary_judgment AS "preliminaryJudgment",
-		b.flag_civil_engineering AS "civilEngineering",
-		b.steel_tube_pole AS "baseType",
-		b.flag_approval_planning AS "planApproval",
-		b.equ_create_type AS "transformationType",
-		b.equ_create_size AS "transformationEquipment",
-		b.flag_new_equ_name AS "newNamed",
-		b.include_bdz_news AS "putInto",
-		b.flag_no_electrical AS "electricalConstruction",
-		b.drawings_work AS "theAssignment",
-		b.flag_automation AS "automation",
-		b.two_and_three_remote AS "remote",
-		b.phone_style AS "communicationMode",
-		b.stay_open_area AS "inSitu",
-		b.ring_network_cabinet AS "networkCabinet",
-		b.station_dtu AS "station",
-		b.status As "status",
-		<include refid="disclose"/>
-		FROM xm_construction_clarificaiton a
-		LEFT JOIN xm_project_details b on a.project_id=b.project_id
-		LEFT JOIN xm_disclose_conclusion d on a.proc_ins_id = d.proc_ins_id
-		WHERE a.id = #{id}
+        <include refid="basicColumns"/>,
+        c.projectId,
+        c.projectName,
+        <include refid="discloseColumns"/>
+        from xm_construction_clarificaiton a
+        LEFT JOIN xm_project_basicinformation b
+        on a.reserveProjectName = b.reserveProjectName
+        LEFT JOIN xm_material_project c
+        on a.reserveProjectName = c.reserveProjectName
+        LEFT JOIN xm_disclose_conclusion d
+        on a.proc_ins_id = d.proc_ins_id
+        WHERE a.id = #{id}
     </select>
 
     <select id="findList" resultMap="ConstructionResult">
         SELECT
         <include refid="constructionColumns"/>,
-        <include refid="disclose"/>
+        <include refid="discloseColumns"/>
         FROM xm_construction_clarificaiton a,xm_disclose_conclusion d
         <include refid="constructionJoins"/>
         <where>
-			a.proc_ins_id=b.proc_ins_id and
+            a.proc_ins_id=b.proc_ins_id and
             a.del_flag = #{DEL_FLAG_NORMAL}
             ${dataScope}
         </where>
@@ -130,303 +171,345 @@
     </select>
 
     <insert id="insert">
-		INSERT INTO xm_construction_clarificaiton(
-			id,
-			proc_ins_id,
-			user_name,
-			project_id,
-			project_name,
-			accept_date,
-			examine_date,
-			applyName,
-			create_by,
-			create_date,
-			update_by,
-			update_date,
-			remarks,
-			del_flag
-		) VALUES (
-			#{id},
-			#{procInsId},
-			#{userName},
-			#{projectId},
-			#{projectName},
-			#{acceptDate},
-			#{examineDate},
-			#{applyName},
-			#{createBy.id},
-			#{createDate},
-			#{updateBy.id},
-			#{updateDate},
-			#{remarks},
-			#{delFlag}
-		)
-	</insert>
+        INSERT INTO xm_construction_clarificaiton(id,
+                                                  proc_ins_id,
+                                                  create_by,
+                                                  create_date,
+                                                  update_by,
+                                                  update_date,
+                                                  remarks,
+                                                  del_flag)
+        VALUES (#{id},
+                #{procInsId},
+                #{userName},
+                #{projectId},
+                #{projectName},
+                #{acceptDate},
+                #{examineDate},
+                #{applyName},
+                #{createBy.id},
+                #{createDate},
+                #{updateBy.id},
+                #{updateDate},
+                #{remarks},
+                #{delFlag})
+    </insert>
 
     <update id="update">
-		UPDATE xm_construction_clarificaiton SET
-			proc_ins_id = #{procInsId},
-			user_name = #{userName},
-			project_id = #{projectId},
-			project_name = #{projectName},
-			applyName = #{applyName},
-			accept_date = #{acceptDate},
-			examine_date = #{examineDate},
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			remarks = #{remarks}
-		WHERE id = #{id}
-	</update>
+        UPDATE xm_construction_clarificaiton
+        SET proc_ins_id = #{procInsId},
+
+            update_by   = #{updateBy.id},
+            update_date = #{updateDate},
+            remarks     = #{remarks}
+        WHERE id = #{id}
+    </update>
 
     <update id="newUpdate">
-		UPDATE xm_construction_clarificaiton SET
-			powerLine = #{powerLine},
-			blackoutArea = #{blackoutArea},
-			projectType = #{projectType},
-			powerFailure = #{powerFailure},
-			preliminaryJudgment = #{preliminaryJudgment},
-			civilEngineering = #{civilEngineering},
-			baseType = #{baseType},
-			planApproval = #{planApproval},
-			transformationType = #{transformationType},
-			transformationEquipment = #{transformationEquipment},
-			newNamed = #{newNamed},
-			putInto = #{putInto},
-			electricalConstruction = #{electricalConstruction},
-			theAssignment = #{theAssignment},
-			automation = #{automation},
-			remote = #{remote},
-			communicationMode = #{communicationMode},
-			inSitu = #{inSitu},
-			networkCabinet = #{networkCabinet},
-			station = #{station}
-		WHERE id = #{id}
-	</update>
+        UPDATE xm_construction_clarificaiton
+        SET
+            reserveProjectName='1'
+        WHERE id = #{id}
+    </update>
 
     <!--物理删除-->
     <update id="delete">
-		DELETE FROM xm_construction_clarificaiton
-		WHERE id = #{id}
-	</update>
+        DELETE
+        FROM xm_construction_clarificaiton
+        WHERE id = #{id}
+    </update>
 
     <!--逻辑删除-->
     <update id="deleteByLogic">
-		UPDATE xm_construction_clarificaiton SET
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-	</update>
+        UPDATE xm_construction_clarificaiton
+        SET del_flag = #{DEL_FLAG_DELETE}
+        WHERE id = #{id}
+    </update>
 
 
     <!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
     <select id="findUniqueByProperty" resultType="OALeave" statementType="STATEMENT">
-		select * FROM xm_construction_clarificaiton  where ${propertyName} = '${value}'
-	</select>
+        select *
+        FROM xm_construction_clarificaiton
+        where ${propertyName} = '${value}'
+    </select>
+
+    <select id="queryPerson" resultType="com.jeeplus.modules.sys.entity.User">
+        SELECT *
+        FROM sys_user
+        where name = #{loginName}
+    </select>
+
+    <select id="nameFindOffice" resultType="string">
+        select name
+        from sys_role
+        where id in (select role_id
+                     from sys_user_role
+                     where user_id = (SELECT id from sys_user where login_name = #{loginName}))
+    </select>
+
+    <insert id="newSave">
+        INSERT INTO xm_construction_clarificaiton(id,
+                                                  proc_ins_id,
+                                                  create_by,
+                                                  create_date,
+                                                  update_by,
+                                                  update_date,
+                                                  remarks,
+                                                  del_flag,
+                                                  reserveProjectName)
+        VALUES (#{id},
+                #{procInsId},
+                #{createBy.id},
+                #{createDate},
+                #{updateBy.id},
+                #{updateDate},
+                #{remarks},
+                #{delFlag},
+                #{reserveProjectName})
+    </insert>
+
+    <update id="updateStatus">
+        update xm_material_project
+        set status = '1'
+        where reserveProjectName = #{reserveProjectName}
+    </update>
+    <select id="demandUnit" resultType="string">
+        select demand_unit
+        from xm_project_details
+        where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+    </select>
 
-	<select id="queryPerson" resultType="com.jeeplus.modules.sys.entity.User">
-		SELECT	* FROM sys_user where name = #{loginName}
-	</select>
+    <insert id="replaceDisclose">
+        replace into xm_disclose_conclusion
+            (
+             id,
+             create_by,
+             create_date,
+             update_by,
+             update_date,
+            remarks,
+             del_flag,
+             proc_ins_id,
+             hasImplemented,
+             sceneDescription,
+             isImplement,
+             noImplementation,
+             whetherComplete,
+             drawingDescription,
+             whetherStandard,
+             normativeDrawings,
+             whetherDrawing,
+             problemDescription,
+             whetherChannel,
+             constructionDescription,
+             civilAdjusted,
+             descriptionPlans,
+             descriptionAdjustment,
+             electricalAdjusted,
+             adjustmentDescription,
+             doesChange,
+             automatedContent,
+             automatedAdjustment,
+             otherAdjusted,
+             descriptionReasons
+            )values
+        <foreach collection="list" item="item" index="index" separator="," >
+        (
+            #{item.id},
+            #{item.createBy.id},
+            #{item.createDate},
+            #{item.updateBy.id},
+            #{item.updateDate},
+            #{item.remarks},
+            #{item.delFlag},
+            #{item.procInsId},
+            #{item.disclose.hasImplemented},
+            #{item.disclose.sceneDescription},
+            #{item.disclose.isImplement},
+            #{item.disclose.noImplementation},
+            #{item.disclose.whetherComplete},
+            #{item.disclose.drawingDescription},
+            #{item.disclose.whetherStandard},
+            #{item.disclose.normativeDrawings},
+            #{item.disclose.whetherDrawing},
+            #{item.disclose.problemDescription},
+            #{item.disclose.whetherChannel},
+            #{item.disclose.constructionDescription},
+            #{item.disclose.civilAdjusted},
+            #{item.disclose.descriptionPlans},
+            #{item.disclose.descriptionAdjustment},
+            #{item.disclose.electricalAdjusted},
+            #{item.disclose.adjustmentDescription},
+            #{item.disclose.doesChange},
+            #{item.disclose.automatedContent},
+            #{item.disclose.automatedAdjustment},
+            #{item.disclose.otherAdjusted},
+            #{item.disclose.descriptionReasons}
+        )
+        </foreach>
+    </insert>
+    <insert id="uploadSave">
+        INSERT INTO xm_upolad_images(
+            id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            remarks,
+            del_flag,
+            imgName,
+            path,
+            proc_ins_id,
+            uid,
+            reserveProjectName
+        ) VALUES (
+                     #{id},
+                     #{createBy.id},
+                     #{createDate},
+                     #{updateBy.id},
+                     #{updateDate},
+                     #{remarks},
+                     #{delFlag},
+                     #{imgName},
+                     #{path},
+                     #{procInsId},
+                     #{uid},
+                     #{reserveProjectName}
+                 )
+    </insert>
 
-	<select id="nameFindOffice" resultType="string">
-		select name from sys_role where id in (select role_id from sys_user_role where user_id = (SELECT id from sys_user where login_name = #{loginName}))
-	</select>
+    <select id="findByProcInsId" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
+        SELECT
+        <include refid="constructionColumns"/>,
+        <include refid="assignmentColumns"/>,
+        <include refid="discloseColumns"/>
+        from xm_construction_clarificaiton a
+        LEFT JOIN xm_project_assignment g
+        on a.reserveProjectName = g.reserveProjectName
+        LEFT JOIN xm_disclose_conclusion d
+        on a.proc_ins_id = d.proc_ins_id
+        where  a.proc_ins_id in
+        <foreach collection="list" open="(" close=")" index="item" item="item" separator=",">
+            #{item.procInsId}
+        </foreach>
+    </select>
 
-	<insert id="newSave">
-		INSERT INTO xm_construction_clarificaiton(
-			id,
-			proc_ins_id,
-			user_name,
-			project_id,
-			project_name,
-			accept_date,
-			examine_date,
-			applyName,
-			create_by,
-			create_date,
-			update_by,
-			update_date,
-			remarks,
-			del_flag
-		) VALUES (
-			#{id},
-			#{procInsId},
-			#{userName},
-			#{projectId},
-			#{projectName},
-			#{acceptDate},
-			#{examineDate},
-			#{applyName},
-			#{createBy.id},
-			#{createDate},
-			#{updateBy.id},
-			#{updateDate},
-			#{remarks},
-			#{delFlag}
-		)
-	</insert>
-	<update id="updateExamine">
-		UPDATE xm_construction_clarificaiton SET
-			examine_date = #{examineDate}
-		WHERE id = #{id}
-	</update>
-	<select id="demandUnit" resultType="string">
-		select demand_unit from xm_project_details where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
-	</select>
-	<!--根据流程定义号查询项目需求名称-->
-	<select id="idProjectName" resultType="string">
-		select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId};
-	</select>
-	<!--施工流程记录表根据流程定义号获取项目名称-->
-	<select id="idProjectName3" resultType="string">
-		select project_name from sg_construction_process where proc_ins_id = #{procInsId};
-	</select>
-	<select id="idProjectName4" resultType="java.lang.String">
-		select requireName	from xm_settlement_process where proc_ins_id = #{procInsId};
-	</select>
-	<select id="findNameByInsID" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
-		select id,require_name from xm_project_details where id =  (select project_id from md_picking_application where proc_ins_id  = #{id})
-	</select>
-	<select id="idProjectName2" resultType="string">
-		select require_name from xm_project_details where id  in(SELECT project_id from md_acquisition_process where proc_ins_id = #{procInsId})
-	</select>
-	<select id="insIdByName" resultType="java.lang.String">
-		select proc_ins_id from xm_construction_clarificaiton where project_name like concat('%',#{projectName},'%')
-	</select>
-	<select id="insIdByName2" resultType="java.lang.String">
-		select proc_ins_id from md_acquisition_process where project_id  in(select id from xm_project_details where require_name like concat('%',#{projectName},'%'))
-	</select>
-	<select id="insIdByName3" resultType="java.lang.String">
-		select proc_ins_id from sg_construction_process where project_name like concat('%',#{projectName},'%')
-	</select>
-	<select id="insIdByName4" resultType="java.lang.String">
-		select proc_ins_id from xm_settlement_process where requireName like concat('%',#{projectName},'%')
-	</select>
-	<insert id="insertDisclose">
-		replace into xm_disclose_conclusion
-		(
-		id,
-		create_by,
-		create_date,
-		update_by,
-		update_date,
-		remarks,
-		del_flag,
-		proc_ins_id,
-		projectId,
-		channel,
-		capacity,
-		sceneSize,
-		capacitySize,
-		hiddenDanger,
-		influenceConstruction,
-		projectRepetition,
-		implemented,
-		transformer,
-		lineName,
-		quantities,
-		rodNumber,
-		administrationType,
-		precondition,
-		placementMode,
-		productionDate,
-		IntegrateModule,
-		needReplace,
-		overallTransformation,
-		explanationOfNecessity,
-		inconsistentDescription,
-		policyHandlingInstructions,
-		otherProblem
-		) values (
-		#{id},
-		#{createBy.id},
-		#{createDate},
-		#{updateBy.id},
-		#{updateDate},
-		#{remarks},
-		#{delFlag},
-		#{procInsId},
-		#{projectId},
-		#{disclose.channel},
-		#{disclose.capacity},
-		#{disclose.sceneSize},
-		#{disclose.capacitySize},
-		#{disclose.hiddenDanger},
-		#{disclose.influenceConstruction},
-		#{disclose.projectRepetition},
-		#{disclose.implemented},
-		#{disclose.transformer},
-		#{disclose.lineName},
-		#{disclose.quantities},
-		#{disclose.rodNumber},
-		#{disclose.administrationType},
-		#{disclose.precondition},
-		#{disclose.placementMode},
-		#{disclose.productionDate},
-		#{disclose.IntegrateModule},
-		#{disclose.needReplace},
-		#{disclose.overallTransformation},
-		#{disclose.explanationOfNecessity},
-		#{disclose.inconsistentDescription},
-		#{disclose.policyHandlingInstructions},
-		#{disclose.otherProblem}
-		);
-	</insert>
+    <!--根据流程定义号查询项目需求名称-->
+    <select id="idProjectName" resultType="string">
+        select reserveProjectName
+        from xm_construction_clarificaiton
+        where proc_ins_id = #{procInsId};
+    </select>
+    <!--施工流程记录表根据流程定义号获取项目名称-->
+    <select id="idProjectName3" resultType="string">
+        select project_name
+        from sg_construction_process
+        where proc_ins_id = #{procInsId};
+    </select>
+    <select id="idProjectName4" resultType="java.lang.String">
+        select requireName
+        from xm_settlement_process
+        where proc_ins_id = #{procInsId};
+    </select>
+    <select id="findNameByInsID" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project1">
+        select id, require_name
+        from xm_project_details
+        where id = (select project_id from md_picking_application where proc_ins_id = #{id})
+    </select>
+    <select id="idProjectName2" resultType="string">
+        select require_name
+        from xm_project_details
+        where id in (SELECT project_id from md_acquisition_process where proc_ins_id = #{procInsId})
+    </select>
+    <select id="insIdByName" resultType="java.lang.String">
+        select proc_ins_id
+        from xm_construction_clarificaiton
+        where reserveProjectName like concat('%', #{projectName}, '%')
+    </select>
+    <select id="insIdByName2" resultType="java.lang.String">
+        select proc_ins_id
+        from md_acquisition_process
+        where project_id in (select id from xm_project_details where require_name like concat('%', #{projectName}, '%'))
+    </select>
+    <select id="insIdByName3" resultType="java.lang.String">
+        select proc_ins_id
+        from sg_construction_process
+        where project_name like concat('%', #{projectName}, '%')
+    </select>
+    <select id="insIdByName4" resultType="java.lang.String">
+        select proc_ins_id
+        from xm_settlement_process
+        where requireName like concat('%', #{projectName}, '%')
+    </select>
 
-	<select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
-		select a.project_id,
-		a.require_name as `disclose.requireName`,
-		b.channel as `disclose.channel`,
-		b.capacity as `disclose.capacity`,
-		b.sceneSize as `disclose.sceneSize`,
-		b.capacitySize as `disclose.capacitySize`,
-		b.hiddenDanger as `disclose.hiddenDanger`,
-		b.influenceConstruction as `disclose.influenceConstruction`,
-		b.projectRepetition as `disclose.projectRepetition`,
-		b.implemented as `disclose.implemented`,
-		b.transformer as `disclose.transformer`,
-		b.lineName as `disclose.lineName`,
-		b.quantities as `disclose.quantities`,
-		b.rodNumber as `disclose.rodNumber`,
-		b.administrationType as `disclose.administrationType`,
-		b.precondition as `disclose.precondition`,
-		b.placementMode as `disclose.placementMode`,
-		b.productionDate as `disclose.productionDate`,
-		b.IntegrateModule as `disclose.IntegrateModule`,
-		b.needReplace as `disclose.needReplace`,
-		b.overallTransformation as `disclose.overallTransformation`,
-		b.explanationOfNecessity as `disclose.explanationOfNecessity`,
-		b.inconsistentDescription as `disclose.inconsistentDescription`,
-		b.policyHandlingInstructions as `disclose.policyHandlingInstructions`,
-		b.otherProblem as `disclose.otherProblem`,
-		b.implementedContent as `disclose.implementedContent`
-		from xm_project_details a
-		LEFT JOIN xm_disclose_conclusion b
-		on a.require_name = b.requireName
-		<where>
-			1=1
-			<if test="projectId != null and projectId != ''">
-				and a.project_id = #{projectId}
-			</if>
-			<if test="disclose.requireName != null and disclose.requireName != ''">
-				and b.requireName = #{disclose.requireName}
-			</if>
-		</where>
-	</select>
+    <select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
+        select a.project_id,
+        a.require_name as `disclose.requireName`,
+        from xm_project_details a
+        LEFT JOIN xm_disclose_conclusion b
+        <where>
+            1=1
+            <if test="projectId != null and projectId != ''">
+                and a.project_id = #{projectId}
+            </if>
+            <if test="disclose.requireName != null and disclose.requireName != ''">
+                and b.requireName = #{disclose.requireName}
+            </if>
+        </where>
+    </select>
 
-	<select id="roleListByName" resultType="com.jeeplus.modules.sys.entity.Role">
-		select * from sys_role
-		where id in
-		(select role_id from sys_user_role
-			where user_id =(
-				select id from sys_user where name = #{name}
-			)
-		)
-	</select>
-	<update id="updateOIPI">
-		update xm_disclose_conclusion set
-		otherProblem = #{disclose.otherProblem},
-		inconsistentDescription = #{disclose.inconsistentDescription},
-		policyHandlingInstructions= #{disclose.policyHandlingInstructions},
-		implementedContent = #{disclose.implementedContent}
-		where proc_ins_id = #{procInsId};
-	</update>
+    <select id="roleListByName" resultType="com.jeeplus.modules.sys.entity.Role">
+        select *
+        from sys_role
+        where id in
+              (select role_id
+               from sys_user_role
+               where user_id = (
+                   select id
+                   from sys_user
+                   where name = #{name}
+               )
+              )
+    </select>
+    <select id="findUploadPage"
+            resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages">
+        select *
+        from xm_upolad_images
+        <where>
+            <if test="dataScope != null and dataScope != ''">
+                ${dataScope}
+            </if>
+          <if test="reserveProjectName != null and reserveProjectName != ''">
+              and reserveProjectName = #{reserveProjectName}
+          </if>
+            <if test="uid != null and uid != ''">
+                AND uid = #{uid}
+            </if>
+            <if test="imgName!=null and imgName!=''">
+                AND imgName = #{imgName}
+            </if>
+            <if test="procInsId!=null and procInsId!=''">
+                and proc_ins_id = #{procInsId}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+    <update id="updateOIPI">
+        update xm_disclose_conclusion
+        set create_date = now() where proc_ins_id = #{procInsId};
+    </update>
+    <update id="updateCloseStatus">
+        update xm_material_project
+        set whetherCloseStatus = '1'
+        where reserveProjectName =
+              (select reserveProjectName from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+    </update>
 </mapper>

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

@@ -6,13 +6,11 @@ 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.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.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.test.activiti.entity.OALeave;
-import com.jeeplus.modules.test.activiti.mapper.OALeaveMapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +49,17 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return page;
 	}
 
+	/**
+	 * 修改交底结论
+	 */
+	@Transactional(readOnly = false)
+	public void replaceDisclose(List<Construction> constructionList) {
+		for (Construction c :constructionList) {
+			c.preInsert();
+		}
+		constructionMapper.replaceDisclose(constructionList);
+	}
+
 	
 	@Transactional(readOnly = false)
 	public void save(Construction construction) {
@@ -78,15 +87,43 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return constructionMapper.nameFindOffice(loginName);
 	}
 
+	/**
+	 * 保存上传文件信息
+	 */
+	@Transactional(readOnly = false)
+	public void uploadSave(UploadImages uploadImages) {
+		uploadImages.preInsert();
+		constructionMapper.uploadSave(uploadImages);
+	}
+
+	/**
+	 * 文件数据显示列表
+	 * */
+	public Page<UploadImages> findUploadPage(Page<UploadImages> page, UploadImages uploadImages) {
+		dataRuleFilter(uploadImages);
+		uploadImages.setPage(page);
+		page.setList(constructionMapper.findUploadPage(uploadImages));
+		return page;
+	}
+
 	@Transactional(readOnly = false)
 	public void newSave(Construction construction) {
 		construction.preInsert();
 		constructionMapper.newSave(construction);
 	}
 
+	//根据储备项目暂定名称修改项目状态
 	@Transactional(readOnly = false)
-	public void updateExamine(Construction construction) {
-		constructionMapper.updateExamine(construction);
+	public void updateStatus(Construction construction) {
+		constructionMapper.updateStatus(construction);
+	}
+
+	/**
+	 * 根据流程定义修改项目关闭状态
+	 */
+	@Transactional(readOnly = false)
+	public void updateCloseStatus(String procInsId) {
+		constructionMapper.updateCloseStatus(procInsId);
 	}
 
 	//根据流程id查询项目的需求提出单位
@@ -94,6 +131,10 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return constructionMapper.demandUnit(procInsId);
 	}
 
+	public List<Construction> findByProcInsId(List<Construction> constructionList) {
+		return constructionMapper.findByProcInsId(constructionList);
+	}
+
 	//根据流程定义号查询项目需求名称
 	public String idProjectName(String procInsId) {
 		String s = constructionMapper.idProjectName(procInsId);
@@ -133,18 +174,10 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 	/**
 	 * 根据流程定义号查询提前物料申请流程的项目名称
 	 * */
-	public Project findNameByInsID(String procInsId) {
+	public Project1 findNameByInsID(String procInsId) {
 		return constructionMapper.findNameByInsID(procInsId);
 	}
 
-	/**
-	 * 新增施工交底
-	 * */
-	@Transactional(readOnly = false)
-	public void insertDisclose(Construction construction){
-		construction.preInsert();
-		constructionMapper.insertDisclose(construction);
-	}
 
 	/**
 	 * 项目经理更新

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

@@ -1,26 +1,15 @@
 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.materialmodule.activiti.service.MaterialModuleService;
 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 org.h2.util.New;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.access.method.P;
 
-import java.beans.Expression;
 import java.io.Serializable;
 import java.util.Map;
 
@@ -41,22 +30,22 @@ public class EndTaskListen implements Serializable, ExecutionListener {
             //获取流程定义号
             String processInstanceId = delegateExecution.getProcessInstanceId();
             //根据流程定义号获取项目信息
-            Project idConProc = projectService.findIdConProc(processInstanceId);
-            String id = idConProc.getId();
-            String constructionUnitManage = idConProc.getConstructionUnitManage();
+//            Project idConProc = projectService.findIdConProc(processInstanceId);
+//            String id = idConProc.getId();
+//            String constructionUnitManage = idConProc.getConstructionUnitManage();
             //获取项目第几次发起领料
-            String number = showListService.findNumber(id);
-            showList.setProjectId(id);
-            if (number == null || "".equals(number)) {
-                showList.setTheNumber("1");
-            } else {
-                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);
-            }
+//            String number = showListService.findNumber(id);
+//            showList.setProjectId(id);
+//            if (number == null || "".equals(number)) {
+//                showList.setTheNumber("1");
+//            } else {
+//                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);
+//            }
             //保存数据
             showListService.save(showList);
             String acqStatus = showListService.findAcqStatus(showList);
@@ -64,14 +53,14 @@ public class EndTaskListen implements Serializable, ExecutionListener {
                 showListService.updateAcqStatus(showList);
             }
             //根据流程定义号修改项目的施工交底状态
-            projectService.updateStatusBy("2", processInstanceId);
+//            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);
+//            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/MyActiviUtils.java

@@ -2,26 +2,20 @@ package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.core.persistence.Page;
-import com.jeeplus.modules.sg.audit.information.service.InformationService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
 import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper;
 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.picking.activiti.entity.ShowList;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
-import com.jeeplus.modules.sys.entity.DictType;
 import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.service.DictTypeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import freemarker.template.Configuration;
-import org.activiti.crystalball.simulator.SimulationRunContext;
 import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricActivityInstance;
-import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
 import org.activiti.engine.impl.javax.el.ExpressionFactory;
@@ -34,15 +28,9 @@ import org.activiti.engine.impl.pvm.PvmActivity;
 import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.impl.task.TaskDefinition;
-import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.Execution;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.Task;
-import org.activiti.engine.task.TaskQuery;
-import org.ehcache.core.spi.service.ExecutionService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -251,68 +239,80 @@ public class MyActiviUtils {
     /**
      * 根据流程实例定义号节点名称登陆人查询节点
      */
-    public List<FindTask> findActivity(String activityName) {
-
+    public static List<Construction> findActivity(String activityName) {
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         List<Task> list = processEngine.getTaskService().createTaskQuery().taskName(activityName).taskAssignee(UserUtils.getUser().getLoginName()).list();
-        List<FindTask> findTaskList = new ArrayList<>();
-        FindTask findTask;
-        String s = "";
+        List<Construction> constructionList = new ArrayList<>();
+        Construction construction;
         for (Task a : list) {
-            findTask = new FindTask();
-            String procInsId = a.getProcessInstanceId();
-            findTask.setPrInsId(procInsId);
-            findTask.setTaskId(a.getId());
-            s = constructionService.idProjectName(procInsId);
-            if (s == null || "".equals(s)) {
-                continue;
-            } else {
-                findTask.setProjectName(s);
-                findTaskList.add(findTask);
+            construction = new Construction();
+            construction.setProcInsId(a.getProcessInstanceId());
+            constructionList.add(construction);
+        }
+        List<Construction> byProcInsId = constructionService.findByProcInsId(constructionList);
+        for (Construction c :
+                byProcInsId) {
+            for (Task a : list) {
+                if (a.getProcessInstanceId().equals(c.getAct().getProcInsId())) {
+                    c.getAct().setTaskId(a.getId());
+                }
             }
         }
-        return findTaskList;
+        return byProcInsId;
     }
 
     /**
-     * 根据项目名称查询人员
-     */
+     * 通过流程定实例id查询项目流转人员信息
+     * */
     public static Project findUser(String procInsId) {
         Project user = projectService.findUser(procInsId);
         return user;
     }
 
     /**
-     * 施工流程根据项目名称查询人员
+     * 通过流程定义号查询需求单位
      */
+    public static String demandByProcInsId(String procInsId) {
+        String demandUnit = projectService.demandByProcInsId(procInsId);
+        return demandUnit;
+    }
+
+/*    *//**
+     * 根据项目名称查询人员
+     *//*
+
+
+    *//**
+     * 施工流程根据项目名称查询人员
+     *//*
     public static Project sgFindUser(String procInsId) {
         Project user = projectService.sgFindUser(procInsId);
         return user;
     }
 
-    /**
+    *//**
      * 根据流程实例id称查询物资流程项目人员
-     */
+     *//*
     public static Project findWZUser(String procInsId) {
         Project user = projectService.findWZUser(procInsId);
         return user;
     }
 
-    /**
+    *//**
      * 根据流程实例id查询结算流程项目人员
-     */
+     *//*
     public static Project findJSUser(String procInsId) {
         Project user = projectService.findJSUser(procInsId);
         return user;
     }
 
-    /**
+    *//**
      * 根据项目id称查询人员
-     */
+     *//*
     public static Project findUserById(String projectId) {
         Project user = projectService.findUserById(projectId);
         return user;
-    }
+    }*/
 
     /**
      * 查询项目现在配置模块版本号

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

@@ -1,7 +1,6 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
 import com.google.common.collect.Maps;
-import com.google.gson.internal.$Gson$Preconditions;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
@@ -21,176 +20,115 @@ import java.util.List;
 import java.util.Map;
 
 public class MyImportUtils {
-    public static Map<String,Object> errorTips(List<Disclose> discloses) {
+    public static Map<String, Object> errorTips(List<Construction> constructionList) {
         String tips = "";
         String fin = "";
-        List<Disclose> newDiscloseList = new ArrayList<>();
+        List<Construction> newConList = new ArrayList<>();
         boolean flag = false;
-
-        for (Disclose disclose : discloses) {
-            flag = false;
-            tips = "";
-            //项目名称
-            String projectName = disclose.getRequireName();
-            //设备基础是否可以扩容
-            String capacity = disclose.getCapacity();
-            //现场设备尺寸
-            String sceneSize = disclose.getSceneSize();
-            //最多可扩容尺寸
-            String capacitySize = disclose.getCapacitySize();
-            //方案安全隐患
-            String hiddenDanger = disclose.getHiddenDanger();
-            //是否存在低压或通信线等影响施工
-            String influenceConstruction = disclose.getInfluenceConstruction();
-            //立项重复
-            String projectRepetition = disclose.getProjectRepetition();
-            //是否已实施
-            String implemented = disclose.getImplemented();
-            //变压器无负荷
-            String transformer = disclose.getTransformer();
-            //必要性问题说明
-            String explanationOfNecessity = disclose.getExplanationOfNecessity();
-            //线路名称一致性
-            String lineName = disclose.getLineName();
-            //工程量是否一致
-            String quantities = disclose.getQuantities();
-            //设备、开关、杆号一致性
-            String rodNumber = disclose.getRodNumber();
-            //图纸现场不一致说明
-            String inconsistentDescription = disclose.getInconsistentDescription();
-            //政处类型
-            String administrationType = disclose.getAdministrationType();
-            //前置条件
-            String precondition = disclose.getPrecondition();
-            //政策处理说明
-            String policyHandlingInstructions = disclose.getPolicyHandlingInstructions();
-            //二次是否是集成模块
-            String integrateModule = disclose.getIntegrateModule();
-            //PT是否需要更换
-            String needReplace = disclose.getNeedReplace();
-            //设备是否有整体改造的必要
-            String overallTransformation = disclose.getOverallTransformation();
-            if (precondition!=null&&!"".equals(precondition)) {
-            }else {
-                if ("".equals(projectName) || projectName == null) {
-                    flag = true;
-                    tips +="项目名称不能为空";
-                }
-                if ("".equals(capacity) || capacity == null||(!"有".equals(capacity)&&!"无".equals(capacity))) {
-                    flag = true;
-                    tips += "有无设备基础改造填写有误";
-                }
-                if("有".equals(capacity)){
-                    if("".equals(sceneSize) || sceneSize == null||"".equals(capacitySize) || capacitySize == null){
-                        tips += "原设备尺寸|现场是否具备扩宽的条件 填写有误";
-                    }
-                }
-                if ("".equals(hiddenDanger) || hiddenDanger == null||(!"有".equals(hiddenDanger)&&!"无".equals(hiddenDanger))) {
-                    flag = true;
-                    tips += "方案安全隐患填写有误";
-                }
-                if ("".equals(influenceConstruction) || influenceConstruction == null||(!"是".equals(influenceConstruction)&&!"否".equals(influenceConstruction))) {
+        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();
+            if ("是".equals(hasImplemented)) {
+                if (empty(sceneDescription)) {
                     flag = true;
-                    tips += "是否存在低压或通信线等影响施工填写有误";
+                    tips +="现场情况描述有误\t";
                 }
-                if ("".equals(projectRepetition) || projectRepetition == null||(!"是".equals(projectRepetition)&&!"否".equals(projectRepetition))) {
-                    flag = true;
-                    tips += "立项重复填写有误";
-                }
-                if ("".equals(implemented) || implemented == null||(!"是".equals(implemented)&&!"否".equals(implemented))) {
+            }
+            if ("否".equals(isImplement)) {
+                if (empty(noImplementation)) {
                     flag = true;
-                    tips += "是否已实施填写有误";
+                    tips +="实施无必要描述有误\t";
                 }
-                if ("".equals(transformer) || transformer == null||(!"有".equals(transformer)&&!"无".equals(transformer))) {
+            }
+            if ("否".equals(whetherComplete)) {
+                if (empty(drawingDescription)) {
                     flag = true;
-                    tips += "变压器无负荷填写有误";
+                    tips +="图纸完整性描述有误\t";
                 }
-                if ("有".equals(hiddenDanger) || "是".equals(influenceConstruction)|| "是".equals(projectRepetition)|| "是".equals(implemented)|| "无".equals(transformer)) {
-                    if ("".equals(explanationOfNecessity) || explanationOfNecessity == null) {
-                        flag = true;
-                        tips += "必要性问题说明不能为空";
-                    }
-                }
-                if ("".equals(lineName) || lineName == null||(!"一致".equals(lineName)&&!"不一致".equals(lineName))) {
+            }
+            if ("否".equals(whetherStandard)) {
+                if (empty(normativeDrawings)) {
                     flag = true;
-                    tips += "线路名称、设备、开关、杆号一致性填写有误";
+                    tips +="图纸规范性描述有误\t";
                 }
-                if ("".equals(quantities) || quantities == null||(!"是".equals(quantities)&&!"否".equals(quantities))) {
+            }
+            if ("是".equals(whetherDrawing)) {
+                if (empty(problemDescription)) {
                     flag = true;
-                    tips += "工程量是否一致填写有误";
-                }
-                if ("不一致".equals(lineName)||"否".equals(quantities)||"不一致".equals(rodNumber)) {
-                    if ("".equals(inconsistentDescription) || inconsistentDescription == null) {
-                        flag = true;
-                        tips += "图纸现场不一致说明不能为空";
-                    }
+                    tips +="典设图问题描述有误\t";
                 }
-                if ("".equals(administrationType) || administrationType == null
-                        ||(!"1.无".equals(administrationType)
-                            &&!"2.农村政处".equals(administrationType)
-                            &&!"3.民事政处/行政政处（公路/水利）".equals(administrationType)
-                            &&!"4.行政政处（城区道路）".equals(administrationType)
-                            &&!"5.农村政处;民事政处/行政政处（公路/水利）".equals(administrationType)
-                            &&!"6.农村政处;行政政处（城区道路）".equals(administrationType)
-                            &&!"7.民事政处/行政政处（公路/水利）;行政政处（城区道路）".equals(administrationType)
-                            &&!"8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）".equals(administrationType)
-                        )
-                ) {
+            }
+            if ("是".equals(whetherChannel)) {
+                if (empty(constructionDescription)) {
                     flag = true;
-                    tips += "政处类型填写有误";
-                }else {
-                    if (("2.农村政处".equals(administrationType)
-                            ||"3.民事政处/行政政处（公路/水利）".equals(administrationType)
-                            ||"4.行政政处（城区道路）".equals(administrationType)
-                            ||"5.农村政处;民事政处/行政政处（公路/水利）".equals(administrationType)
-                            ||"6.农村政处;行政政处（城区道路）".equals(administrationType)
-                            ||"7.民事政处/行政政处（公路/水利）;行政政处（城区道路）".equals(administrationType)
-                            ||"8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）".equals(administrationType)
-                        )) {
-                        if ("".equals(policyHandlingInstructions) || policyHandlingInstructions == null) {
-                            flag = true;
-                            tips += "政策处理说明不能为空";
-                        }
-                    }
+                    tips +="施工通道情况描述有误\t";
                 }
-                if ("".equals(disclose.getPlacementMode())||disclose.getPlacementMode() == null||(!"户外".equals(disclose.getPlacementMode())&&!"户内".equals(disclose.getPlacementMode())&&!"无".equals(disclose.getPlacementMode()))){
+            }
+            if ("是".equals(civilAdjusted)) {
+                if (empty(descriptionPlans) || empty(descriptionAdjustment)) {
                     flag = true;
-                    tips+="DTU安放方式核查填写有误";
+                    tips +="土建方案变更内容描述或土建工作量调整内容描述有误\t";
                 }
-                if ("".equals(integrateModule) || integrateModule == null||(!"是".equals(integrateModule)&&!"否".equals(integrateModule))) {
+            }
+            if ("是".equals(electricalAdjusted)) {
+                if (empty(adjustmentDescription)) {
                     flag = true;
-                    tips += "二次是否是集成模块填写有误";
+                    tips +="调整原因描述有误\t";
                 }
-                if ("".equals(needReplace) || needReplace == null||(!"是".equals(needReplace)&&!"否".equals(needReplace))) {
+            }
+            if ("是".equals(doesChange)) {
+                if (empty(automatedContent) || empty(automatedAdjustment)) {
                     flag = true;
-                    tips += "PT是否需要更换填写有误";
+                    tips +="自动化方案调整内容或自动化工作内容调整有误\t";
                 }
-                if ("".equals(overallTransformation) || overallTransformation == null||(!"是".equals(overallTransformation)&&!"否".equals(overallTransformation))) {
+            }
+            if ("是".equals(otherAdjusted)) {
+                if (empty(descriptionReasons) || empty(descriptionReasons)) {
                     flag = true;
-                    tips += "设备是否有整体改造的必要填写有误";
-                }
-                if ("户外".equals(disclose.getPlacementMode())||"户内".equals(disclose.getPlacementMode())){
-                    if ("".equals(disclose.getProductionDate())||disclose.getProductionDate() == null){
-                        tips +="核查环网柜生产日期不能为空;";
-                    }
+                    tips +="其他方案调整原因描述有误\t";
                 }
             }
             if (flag == true) {
-                fin += "<" + projectName + ">" + ":" + tips + "</br>";
+                fin += "<" + c.getReserveProjectName() + ">" + ":" + tips + "</br>";
             } else {
-                newDiscloseList.add(disclose);
+                newConList.add(c);
             }
         }
-        Map<String,Object> reurnMap = new HashMap<>();
-        reurnMap.put("fin",fin);
-        reurnMap.put("newDiscloseList",newDiscloseList);
-        return reurnMap;
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("fin", fin);
+        returnMap.put("newConList", newConList);
+        return returnMap;
+    }
+
+    private static boolean empty(String sceneDescription) {
+        return "".equals(sceneDescription) || sceneDescription == null;
     }
 
     //则现场设备尺寸、最多可扩容尺寸需填写，且默认单位为米
-    public static Construction getAddUnit(Construction construction){
+    public static Construction getAddUnit(Construction construction) {
         String size = "";
-        if (null!=construction.getDisclose()){
+        /*if (null!=construction.getDisclose()){
             size = construction.getDisclose().getSceneSize();
             if (null!=size&&!"".equals(size)){
                 if (!size.contains("米")){
@@ -203,78 +141,55 @@ public class MyImportUtils {
                     construction.getDisclose().setCapacitySize(size+"米");
                 }
             }
-        }
+        }*/
         return construction;
     }
+
     //人工审核：回显
-    public static void getTheEcho(Construction construction, Model model){
-        //前置条件
-        if ((null!=construction.getDisclose().getPrecondition()&&!"".equals(construction.getDisclose().getPrecondition()))//前置条件
-                //施工通道
-                ||(null!=construction.getDisclose().getChannel()&&!"".equals(construction.getDisclose().getChannel())&&!"无".equals(construction.getDisclose().getChannel()))
-                //其它问题描述
-                ||(null!=construction.getDisclose().getOtherProblem()&&!"".equals(construction.getDisclose().getOtherProblem()))
-        ){
-            model.addAttribute("pass_construction6","0");
-        }else {
-            if ("有".equals(construction.getDisclose().getHiddenDanger())||//方案安全隐患
-                    "是".equals(construction.getDisclose().getInfluenceConstruction())||//是否存在低压或通信线等影响施工
-                    "是".equals(construction.getDisclose().getProjectRepetition())||//立项重复
-                    "是".equals(construction.getDisclose().getImplemented())||//是否已经实施
-                    "无".equals(construction.getDisclose().getTransformer())){//变压器无负荷
-                model.addAttribute("pass_construction1","0");
-            }else {
-                //设计变更
-                if (null!=construction.getDisclose().getInconsistentDescription()&&!"".equals(construction.getDisclose().getInconsistentDescription())){//图纸现场不一致说明
-                    if ("否".equals(construction.getDisclose().getLineName())||//线路名称一致性
-                            "否".equals(construction.getDisclose().getQuantities())||//工程量是否一致
-                            !"".equals(construction.getDisclose().getImplementedContent())){//已实施内容描述不为空
-                        model.addAttribute("pass_construction2","0");
-                    }else {
-                        if (construction.getDisclose().getAdministrationType().contains("无")){//政处类型
-                            model.addAttribute("pass_construction7","0");
-                        }
-                    }
-                }else {
-                    if (construction.getDisclose().getAdministrationType().contains("无")){//政处类型
-                        model.addAttribute("pass_construction7","0");
-                    }
-                }
-                getAdministrationTypeView(construction.getDisclose().getAdministrationType(),model);
-//                //农村政处
-//                if (construction.getDisclose().getAdministrationType().equals("1.农村政处")){
-//                    model.addAttribute("pass_construction3","0");
-//                }
-//                //2.民事政处/行政政处（公路/水利）
-//                if (construction.getDisclose().getAdministrationType().equals("2.民事政处/行政政处（公路/水利）")){
-//                    model.addAttribute("pass_construction4","0");
-//                }
-//                //3.行政政处（城区道路）
-//                if (construction.getDisclose().getAdministrationType().equals("3.行政政处（城区道路）")){
-//                    model.addAttribute("pass_construction5","0");
-//                }
+    public static void getTheEcho(Construction construction, Model model) {
+        Disclose disclose = construction.getDisclose();
+        String hasImplemented = disclose.getHasImplemented();
+        String isImplement = disclose.getIsImplement();
+        String whetherComplete = disclose.getWhetherComplete();
+        String whetherStandard = disclose.getWhetherStandard();
+        String whetherDrawing = disclose.getWhetherDrawing();
+        String whetherChannel = disclose.getWhetherChannel();
+        String civilAdjusted = disclose.getCivilAdjusted();
+        String electricalAdjusted = disclose.getElectricalAdjusted();
+        String doesChange = disclose.getDoesChange();
+        String otherAdjusted = disclose.getOtherAdjusted();
+
+        if ("否".equals(hasImplemented) && "是".equals(isImplement) && "是".equals(whetherComplete) && "是".equals(whetherStandard) && "否".equals(whetherDrawing) && "否".equals(whetherChannel) && "否".equals(civilAdjusted) && "否".equals(electricalAdjusted) && "否".equals(doesChange) && "否".equals(otherAdjusted)) {
+            model.addAttribute("noProblem", true);
+        } else {
+            if ("是".equals(hasImplemented) || "否".equals(isImplement)) {
+                model.addAttribute("closed", true);
+            } else if ("否".equals(whetherComplete) || "否".equals(whetherStandard) || "是".equals(whetherDrawing) || "是".equals(whetherChannel) || "是".equals(civilAdjusted) || "是".equals(electricalAdjusted) || "是".equals(doesChange) || "是".equals(otherAdjusted)) {
+                model.addAttribute("design", true);
             }
         }
     }
+
     //政策处理类型判断
-    public static void getAdministrationTypeView(String administrationType,Model model){
-        if (administrationType.length()>0){
+    public static void getAdministrationTypeView(String administrationType, Model model) {
+        if (administrationType.length() > 0) {
             String[] split = administrationType.split(";");
-            for (String str:split){
-                if (str.contains("农村政处")){
-                    model.addAttribute("pass_construction3","0");
+            for (String str : split) {
+                if (str.contains("农村政处")) {
+                    model.addAttribute("pass_construction3", "0");
                 }
                 //2.民事政处/行政政处（公路/水利）
-                if (str.contains("民事政处/行政政处（公路/水利）")){
-                    model.addAttribute("pass_construction4","0");
+                if (str.contains("民事政处/行政政处（公路/水利）")) {
+                    model.addAttribute("pass_construction4", "0");
                 }
-                if (str.contains("行政政处（城区道路）")){
-                    model.addAttribute("pass_construction5","0");
+                if (str.contains("行政政处（城区道路）")) {
+                    model.addAttribute("pass_construction5", "0");
                 }
             }
         }
     }
-//     if (str.equals("2.农村政处")){
+
+    //     if (str.equals("2.农村政处")){
 //        model.addAttribute("pass_construction3","0");
 //    }
 //    //2.民事政处/行政政处（公路/水利）
@@ -286,8 +201,8 @@ public class MyImportUtils {
 //        model.addAttribute("pass_construction5","0");
 //    }
     //政策处理类型判断
-    public static String getAdministrationJudge(Disclose disclose,String tips){
-        if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null) {
+    public static String getAdministrationJudge(Disclose disclose, String tips) {
+        /*if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null) {
             tips += "政处类型填写有误;";
             return tips;
         }
@@ -303,7 +218,7 @@ public class MyImportUtils {
         if (flag){
             if (!disclose.getAdministrationType().contains("1.无")){
                 if ("".equals(disclose.getPolicyHandlingInstructions()) || disclose.getPolicyHandlingInstructions() == null) {
-                    tips += "政策处理说明填不能为空;";
+                    tips += "政策处理说明填有误;";
                 }
             }
         }
@@ -313,17 +228,17 @@ public class MyImportUtils {
     public static String getHumanReviewJudge(Disclose disclose){
         String tips = "";
         if ("".equals(disclose.getRequireName()) || disclose.getRequireName() == null) {
-            tips +="项目名称不能为空;";
+            tips +="项目名称有误;";
         }
         if ("".equals(disclose.getCapacity()) || disclose.getCapacity() == null||(!"有".equals(disclose.getCapacity())&&!"无".equals(disclose.getCapacity()))) {
             tips += "设备基础是否可以扩容填写有误;";
         }else {
             if ("是".equals(disclose.getCapacity())){
                 if ("".equals(disclose.getSceneSize())||disclose.getSceneSize() == null){
-                    tips+="现场设备尺寸不能为空;";
+                    tips+="现场设备尺寸有误;";
                 }
                 if ("".equals(disclose.getCapacitySize())||disclose.getCapacitySize()==null){
-                    tips+="最多可扩容尺寸不能为空;";
+                    tips+="最多可扩容尺寸有误;";
                 }
             }
         }
@@ -344,7 +259,7 @@ public class MyImportUtils {
         }
         if ("有".equals(disclose.getHiddenDanger()) || "是".equals(disclose.getInfluenceConstruction())|| "是".equals(disclose.getProjectRepetition())|| "是".equals(disclose.getImplemented())|| "无".equals(disclose.getTransformer())) {
             if ("".equals(disclose.getExplanationOfNecessity()) || disclose.getExplanationOfNecessity() == null) {
-                tips += "必要性问题说明不能为空;";
+                tips += "必要性问题说明有误;";
             }
         }
         if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"一致".equals(disclose.getLineName())&&!"不一致".equals(disclose.getLineName()))) {
@@ -355,7 +270,7 @@ public class MyImportUtils {
         }
         if ("否".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())) {
             if ("".equals(disclose.getInconsistentDescription()) || disclose.getInconsistentDescription() == null) {
-                tips += "图纸现场不一致说明不能为空;";
+                tips += "图纸现场不一致说明有误;";
             }
         }
 //        if ("".equals(disclose.getAdministrationType()) || disclose.getAdministrationType() == null||(!"1.农村政处".equals(disclose.getAdministrationType())&&!"2.民事政处/行政政处（公路/水利）".equals(disclose.getAdministrationType())&&!"3.行政政处（城区道路）".equals(disclose.getAdministrationType())&&!"4.无".equals(disclose.getAdministrationType()))) {
@@ -374,31 +289,31 @@ public class MyImportUtils {
         }else {
             if ("户外".equals(disclose.getPlacementMode())||"户内".equals(disclose.getPlacementMode())){
                 if ("".equals(disclose.getProductionDate())||disclose.getProductionDate() == null){
-                    tips +="核查环网柜生产日期不能为空;";
+                    tips +="核查环网柜生产日期有误;";
                 }
             }
         }
         if ("".equals(disclose.getIntegrateModule()) || disclose.getIntegrateModule() == null) {
-            tips += "二次是否是集成模块不能为空;";
+            tips += "二次是否是集成模块有误;";
         }else {
             if (!"是".equals(disclose.getIntegrateModule())&&!"否".equals(disclose.getIntegrateModule())){
                 tips += "二次是否是集成模块填写有误;";
             }
         }
         if ("".equals(disclose.getNeedReplace()) || disclose.getNeedReplace() == null) {
-            tips += "PT是否需要更换不能为空;";
+            tips += "PT是否需要更换有误;";
         }else {
             if (!"是".equals(disclose.getNeedReplace())&&!"否".equals(disclose.getNeedReplace())){
                 tips += "PT是否需要更换填写有误;";
             }
         }
         if ("".equals(disclose.getOverallTransformation()) || disclose.getOverallTransformation() == null) {
-            tips += "设备是否有整体改造的必要不能为空;";
+            tips += "设备是否有整体改造的必要有误;";
         }else {
             if (!"是".equals(disclose.getOverallTransformation())&&!"否".equals(disclose.getOverallTransformation())){
                 tips += "设备是否有整体改造的必要填写有误;";
             }
-        }
+        }*/
         return tips;
     }
 }

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

@@ -3,34 +3,52 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
+import java.io.*;
+import java.net.URL;
 import java.util.*;
 
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.entity.OutInformation;
+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.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 
 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.sys.entity.User;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.*;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -44,9 +62,9 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping(value = "${adminPath}/managementcenter/activiti")
 
 public class ConstructionController extends BaseController {
-
     @Autowired
     private ConstructionService constructionService;
+
     @Autowired
     private ActProcessService actProcessService;
     @Autowired
@@ -72,24 +90,34 @@ public class ConstructionController extends BaseController {
 
 
     /**
-     * 查看，增加，编辑请假申请表单页面
+     * 施工交底流程开始页面
+     */
+    @RequestMapping(value = "start")
+    public String form(Construction construction, Model model) {
+
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/constructionForm";
+    }
+
+    /**
+     * 项目经理组织交底页面
      */
-    @RequestMapping(value = "form/{mode}")
-    public String form(@PathVariable String mode, Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
+    @RequestMapping(value = "divideForm")
+    public String divideForm(Construction construction, Model model) {
         model.addAttribute("construction", construction);
-//		model.addAttribute("roleCodes");
-        if ("add".equals(mode) || "edit".equals(mode)) {
-            return "modules/sg/managementcenter/activiti/constructionForm";
-        } else {//audit(施工单位，项目经理组织交底)
-            return "modules/sg/managementcenter/activiti/constructionAudit";
+        //项目经理组织交底
+        Disclose disclose = construction.getDisclose();
+        if (disclose == null) {
+            model.addAttribute("noProblem", true);
+        } else {
+            MyImportUtils.getTheEcho(construction, model);
         }
-
+        return "modules/sg/managementcenter/activiti/divideForm";
     }
 
     /**
      * 项目交底结论信息列表
-     * */
+     */
     @RequestMapping(value = "discloseList")
     public String disclose(Construction construction, Model model) {
         model.addAttribute("construction", construction);
@@ -98,7 +126,7 @@ public class ConstructionController extends BaseController {
 
     /**
      * 项目交底结论信息数据
-     * */
+     */
     @ResponseBody
     @RequestMapping(value = "data")
     public Map<String, Object> data(Construction uploadImages, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -108,10 +136,10 @@ public class ConstructionController extends BaseController {
 
     /**
      * 人工审核页面
-     * */
+     */
     @RequestMapping(value = "artificial")
     public String form2(Construction construction, Model model) {
-        MyImportUtils.getTheEcho(construction,model);
+        MyImportUtils.getTheEcho(construction, model);
         //获取发起人
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/artificialJudgment";
@@ -119,38 +147,83 @@ public class ConstructionController extends BaseController {
 
     /**
      * 配网运行人员判定设计变更
-     * */
+     */
     @RequestMapping(value = "operatorDesignChange")
     public String form3(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
+
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/operatorDesignChange";
     }
 
+    /**
+     * 交底:运行人员审核图纸
+     * */
+    @RequestMapping(value = "auditDrawings")
+    public String auditDrawings(Construction construction, Model model) {
+
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/auditDrawings";
+    }
+
+    /**
+     * 交底:运行单位经理审核方案
+     * */
+    @RequestMapping(value = "designUpload")
+    public String designUpload(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/designUpload";
+    }
+
+    /**
+     * 设计单位人员重新设计
+     * */
+    @RequestMapping(value = "operatorUploadList")
+    public String operatorUploadList(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/operatorUploadList";
+    }
+
+    /**
+     * 运行经理审核设计变更后
+     * */
+    @RequestMapping(value = "managerUploadList")
+    public String managerUploadList(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/managerUploadList";
+    }
+
+    /**
+     * 配网经理审核设计变更后
+     * */
+    @RequestMapping(value = "afterDistribution")
+    public String afterDistribution(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/afterDistribution";
+    }
+
     /*
-              交底:判断项目是否需要关闭
-           */
+     交底:判断项目是否需要关闭
+   */
     @RequestMapping(value = "speciallyForm")
     public String speciallyForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/speciallyForm";
     }
+
     /*
       项目关闭，配网工程专职判定
    */
     @RequestMapping(value = "managerForm")
     public String managerForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/managerCloseForm";
     }
+
     /*
         项目关闭，配网运行人员
      */
     @RequestMapping(value = "memberForm")
     public String memberForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/memberForm";
     }
@@ -161,155 +234,169 @@ public class ConstructionController extends BaseController {
     */
     @RequestMapping(value = "departmentForm")
     public String departmentForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/departmentForm";
     }
 
-/**
- * 政策处理
- * */
+    /**
+     * 政策处理
+     */
     @RequestMapping(value = "policiesChange")
     public String policiesChange(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/policiesChange";
     }
 
 
-
     /**
      * 政策处理项目经理判断是否需要继续
-     * */
+     */
     @RequestMapping(value = "managerPolicesChange")
     public String managerPolicesChange(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/managerPolicesChange";
     }
 
     /**
      * 经研所审核页面
-     * */
+     */
     @RequestMapping(value = "economicsDesignChange")
     public String form4(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
+
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/economicsDesignChange";
     }
 
     /**
      * 项目经理判断是否继续设计变更
-     * */
+     */
     @RequestMapping(value = "managerDesignChange")
     public String managerDesignChange(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/managerDesignChange";
     }
 
-    /**政处处理（行政政处）*/
-
     /**
-     * 上传未盖章施工方案（行政政处开始）
-     * */
+     * 项目经理判定是否关闭
+     */
     @RequestMapping(value = "coveredForm")
     public String coveredForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/coveredForm";
     }
 
     /**
-     * 施工方案盖章
-     * */
+     * 配网工程专职判定是否关闭
+     */
     @RequestMapping(value = "sealForm")
     public String sealForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/sealForm";
     }
 
-
-
-/*    *//**
-     * 项目经理判断是否需要政策处理（行政政处）
-     * *//*
-    @RequestMapping(value = "sealForm")
-    public String sealForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
-        model.addAttribute("construction", construction);
-        return "modules/sg/managementcenter/activiti/sealForm";
-    }*/
-
     /**
-     * 上传收据
-     * */
+     * 配网运行人员判定是否关闭
+     */
     @RequestMapping(value = "receiptForm")
     public String receiptForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/receiptForm";
     }
+
     /*
         项目经理
      */
     @RequestMapping(value = "phaseManagerForm")
-    public String phaseManagerForm(Construction construction, Model model){
-        model.addAttribute("construction",construction);
+    public String phaseManagerForm(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/phaseManageForm";
     }
+
     /**
      * 上传缴费单
-     * */
+     */
     @RequestMapping(value = "singleForm")
     public String singleForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
+
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/singleForm";
     }
 
     /**
-     * 上传借款单据
-     * */
+     * 配网项目经理判定变更或关闭
+     */
     @RequestMapping(value = "documentsForm")
     public String documentsForm(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/documentsForm";
     }
 
+    /**
+     * 配网系统专职确认系统关闭
+     */
+    @RequestMapping(value = "confirmClose")
+    public String confirmClose(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/confirmClose";
+    }
+
+    /**
+     * 修改交底结论页面
+     */
     @RequestMapping(value = "editCon")
     public String editCon(Construction construction, Model model) {
-        Disclose disclose1 = construction.getDisclose();
-        if (disclose1 != null) {
-            String administrationType = disclose1.getAdministrationType();
-            if (administrationType != null) {
-                String[] split = administrationType.split(";");
-                List<String> newList = new ArrayList<>();
-                for (int i = 0; i < split.length; i++) {
-                    newList.add(split[i]);
-                }
-                construction.setAdministrationTypeList(newList);
-            }
-        }
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/editCon";
     }
 
 
     /**
-     * 配网运行人员判定设计变更
-     * 人工审核页面
-     * */
+     * 交底:运行人员审核页面
+     */
     @RequestMapping(value = "humanReview")
-    public String humanReviewform(Construction construction, Model model) {
-        //根据流程定义号获取所有的定义流程
-        MyImportUtils.getTheEcho(construction,model);
+    public String humanReview(Construction construction, Model model) {
+
+        MyImportUtils.getTheEcho(construction, model);
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/humanReview";
     }
 
+
+    @RequestMapping(value = "excelOut")
+    public void excelStandardTemplateOut(HttpServletRequest request,
+                                         HttpServletResponse response) throws IOException {
+        String fileName = "disclose.xlsx";
+        String filePath = getClass().getResource("/freemarker/" + fileName).getPath();
+        File f = new File(filePath);
+        // 设置response参数，可以打开下载页面
+        response.reset();
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        try {
+            response.setHeader("Content-Disposition", "attachment;filename=" + new String(("交底结论模板" + ".xlsx").getBytes(), "iso-8859-1"));//下载文件的名称
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        ServletOutputStream out = response.getOutputStream();
+        BufferedInputStream bis = null;
+        BufferedOutputStream bos = null;
+        try {
+            bis = new BufferedInputStream(new FileInputStream(f));
+            bos = new BufferedOutputStream(out);
+            byte[] buff = new byte[2048];
+            int bytesRead;
+            while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
+                bos.write(buff, 0, bytesRead);
+            }
+        } catch (final IOException e) {
+            throw e;
+        } finally {
+            if (bis != null)
+                bis.close();
+            if (bos != null)
+                bos.close();
+        }
+    }
+
     /**
      * 保存请假申请
      */
@@ -329,102 +416,48 @@ public class ConstructionController extends BaseController {
         /**
          * 流程审批
          */
-    if (StringUtils.isBlank(construction.getId())) {
-        //获取流程图id
-        String procDefId = construction.getAct().getProcDefId();
-        //用于记录未发起的流程原因
-        String info = "";
-        //用户修改发起流程后的项目状态
-        Project newProject = new Project();
-        //定义vars用于指派流程走向
-        Map<String, Object> vars = Maps.newHashMap();
-        //获取选择的项目信息id
-        String projectId = construction.getProjectId();
-        //项目施工单位字段定义
-        String constructionUnit = "";
-        //定义施工单位角色
-        String constructionUnitRole = "";
-        //定义项目经理角色
-        String projectManageRole = "";
-        //根据，分割得到选择项目的id数组
-        String[] proListId = projectId.split(",");
-        //根据数组查询得到项目信息
-        List<Project> listById = projectService.findListById(proListId);
-        //循环项目信息
+        if (StringUtils.isBlank(construction.getId())) {
+            //获取流程图id
+            String procDefId = construction.getAct().getProcDefId();
+            //通过id获取项目暂定名称
+            //用于记录未发起的流程原因
+            String info = "";
+            //定义vars用于指派流程走向
+            Map<String, Object> vars = Maps.newHashMap();
+            //获取选择的项目
+            String reserveProjectName = construction.getReserveProjectName();
+            //根据，分割得到选择项目的id数组
+            String[] proListId = reserveProjectName.split(",");
+            //根据数组查询得到项目信息
+            List<Project> listById = projectService.findListById(proListId);
+            //循环项目信息
             for (Project each : listById) {
-                //从项目信息种获取交底类型
-                constructionUnit = each.getClarificaitonType();
-                //如果施工单位不为空，系统判读施工单位交底
-                if ("施工单位自行交底".equals(constructionUnit)) {
-                    //施工单位交底
-                    //获取施工单位角色
-                    constructionUnitRole = each.getConstructionUnitManage();
-                    //查询是否有此登录名用户
-                    User user = constructionService.queryPerson(constructionUnitRole);
-                    //如果查询不为空表示有用户，为空没有此用户
-                    if (user != null) {
-                        //有此用户-施工单位交底
-                        vars.put("company", true);
-                        vars.put("manager", false);
-                        vars.put("processer", user.getLoginName());
-                        String id = each.getId();
-                        construction.setApplyName(constructionUnitRole);
-                        construction.setProjectId(each.getProjectId());
-                        construction.setProjectName(each.getRequireName());
-                        construction.setAcceptDate(new Date());
-                        constructionService.newSave(construction);//保存
-                        newProject.setStatus("1");
-                        newProject.setId(id);
-                        projectService.updateStatus(newProject);
-                        String procDefKey = construction.getAct().getProcDefKey();
-                        // 启动流程
-                        try {
-                            ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
-                            String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                            actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    } else {
-                        //没有此用户
-                        info += ("项目："+each.getRequireName()+"没有此施工单位人员，请核实。");
-                        continue;
-                    }
+                if (each.getAssignment() == null) {
+                    info += each.getReserveProjectName() + "未填写施工任务分配信息";
+                    continue;
+                }
+                //查询是否有此配网项目经理人员（表中暂无配网项目经理人员信息）
+                User user = constructionService.queryPerson(each.getAssignment().getConstructionManage());
+                //查询是否有此用户
+                if (user != null) {
+                    //有此用户
+                    vars.put("design", user.getLoginName());
+                    construction.setReserveProjectName(each.getReserveProjectName());
+                    constructionService.newSave(construction);//保存
+                    //根据储备项目暂定名称修改项目状态
+                    constructionService.updateStatus(construction);
+                    // 启动流程
+                    ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
+                    String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                    actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
                 } else {
-                    //项目经理交底
-                    //获取项目经理角色
-                    projectManageRole = each.getProjectManageRole();
-                    //查询是否有此登录名用户
-                    User user = constructionService.queryPerson(projectManageRole);
-                    //查询是否有此用户
-                    if (user != null) {
-                        //有此用户
-                        vars.put("company", false);
-                        vars.put("manager", true);
-                        vars.put("processer", user.getLoginName());
-                        String id = each.getId();
-                        construction.setApplyName(projectManageRole);
-                        construction.setProjectId(each.getProjectId());
-                        construction.setProjectName(each.getRequireName());
-                        construction.setAcceptDate(new Date());
-                        constructionService.newSave(construction);//保存
-                        newProject.setStatus("1");
-                        newProject.setId(id);
-                        projectService.updateStatus(newProject);
-                        String procDefKey = construction.getAct().getProcDefKey();
-                        // 启动流程
-                        ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
-                        String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                        actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
-                    } else {
-                        //没有此用户
-                        info += ("项目："+each.getRequireName()+"没有此项目经理，请核实。");
-                        continue;
-                    }
+                    //没有此用户
+                    info += ("项目：" + each.getReserveProjectName() + "没有此项目经理，请核实。");
+                    continue;
                 }
             }
             //新增或编辑表单保存
-            j.setMsg("发起流程审批成功!"+info);
+            j.setMsg("发起流程审批成功!" + info);
             j.getBody().put("targetUrl", "/act/task/process/");
         }
         return j;
@@ -434,80 +467,162 @@ public class ConstructionController extends BaseController {
     @RequestMapping(value = "editConSave")
     public AjaxJson editConSave(Construction construction, Model model) throws Exception {
         AjaxJson j = new AjaxJson();
-        boolean flag = true;
-        //获取施工交底的填写信息
-        Disclose disclose = construction.getDisclose();
-        //设备基础是否可以扩容
-        String capacity = disclose.getCapacity();
-        //现场设备尺寸
-        String sceneSize = disclose.getSceneSize();
-        //最多可扩容尺寸
-        String capacitySize = disclose.getCapacitySize();
-        //方案安全隐患
-        String hiddenDanger = disclose.getHiddenDanger();
-        //是否存在低压或通信线等影响施工
-        String influenceConstruction = disclose.getInfluenceConstruction();
-        //立项重复
-        String projectRepetition = disclose.getProjectRepetition();
-        //是否已实施
-        String implemented = disclose.getImplemented();
-        //变压器无负荷
-        String transformer = disclose.getTransformer();
-        //项目实施必要性描述
-        String explanationOfNecessity = disclose.getExplanationOfNecessity();
-        //线路名称一致性
-        String lineName = disclose.getLineName();
-        //工程量是否一致
-        String quantities = disclose.getQuantities();
-        //图纸现场不一致描述
-        String inconsistentDescription = disclose.getInconsistentDescription();
-        //政处类型
-        List<String> administrationTypeList = construction.getAdministrationTypeList();
-        String a = "";
-        for (String type: administrationTypeList) {
-            a += type + ";";
+        try {
+            List<Construction> constructionList = new ArrayList<>();
+            constructionList.add(construction);
+            constructionService.replaceDisclose(constructionList);
+            j.setSuccess(true);
+            j.setMsg("修改成功");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("修改失败");
         }
-        disclose.setAdministrationType(a);
-        //前置条件
-        String precondition = disclose.getPrecondition();
-        //政策处理描述
-        String policyHandlingInstructions = disclose.getPolicyHandlingInstructions();
-        //DTU安放方式核查
-        String placementMode = disclose.getPlacementMode();
-        //核查环网柜生产日期
-        String productionDate = disclose.getProductionDate();
-        //其它问题类型
-        String otherProblem = disclose.getOtherProblem();
-        if ("是".equals(capacity)) {
-            if ("".equals(sceneSize) || "".equals(capacitySize)) {
-                j.setMsg("现场设备尺寸、最多可扩容尺寸需填写");
-                j.setSuccess(false);
-                flag = false;
-            }
-        } else if ("有".equals(hiddenDanger) || "是".equals(influenceConstruction)|| "是".equals(projectRepetition)|| "是".equals(implemented)|| "无".equals(transformer)) {
-            if ("".equals(explanationOfNecessity) || explanationOfNecessity == null) {
-                j.setMsg("必要性问题描述不能为空");
-                j.setSuccess(false);
-                flag = false;
+        return j;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "importDisclose")
+    public AjaxJson importDisclose(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+        AjaxJson j = new AjaxJson();
+        int successNum = 0;
+        String failureMsg = "";
+        List<Construction> constructionList = new ArrayList<>();
+        Construction construction;
+        //获取当前登陆用户所有在《交底:项目经理组织交底》节点的流程
+        List<Construction> activityList = MyActiviUtils.findActivity("交底:项目经理交底内容");
+        //读取excel文件数据
+        try {
+            ImportExcel ei = new ImportExcel(file, 0, 0);
+            Disclose disclose;
+            int lastDataRowNum = ei.getLastDataRowNum();
+            for (int i = 3; i <=lastDataRowNum; i++) {
+                construction = new Construction();
+                disclose = new Disclose();
+                Row row = ei.getRow(i);
+                String reserveProjectName = ei.getCellValue(row, 0).toString();
+                if ("".equals(reserveProjectName) || null == reserveProjectName) {
+                    continue;
+                }
+                construction.setReserveProjectName(reserveProjectName);
+                //是否已实施
+                disclose.setHasImplemented(ei.getCellValue(row, 1).toString());
+                //现场情况描述
+                disclose.setSceneDescription(ei.getCellValue(row, 2).toString());
+                //是否有实施必要性
+                disclose.setIsImplement(ei.getCellValue(row, 3).toString());
+                //实施无必要描述
+                disclose.setNoImplementation(ei.getCellValue(row, 4).toString());
+                //图纸是否完整
+                disclose.setWhetherComplete(ei.getCellValue(row, 5).toString());
+                //图纸完整性描述
+                disclose.setDrawingDescription(ei.getCellValue(row, 6).toString());
+                //图纸是否规范
+                disclose.setWhetherStandard(ei.getCellValue(row, 7).toString());
+                //图纸规范性描述
+                disclose.setNormativeDrawings(ei.getCellValue(row, 8).toString());
+                //是否存在典设图问题
+                disclose.setWhetherDrawing(ei.getCellValue(row, 9).toString());
+                //典设图问题描述
+                disclose.setProblemDescription(ei.getCellValue(row, 10).toString());
+                //是否存在施工通道
+                disclose.setWhetherChannel(ei.getCellValue(row, 11).toString());
+                //施工通道情况描述
+                disclose.setConstructionDescription(ei.getCellValue(row, 12).toString());
+                //土建是否需要调整
+                disclose.setCivilAdjusted(ei.getCellValue(row, 13).toString());
+                //土建方案变更内容描述
+                disclose.setDescriptionPlans(ei.getCellValue(row, 14).toString());
+                //土建工作量调整内容描述
+                disclose.setDescriptionAdjustment(ei.getCellValue(row, 15).toString());
+                //电气方案是否需要调整
+                disclose.setElectricalAdjusted(ei.getCellValue(row, 16).toString());
+                //调整原因描述
+                disclose.setAdjustmentDescription(ei.getCellValue(row, 17).toString());
+                //自动化是否需要变更
+                disclose.setDoesChange(ei.getCellValue(row, 18).toString());
+                //自动化方案调整内容
+                disclose.setAutomatedContent(ei.getCellValue(row, 19).toString());
+                //自动化工作内容调整
+                disclose.setAutomatedAdjustment(ei.getCellValue(row, 20).toString());
+                //其他方案是否需要调整
+                disclose.setOtherAdjusted(ei.getCellValue(row, 21).toString());
+                //其他方案调整原因描述
+                disclose.setDescriptionReasons(ei.getCellValue(row, 22).toString());
+                construction.setDisclose(disclose);
+                constructionList.add(construction);
             }
-        }else if ("不一致".equals(lineName)||"否".equals(quantities)) {
-            if ("".equals(inconsistentDescription) || inconsistentDescription == null) {
-                j.setMsg("图纸现场不一致描述不能为空");
-                j.setSuccess(false);
-                flag = false;
+            //比对当前节点可以导入交底结论的信息
+            List<Construction> criteriaList = new ArrayList<>();
+            for (Construction c:activityList) {
+                for (Construction n : constructionList) {
+                    if (c.getReserveProjectName().equals(n.getReserveProjectName())) {
+                        criteriaList.add(n);
+                    }
+                }
             }
-        } else if ("户内".equals(placementMode)||"户外".equals(placementMode)) {
-            if ("".equals(productionDate)) {
-                j.setMsg("核查环网柜生产日期不能为空");
-                j.setSuccess(false);
-                flag = false;
+
+            //进行数据验证
+            Map<String, Object> stringObjectMap = MyImportUtils.errorTips(criteriaList);
+            String fin = (String) stringObjectMap.get("fin");
+            List<Construction> sendList = new ArrayList<>();
+            List<Construction> insertList = (List<Construction>) stringObjectMap.get("newConList");
+            if (insertList.size() > 0) {
+                for (Construction c : insertList) {
+                    for (Construction n:activityList) {
+                        if (c.getReserveProjectName().equals(n.getReserveProjectName())) {
+                            sendList.add(n);
+                            c.getAct().setProcInsId(n.getProcInsId());
+                        }
+                    }
+                }
+                /*导入符合条件的交底结论信息*/
+                constructionService.replaceDisclose(insertList);
+                Map<String, Object> vars = Maps.newHashMap();
+                for (Construction c : sendList) {
+                    String instituteRole = c.getAssignment().getInspectionUnit();
+                    vars.put("problem", true);
+                    vars.put("design", UserUtils.getByUserName(instituteRole).getLoginName());
+                    actTaskService.complete(c.getAct().getTaskId(), c.getAct().getProcInsId(), "系统判断成功，请自行查看", vars);
+                }
             }
-        }
-        if (flag) {
-            constructionService.insertDisclose(construction);
-            j.setMsg("插入成功");
-            j.setSuccess(true);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return j;
     }
+
+    /**
+     * 文件管理列表数据
+     */
+    @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
+        return getBootstrapData(page);
+    }
 }

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

@@ -3,7 +3,6 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
-import java.io.IOException;
 import java.net.URLDecoder;
 
 import com.google.common.collect.Maps;
@@ -17,24 +16,19 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.repository.ProcessDefinition;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Row;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.schema.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -94,24 +88,9 @@ public class DivideController extends BaseController {
     /**
      * 查看，增加，编辑请假申请表单页面
      */
-    @RequestMapping(value = "form/{mode}")
-    public String form(@PathVariable String mode, Construction construction, Model model) {
+    @RequestMapping(value = "divideForm")
+    public String form(Construction construction, Model model) {
         model.addAttribute("construction", construction);
-        if ("audit".equals(mode)) {
-            Disclose disclose1 = construction.getDisclose();
-            if (disclose1 != null) {
-                String administrationType = disclose1.getAdministrationType();
-                if (administrationType != null) {
-                    String[] split = administrationType.split(";");
-                    List<String> newList = new ArrayList<>();
-                    for (int i = 0; i < split.length; i++) {
-                        newList.add(split[i]);
-                    }
-                    construction.setAdministrationTypeList(newList);
-                }
-            }
-            return "modules/sg/managementcenter/activiti/divideAudit";
-        } else {//add
             //项目经理组织交底
             Disclose disclose = construction.getDisclose();
             if (disclose == null) {
@@ -120,8 +99,6 @@ public class DivideController extends BaseController {
                 MyImportUtils.getTheEcho(construction,model);
             }
             return "modules/sg/managementcenter/activiti/divideForm";
-        }
-//		return "modules/sg/managementcenter/activiti/constructionForm";
     }
 
     /**
@@ -145,7 +122,7 @@ public class DivideController extends BaseController {
         /**
          * 流程审批
          */
-        if (StringUtils.isBlank(disclose.getId())) {
+        /*if (StringUtils.isBlank(disclose.getId())) {
             //新增或编辑表单保存
             discloseService.save(disclose);//保存
             // 启动流程
@@ -164,7 +141,7 @@ public class DivideController extends BaseController {
             actTaskService.complete(disclose.getAct().getTaskId(), disclose.getAct().getProcInsId(), disclose.getAct().getComment(), disclose.getContent(), vars);
             j.setMsg("提交成功！");
             j.getBody().put("targetUrl", "/act/task/todo/");
-        }
+        }*/
         return j;
     }
 
@@ -176,7 +153,7 @@ public class DivideController extends BaseController {
     @RequestMapping(value = "importConclusion")
     public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request,String procInsId,String projectName){
         AjaxJson j = new AjaxJson();
-        try {
+        /*try {
             projectName = URLDecoder.decode(projectName, "UTF-8");
             int successNum = 0;
             int failureNum = 0;
@@ -245,7 +222,7 @@ public class DivideController extends BaseController {
             e.printStackTrace();
             j.setSuccess(false);
             j.setMsg("导入失败！失败信息：" + e.getMessage());
-        }
+        }*/
         return j;
     }
 
@@ -269,7 +246,7 @@ public class DivideController extends BaseController {
         //获取当前登陆用户所有在《交底:项目经理组织交底》节点的流程
 
         //读取文件记录在数组中
-        try {
+        /*try {
             ImportExcel ei = new ImportExcel(file, 1, 0);
             int lastDataRowNum = ei.getLastDataRowNum();
             Disclose disclose;
@@ -333,7 +310,7 @@ public class DivideController extends BaseController {
                 for (Disclose d : taskList) {
                     Map<String, Object> vars = Maps.newHashMap();
                     String precondition = d.getPrecondition();
-                    Project user = MyActiviUtils.findUser(d.getProcInsId());
+//                    Project user = MyActiviUtils.findUser(d.getProcInsId());
                     //通过页面修改施工交底
                     vars.put("self", false);
                     //完成施工交底
@@ -349,7 +326,7 @@ public class DivideController extends BaseController {
                     ) {
                         vars.put("problem", false);
                         vars.put("pass4", true);
-                        vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+//                        vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
                     } else {
                         //没有前置条件，判断是否为无问题
                         if (
@@ -366,7 +343,7 @@ public class DivideController extends BaseController {
                         } else {
                             vars.put("pass4", false);
                             vars.put("problem", true);
-                            vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+//                            vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
                         }
                     }
                     actTaskService.complete(d.getTaskId(), d.getProcInsId(), "系统判断成功，请自行查看", vars);
@@ -377,7 +354,7 @@ public class DivideController extends BaseController {
             e.printStackTrace();
             j.setSuccess(false);
             j.setMsg("导入失败！失败信息：" + e.getMessage());
-        }
+        }*/
         return j;
     }
 

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

@@ -11,19 +11,14 @@ import com.jeeplus.core.persistence.Page;
 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.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sys.entity.DictValue;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.test.pic.entity.TestPic;
 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;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -79,11 +74,11 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/uploadList";
 	}
 
-	@RequestMapping(value = "designUpload")
+/*	@RequestMapping(value = "designUpload")
 	public String designUpload(UploadImages uploadImages, Model model) {
 		model.addAttribute("uploadImages", uploadImages);
 		return "modules/sg/managementcenter/activiti/designUpload";
-	}
+	}*/
 
 	/**
 	 * 图片管理列表页面
@@ -94,14 +89,14 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/uploadList";
 	}
 
-	/**
+/*	*//**
 	 * 配网运行人员查看图片
-	 */
+	 *//*
 	@RequestMapping(value = {"operatorUploadList"})
 	public String operatorUploadList(UploadImages uploadImages, Model model) {
 		model.addAttribute("uploadImages", uploadImages);
 		return "modules/sg/managementcenter/activiti/operatorUploadList";
-	}
+	}*/
 
 	/**
 	 * 经研所查看上传文件
@@ -112,14 +107,13 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/economicsDesignChange";
 	}
 
-	/**
+/*	*
 	 * 配网项目经理查看图片
-	 */
 	@RequestMapping(value = {"managerUploadList"})
 	public String managerUploadList(UploadImages uploadImages, Model model) {
 		model.addAttribute("uploadImages", uploadImages);
 		return "modules/sg/managementcenter/activiti/managerUploadList";
-	}
+	}*/
 
 	/**
 	 * 施工单位判断变更后材料
@@ -169,15 +163,15 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/loanUploadList";
 	}
 
-	/**
+/*	*//**
 	 * 交底:运行人员审核图纸
-	 * */
+	 * *//*
 	@RequestMapping(value = "auditDrawings")
 	public String auditDrawings(UploadImages uploadImages, Model model) {
 		//根据流程定义号获取所有的定义流程
 		model.addAttribute("uploadImages", uploadImages);
 		return "modules/sg/managementcenter/activiti/auditDrawings";
-	}
+	}*/
 
 
 	/**
@@ -185,8 +179,8 @@ public class UploadController extends BaseController {
 	 */
 	@RequestMapping(value = "imagesForm")
 	public String form(UploadImages uploadImages, Model model) {
-		UploadImages uploadImages1 = uploadImagesService.get(uploadImages.getId());
-		model.addAttribute("uploadImages", uploadImages1);
+//		UploadImages uploadImages1 = uploadImagesService.get(uploadImages.getId());
+//		model.addAttribute("uploadImages", uploadImages1);
 		return "modules/sg/managementcenter/activiti/uploadListForm";
 	}
 
@@ -196,11 +190,11 @@ 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) {
-			Project project = new Project();
+			Project1 project = new Project1();
 			uploadImages.setProject(project);
 		}
 		//查询出所有的附件信息
@@ -225,7 +219,8 @@ public class UploadController extends BaseController {
 			images.setImgName(dictLabels);
 		}
 		List<UploadImages> list = page.getList();
-		//循环list
+		//循环list*/
+		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
 		return getBootstrapData(page);
 	}
 
@@ -236,7 +231,7 @@ public class UploadController extends BaseController {
 	@RequestMapping(value = "materialUploadData")
 	public Map<String, Object> materialUploadData(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model,String procInsId) {
 		if (procInsId!=null&&procInsId!="") {
-			uploadImages.setProcInsId(procInsId);
+//			uploadImages.setProcInsId(procInsId);
 		}
 		Page<UploadImages> page = uploadImagesService.findMaterialImg(new Page<UploadImages>(request, response), uploadImages);
 		//当判定系统为linux的时候
@@ -308,7 +303,7 @@ public class UploadController extends BaseController {
 		/**
 		 * 流程审批
 		 */
-		if (StringUtils.isBlank(uploadImages.getId())){
+		/*if (StringUtils.isBlank(uploadImages.getId())){
 			uploadImages.setPath(pic);
 			uploadImages.setProcInsId(uploadImages.getAct().getTaskId());
 			uploadImages.setuId(UserUtils.getUser().getLoginName());
@@ -320,7 +315,7 @@ public class UploadController extends BaseController {
 			actTaskService.startProcess(p.getKey(),  "xm_upolad_images", uploadImages.getId(), title);
 			j.setMsg("提交审批成功!");
 			j.getBody().put("targetUrl",  "/act/task/process/");
-		}
+		}*/
 
 		return j;
 	}

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/mapper/ConstructionProjectMapper.java

@@ -3,8 +3,7 @@ package com.jeeplus.modules.sg.managementcenter.constructionProject.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.managementcenter.project.entity.Project;
-import io.swagger.models.auth.In;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,9 +19,9 @@ public interface ConstructionProjectMapper extends BaseMapper<ConstructionProjec
 
     Integer updateArrangeTimeLine(@Param(value = "list") List<ConstructionProject> list);
 
-    List<Project> findListProject(@Param(value = "list") List<String> strings);
+    List<Project1> findListProject(@Param(value = "list") List<String> strings);
 
-    List<Project> findAllListProject(Project project);
+    List<Project1> findAllListProject(Project1 project);
 
-    Integer updateListProject(@Param(value = "list")List<Project> list);
+    Integer updateListProject(@Param(value = "list")List<Project1> list);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/mapper/ConstructionProjectTemporaryMapper.java

@@ -2,9 +2,7 @@ package com.jeeplus.modules.sg.managementcenter.constructionProject.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.managementcenter.constructionProject.entity.ConstructionProjectTemporary;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/mapper/xml/ConstructionProjectMapper.xml

@@ -111,7 +111,7 @@
 		a.preConstruction AS "preConstruction"
 	</sql>
 
-	<select id="findListProject" parameterType="java.util.List" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project" >
+	<select id="findListProject" parameterType="java.util.List" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project1" >
 		SELECT
 		<include refid="projectColumns"/>
 		FROM xm_project_details a
@@ -126,7 +126,7 @@
 		</where>
 	</select>
 
-	<select id="findAllListProject" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project" >
+	<select id="findAllListProject" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project1" >
 		SELECT
 		<include refid="projectColumns"/>
 		FROM xm_project_details a

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/service/ConstructionProjectService.java

@@ -9,7 +9,7 @@ import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.Constr
 import com.jeeplus.modules.sg.managementcenter.constructionProject.mapper.ConstructionProjectMapper;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.util.RecursiveUtil;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.util.TreeTableUtil;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,20 +30,20 @@ public class ConstructionProjectService extends CrudService<ConstructionProjectM
 		return super.get(id);
 	}
 	
-	public List<ConstructionProject> findList(List<Project> allListProject,ConstructionProject constructionProject) {
+	public List<ConstructionProject> findList(List<Project1> allListProject, ConstructionProject constructionProject) {
 		return super.findList(constructionProject);
 	}
 
 	//修改项目
 	@Transactional(readOnly = false)
-	public void updateListProject(List<Project> projects){
+	public void updateListProject(List<Project1> projects){
 		constructionProjectMapper.updateListProject(projects);
 	}
 
     //查询安排计划项目
-    public List<Project> findListAllProject(List<Project> allListProject,ConstructionProject constructionProject){
+    public List<Project1> findListAllProject(List<Project1> allListProject, ConstructionProject constructionProject){
         String ids = "";
-        List<Project> projects = null;
+        List<Project1> projects = null;
         if (null!=constructionProject && null!=constructionProject.getProjectNumber()){
             ids = constructionProject.getProjectNumber();
         }
@@ -74,9 +74,9 @@ public class ConstructionProjectService extends CrudService<ConstructionProjectM
 		return stringList;
 	}
 	//查询安排计划项目getAllProjectNo
-	public List<Project> getAllProjectNo(List<Project> allListProject,ConstructionProject constructionProject){
+	public List<Project1> getAllProjectNo(List<Project1> allListProject, ConstructionProject constructionProject){
 		String ids = "";
-		List<Project> projects = null;
+		List<Project1> projects = null;
 		if (null!=constructionProject && null!=constructionProject.getProjectNumber()){
 			ids = constructionProject.getProjectNumber();
 		}
@@ -91,18 +91,18 @@ public class ConstructionProjectService extends CrudService<ConstructionProjectM
 		return projects;
 	}
 
-	public List<Project> allListProject(ConstructionProject constructionProject){
-		Project project = new Project();
+	public List<Project1> allListProject(ConstructionProject constructionProject){
+		Project1 project = new Project1();
 		project.setRezkey("0");
-		List<Project> allListProject = constructionProjectMapper.findAllListProject(project);
+		List<Project1> allListProject = constructionProjectMapper.findAllListProject(project);
 		return allListProject;
 	}
 
 	//查询安排计划项目
-	public List<Project> findListProject(ConstructionProject constructionProject){
+	public List<Project1> findListProject(ConstructionProject constructionProject){
         List<String> stringList = new ArrayList<String>();
 		String ids = "";
-		List<Project> projects = null;
+		List<Project1> projects = null;
 		if (null!=constructionProject && null!=constructionProject.getProjectNumber()){
 			ids = constructionProject.getProjectNumber();
 		}

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/service/ConstructionProjectTemporaryService.java

@@ -7,12 +7,9 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProjectTemporary;
-import com.jeeplus.modules.sg.managementcenter.constructionProject.mapper.ConstructionProjectMapper;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.mapper.ConstructionProjectTemporaryMapper;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.util.RecursiveUtil;
-import com.jeeplus.modules.sg.managementcenter.constructionProject.util.TreeTableUtil;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.apache.ibatis.annotations.Param;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -181,16 +178,16 @@ public class ConstructionProjectTemporaryService extends CrudService<Constructio
 	}
 
 	//获取临时表存储对象
-	public List<ConstructionProjectTemporary> getConstructionProjectPowerLine(List<Project> projects,Date date,String parentStatus,String childStatus){
-		List<Project> projectList = new ArrayList<Project>();
-		for (Project project:projects){
+	public List<ConstructionProjectTemporary> getConstructionProjectPowerLine(List<Project1> projects, Date date, String parentStatus, String childStatus){
+		List<Project1> projectList = new ArrayList<Project1>();
+		for (Project1 project : projects){
 			projectList.add(project);
 		}
 		List<ConstructionProjectTemporary> stringPowerList = new ArrayList<ConstructionProjectTemporary>();
 		HashSet<String> hashSet = new HashSet<String>();//开关集合
 		String[] splite = null;
-		for (Project project:projects){
-			if (null!=project.getPowerScope()&&!"".equals(project.getPowerScope())) {
+		for (Project1 project : projects){
+			if (null!= project.getPowerScope()&&!"".equals(project.getPowerScope())) {
 				if (project.getPowerScope().contains("；")) {
 					splite = project.getPowerScope().split("；");
 					for (String s : splite) {

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/util/RecursiveUtil.java

@@ -1,7 +1,7 @@
 package com.jeeplus.modules.sg.managementcenter.constructionProject.util;
 
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProjectTemporary;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -12,28 +12,28 @@ import java.util.List;
 public class RecursiveUtil {
 
     //获取级联的工程------------增加入库操作
-    public static List<Project> getAllProjectRecursive(List<Project> projects,List<String> projectNumbers){
-        List<Project> sureProject = getDuplicateRemoval(projects);//确定的project集合
-        List<Project> duplicateRemoval = getDuplicateRemoval(projects);//备用集合
-        List<Project> areProject = getThereAreProject(sureProject, projectNumbers);//查找项目定义号的工程
+    public static List<Project1> getAllProjectRecursive(List<Project1> projects, List<String> projectNumbers){
+        List<Project1> sureProject = getDuplicateRemoval(projects);//确定的project集合
+        List<Project1> duplicateRemoval = getDuplicateRemoval(projects);//备用集合
+        List<Project1> areProject = getThereAreProject(sureProject, projectNumbers);//查找项目定义号的工程
         HashSet<String> hashSetAll = getProjectScopeList(areProject);//获取去重的停电线路
         getRecursive(duplicateRemoval,hashSetAll);//递归
-        List<Project> returnProject = getReturnProject(sureProject, hashSetAll);
+        List<Project1> returnProject = getReturnProject(sureProject, hashSetAll);
         return returnProject;
     }
     //其他
-    public static List<Project> getAllProjectNo(List<Project> projects,List<String> projectNumbers){
-        List<Project> projectList = getDuplicateRemoval(projects);//确定集合
-        List<Project> duplicateRemoval = getDuplicateRemoval(projects);
-        List<Project> noNoProject = getNoNoProject(projectList, projectNumbers);//主用
-        List<Project> noNoProject1 = getNoNoProject(duplicateRemoval, projectNumbers);//备用
-        HashSet<String> projectScopeList = getProjectScopeList(noNoProject1);
-        getRecursive(noNoProject1,projectScopeList);
-        List<Project> returnProject = getReturnProject(noNoProject, projectScopeList);
+    public static List<Project1> getAllProjectNo(List<Project1> projects, List<String> projectNumbers){
+        List<Project1> projectList = getDuplicateRemoval(projects);//确定集合
+        List<Project1> duplicateRemoval = getDuplicateRemoval(projects);
+        List<Project1> noNoProject = getNoNoProject(projectList, projectNumbers);//主用
+        List<Project1> noNoProject11 = getNoNoProject(duplicateRemoval, projectNumbers);//备用
+        HashSet<String> projectScopeList = getProjectScopeList(noNoProject11);
+        getRecursive(noNoProject11,projectScopeList);
+        List<Project1> returnProject = getReturnProject(noNoProject, projectScopeList);
         return returnProject;
     }
 
-    public static List<Project> getNoNoProject(List<Project> projects,List<String> projectNumbers){
+    public static List<Project1> getNoNoProject(List<Project1> projects, List<String> projectNumbers){
         for (int i = 0; i < projects.size(); i++) {
             for (String string:projectNumbers){
                 if (projects.get(i).getProjectNumber().equals(string)){
@@ -46,9 +46,9 @@ public class RecursiveUtil {
         return projects;
     }
     //获取确定的list<project>集合
-    public static List<Project> getReturnProject(List<Project> projects,HashSet<String> hashSetAll){
-        List<Project> projectList = new ArrayList<Project>();
-        for (Project project:projects){
+    public static List<Project1> getReturnProject(List<Project1> projects, HashSet<String> hashSetAll){
+        List<Project1> projectList = new ArrayList<Project1>();
+        for (Project1 project : projects){
             for (String string:hashSetAll){
                 if (project.getPowerScope().contains(string)){
                     projectList.add(project);
@@ -60,7 +60,7 @@ public class RecursiveUtil {
     }
 
     //递归
-    public static void getRecursive(List<Project> projects,HashSet<String> hashSetAll){
+    public static void getRecursive(List<Project1> projects, HashSet<String> hashSetAll){
         HashSet<String> hashSet = new HashSet<String>();
         for (String string:hashSetAll){
             for (int i = 0; i < projects.size(); i++) {
@@ -106,12 +106,12 @@ public class RecursiveUtil {
     }
 
     //获取当前搜索项目定义号的停电范围
-    public static HashSet<String> getProjectScopeList(List<Project> areProject){
+    public static HashSet<String> getProjectScopeList(List<Project1> areProject){
         HashSet<String> setProject = new HashSet<String>();
         String[] arrayProject = null;
         String projectScope = "";
-        for (Project project:areProject){
-            if (null!=project.getPowerScope()){
+        for (Project1 project : areProject){
+            if (null!= project.getPowerScope()){
                 projectScope = project.getPowerScope();
                 if (projectScope.contains("；")){
                     arrayProject = projectScope.split("；");
@@ -141,10 +141,10 @@ public class RecursiveUtil {
         return setProject;
     }
     //获取查找的集合
-    public static List<Project> getThereAreProject(List<Project> projects,List<String> projectNumbers){
-        List<Project> projectList = new ArrayList<Project>();
+    public static List<Project1> getThereAreProject(List<Project1> projects, List<String> projectNumbers){
+        List<Project1> projectList = new ArrayList<Project1>();
         for (String string:projectNumbers){
-            for (Project project:projects){
+            for (Project1 project : projects){
                 if (string.equals(project.getProjectNumber())){
                     projectList.add(project);
                     break;
@@ -154,17 +154,17 @@ public class RecursiveUtil {
         return projectList;
     }
     //list project去重
-    public static List<Project> getDuplicateRemoval(List<Project> projects){
-        List<Project> projectList = new ArrayList<Project>();
+    public static List<Project1> getDuplicateRemoval(List<Project1> projects){
+        List<Project1> projectList = new ArrayList<Project1>();
         boolean flag = false;
         String projectNumber = "";
         String newProjectNumber = "";
-        for(Project project:projects){
-            if (null!=project.getProjectNumber()&&!"".equals(project.getProjectNumber())){
+        for(Project1 project : projects){
+            if (null!= project.getProjectNumber()&&!"".equals(project.getProjectNumber())){
                 flag = true;
                 projectNumber = project.getProjectNumber();
-                for (Project newProject:projectList){
-                    if (null!=newProject.getProjectNumber()&&!"".equals(newProject.getProjectNumber())){
+                for (Project1 newProject : projectList){
+                    if (null!= newProject.getProjectNumber()&&!"".equals(newProject.getProjectNumber())){
                         newProjectNumber = newProject.getProjectNumber();
                         if (projectNumber.equals(newProjectNumber)){
                             flag = false;

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/util/TreeTableUtil.java

@@ -4,8 +4,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProjectTemporary;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.hibernate.validator.constraints.EAN;
 
 import java.text.SimpleDateFormat;
 import java.util.*;

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/web/ConstructionProjectController.java

@@ -13,7 +13,7 @@ import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.Constr
 import com.jeeplus.modules.sg.managementcenter.constructionProject.service.ConstructionProjectService;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.service.ConstructionProjectTemporaryService;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.util.*;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,10 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -92,13 +89,13 @@ public class ConstructionProjectController extends BaseController {
 	public String form(ConstructionProject constructionProject, Model model) {
 		model.addAttribute("constructionProject", constructionProject);
         List<String> projectNumber = constructionProjectService.getProjectNumber(constructionProject);
-        List<Project> projectList = constructionProjectService.allListProject(constructionProject);
+        List<Project1> projectList = constructionProjectService.allListProject(constructionProject);
         //1
-        List<Project> listProject = constructionProjectService.findListAllProject(projectList,constructionProject);
+        List<Project1> listProject = constructionProjectService.findListAllProject(projectList,constructionProject);
         //2
-        List<Project> allProjectNo = constructionProjectService.getAllProjectNo(projectList,constructionProject);
+        List<Project1> allProjectNo = constructionProjectService.getAllProjectNo(projectList,constructionProject);
         constructionProjectTemporaryService.deleteAll();
-        if (null!=listProject&&listProject.size()>0) {
+        if (null!= listProject && listProject.size()>0) {
             //1
             List<ConstructionProjectTemporary> constructionProjectTemporary = constructionProjectTemporaryService.getConstructionProjectPowerLine(listProject,constructionProject.getArrangeTime(),"2","1");
             //2
@@ -146,10 +143,10 @@ public class ConstructionProjectController extends BaseController {
 			constructionProject.setRemarks(projectTemporary.getHtmlStatus());
 			constructionProjectList.add(constructionProject);
 		}
-		Project project = null;
-		List<Project> projectList = new ArrayList<Project>();
+		Project1 project = null;
+		List<Project1> projectList = new ArrayList<Project1>();
 		for (ConstructionProject constructionProject1:constructionProjectList){
-		    project = new Project();
+		    project = new Project1();
 		    project.setProjectNumber(constructionProject1.getProjectNumber());
 		    project.setRezkey("1");
 		    projectList.add(project);

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/web/ConstructionProjectTemporaryController.java

@@ -12,13 +12,8 @@ import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.Constr
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProjectTemporary;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.service.ConstructionProjectService;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.service.ConstructionProjectTemporaryService;
-import com.jeeplus.modules.sg.managementcenter.constructionProject.util.ImportProUtil;
-import com.jeeplus.modules.sg.managementcenter.constructionProject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.util.Result;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.util.TreeTableUtil;
-import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -26,7 +21,6 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/jeeplus/modules/sg/managementcenter/materialInventory/web/MaterialInventoryController.java

@@ -5,15 +5,10 @@ package com.jeeplus.modules.sg.managementcenter.materialInventory.web;
 
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.websocket.service.system.SystemInfoSocketHandler;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.oa.entity.OaNotify;
-import com.jeeplus.modules.oa.entity.OaNotifyMaterial;
-import com.jeeplus.modules.oa.entity.OaNotifyRecord;
 import com.jeeplus.modules.oa.service.OaNotifyMaterialService;
 import com.jeeplus.modules.oa.service.OaNotifyService;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
@@ -22,13 +17,9 @@ import com.jeeplus.modules.sg.managementcenter.materialInventory.service.Materia
 import com.jeeplus.modules.sg.managementcenter.materialInventory.util.ImportPro;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.util.ImportUtil;
 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.ProjectAcquisition;
 import com.jeeplus.modules.sg.managementcenter.project.service.PickingRequisitionService;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sg.managementcenter.project.util.PickingInfo;
-import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
-import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +31,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -264,12 +253,12 @@ public class MaterialInventoryController extends BaseController {
 			 */
 			//获取需求数量和已出库数量都一致领料单集合
 			List<PickingRequisition> changePicking = PickingInfo.getChangePicking(judgePicking);
-			if (null!=changePicking&&changePicking.size()>0){
-				List<Project> listProjectPicking1 = projectService.findListProjectPicking(changePicking);
-				for (Project project:listProjectPicking1){
-					projectService.getUpdateAcquisitionStatus("2",project.getId());
+/*			if (null!=changePicking&&changePicking.size()>0){
+				List<Project> listProject1Picking1 = projectService.findListProjectPicking(changePicking);
+				for (Project project1 : listProject1Picking1){
+					projectService.getUpdateAcquisitionStatus("2", project1.getId());
 				}
-			}
+			}*/
 			/*
 				发送通知方法集合
 			 */
@@ -278,14 +267,14 @@ public class MaterialInventoryController extends BaseController {
 			//去重
 			List<PickingRequisition> duplicate = PickingInfo.getDuplicateRemoval(notifyPickingRequisitions);
 			//根据项目定义号去项目表中查找项目信息
-			List<Project> listProjectPicking = projectService.findListProjectPicking(duplicate);
-			if (null!=listProjectPicking&&listProjectPicking.size()>0){
+//			List<Project> listProject1Picking = projectService.findListProjectPicking(duplicate);
+			/*if (null!= listProject1Picking && listProject1Picking.size()>0){
 				//根据项目的id去数据库中查找项目领导审核时间
-				List<Acquisition> findListDate = pickingRequisitionService.getFindListDate(listProjectPicking);
+				List<Acquisition> findListDate = pickingRequisitionService.getFindListDate(listProject1Picking);
 				if (null!=findListDate&&findListDate.size()>0){
 					List<Acquisition> sureFindListDate = PickingInfo.getSureFindListDate(findListDate);
 					//得到整合后的list集合（存在项目信息）
-					List<ProjectAcquisition> listProjectAcquisition = PickingInfo.getListProjectAcquisition(listProjectPicking, sureFindListDate);
+					List<ProjectAcquisition> listProjectAcquisition = PickingInfo.getListProjectAcquisition(listProject1Picking, sureFindListDate);
 
 					//得到和项目表匹配的pickAcquisition的集合同时判断给超过三天的领料做标识
 					List<PickingRequisition> listSameSetOf = PickingInfo.getListSameSetOf(listProjectAcquisition, listPickRequisition);
@@ -378,7 +367,7 @@ public class MaterialInventoryController extends BaseController {
 					}
 
 				}
-			}
+			}*/
 			if (str.length()<=0){
 				str+="暂无通知！";
 			}

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

@@ -166,21 +166,7 @@
 		UPDATE xm_material_data SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks},
-			start_date = #{startDate},
-			project_id = #{projectId},
-			end_date = #{endDate},
-			approval_number = #{approvalNumber},
-			building_fee = #{buildingFee},
-			install_fee = #{installFee},
-			equipment_fee = #{equipmentFee},
-			material_fee = #{materialFee},
-			design_fee = #{designFee},
-			supervision_fee = #{supervisionFee},
-			preliminaryWork_fee = #{preliminaryWorkFee},
-			damages = #{damages},
-			management_fee = #{managementFee},
-			total_fee = #{totalFee}
+			remarks = #{remarks}
 		WHERE id = #{id}
 	</update>
 	

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

@@ -88,7 +88,7 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 	public void export(MultipartFile file,String batch,String itemBatch) throws IOException, InvalidFormatException {
 		ImportExcel mo = new ImportExcel(file,1,"模块表");
 		ImportExcel importExcel = new ImportExcel(file,1,"领料清单");
-		Row row = mo.getRow(0);
+			Row row = mo.getRow(0);
 		String projectNam1 = (String) mo.getCellValue(row, 1);
 		String projectName = projectNam1.trim();
 		MaterialProject materialProject1 = new MaterialProject();
@@ -106,8 +106,6 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		saveList(list);
 		MaterialProject materialProject = new MaterialProject();
 		materialProject.setReserveProjectName(projectName);
-		materialProject.setSuppliesBatch(batch);
-		materialProject.setProjectBatch(itemBatch);
         materialProjectService.save(materialProject);
 	}
 

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialInfoController.java

@@ -87,9 +87,7 @@ public class MaterialInfoController extends BaseController {
 			materialInfo1.setProjectName(materialInfo.getProjectName());
 			MaterialProject materialProject =  new MaterialProject();
 			materialProject.setProjectStatus("");
-			materialProject.setProjectCode(materialInfo.getProjectCode());
 			materialProject.setReserveCode(materialInfo.getReserveCode());
-			materialProject.setProjectDefine(materialInfo.getProjectDefine());
 			MaterialProject materialProject1 = new MaterialProject();
 			materialProjectService.getSearch(materialProject,materialProject1);
 			List<MaterialProject> list = materialProjectService.findList(materialProject);

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/mapper/MaterialPlanMapper.java

@@ -5,11 +5,8 @@ package com.jeeplus.modules.sg.managementcenter.materialplan.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.InventoryTable;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/service/MaterialPlanService.java

@@ -5,12 +5,9 @@ package com.jeeplus.modules.sg.managementcenter.materialplan.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.InventoryTable;
 import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
 import com.jeeplus.modules.sg.managementcenter.materialplan.mapper.MaterialPlanMapper;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/jeeplus/modules/sg/managementcenter/materialplan/web/MeterialPlanController.java

@@ -14,10 +14,6 @@ import com.jeeplus.modules.sg.managementcenter.materialplan.entity.MaterialPlan;
 import com.jeeplus.modules.sg.managementcenter.materialplan.service.MaterialPlanService;
 import com.jeeplus.modules.sg.managementcenter.materialplan.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.materialplan.util.MaterialPlanInfo;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
-import com.jeeplus.modules.sg.managementcenter.project.util.ProExcelInfo;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +28,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/entity/MaterialProject.java

@@ -7,14 +7,28 @@ import java.io.Externalizable;
 import java.io.Serializable;
 
 public class MaterialProject extends DataEntity<MaterialProject>{
-    private String reserveProjectName;   //储备项目名称
-    private String projectName;       //项目名称
-    private String reserveCode;        //储备编码
-    private String projectCode;       //项目编码
-    private String projectDefine;     //项目定义
-    private String projectAttribute;   //项目属性
-    private String projectBatch;       //项目批次
-    private String suppliesBatch;       //物料批次
+    //储备项目名称
+    private String reserveProjectName;
+    //储备编码
+    private String reserveCode;
+    //项目类型
+    private String projectType;
+    //项目计划年度批次
+    private String batchPlan;
+    //项目正式发文批次
+    private String issuePlan;
+    //项目年度实施计划（月份）
+    private String monthPlan;
+    //年度计划有无预测
+    private String hasPlan;
+    //项目物资执行计划（上半年/下半年）
+    private String halfPlan;
+    //项目定义
+    private String projectId;
+    //项目名称
+    private String projectName;
+
+
 
     private String projectStatus;
 
@@ -72,48 +86,59 @@ public class MaterialProject extends DataEntity<MaterialProject>{
         this.reserveCode = reserveCode;
     }
 
-    @ExcelField(title="项目编码", align=2, sort=4)
-    public String getProjectCode() {
-        return projectCode;
+    public String getProjectType() {
+        return projectType;
     }
 
-    public void setProjectCode(String projectCode) {
-        this.projectCode = projectCode;
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
     }
 
-    @ExcelField(title="项目定义", align=2, sort=5)
-    public String getProjectDefine() {
-        return projectDefine;
+    public String getBatchPlan() {
+        return batchPlan;
     }
 
-    public void setProjectDefine(String projectDefine) {
-        this.projectDefine = projectDefine;
+    public void setBatchPlan(String batchPlan) {
+        this.batchPlan = batchPlan;
     }
 
-    @ExcelField(title="项目属性", align=2, sort=6)
-    public String getProjectAttribute() {
-        return projectAttribute;
+    public String getIssuePlan() {
+        return issuePlan;
     }
 
-    public void setProjectAttribute(String projectAttribute) {
-        this.projectAttribute = projectAttribute;
+    public void setIssuePlan(String issuePlan) {
+        this.issuePlan = issuePlan;
     }
 
-    @ExcelField(title="项目批次", align=2, sort=7)
-    public String getProjectBatch() {
-        return projectBatch;
+    public String getMonthPlan() {
+        return monthPlan;
     }
 
-    public void setProjectBatch(String projectBatch) {
-        this.projectBatch = projectBatch;
+    public void setMonthPlan(String monthPlan) {
+        this.monthPlan = monthPlan;
     }
 
-    public String getSuppliesBatch() {
-        return suppliesBatch;
+    public String getHasPlan() {
+        return hasPlan;
     }
 
-    public void setSuppliesBatch(String suppliesBatch) {
-        this.suppliesBatch = suppliesBatch;
+    public void setHasPlan(String hasPlan) {
+        this.hasPlan = hasPlan;
     }
 
+    public String getHalfPlan() {
+        return halfPlan;
+    }
+
+    public void setHalfPlan(String halfPlan) {
+        this.halfPlan = halfPlan;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/MaterialProjectMapper.java

@@ -18,5 +18,9 @@ public interface MaterialProjectMapper extends BaseMapper<MaterialProject> {
 
     Integer insertList(@Param("list") List<MaterialProject> list);
 
-    Integer replaceList(@Param("list") List<MaterialProject> list);
+    Integer replaceList(List<MaterialProject> list);
+
+    List<String> findAllReserveName();
+
+    void updateList(List<MaterialProject> materialProjectList);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml

@@ -1,301 +1,311 @@
 <?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.managementcenter.materialproject.mapper.MaterialProjectMapper">
-    
-	<sql id="infoColumns">
-		a.id AS "id",
+
+    <sql id="infoColumns">
+        a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
-		a.reserve_project_name AS "reserveProjectName",
-		a.project_name AS "projectName",
-		a.reserve_code AS "reserveCode",
-		a.project_code AS "projectCode",
-		a.project_define AS "projectDefine",
-		a.project_attribute AS "projectAttribute",
-		a.project_batch AS "projectBatch"
-	</sql>
+		a.reserveProjectName,
+		a.reserveCode,
+		a.projectType,
+		a.batchPlan,
+		a.issuePlan,
+		a.monthPlan,
+		a.hasPlan,
+		a.halfPlan,
+		a.projectName,
+		a.projectId
+    </sql>
+
+
+    <select id="get" resultType="MaterialProject">
+        SELECT
+        <include refid="infoColumns"/>
+        FROM xm_material_project a
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="MaterialProject">
+        SELECT
+        <include refid="infoColumns"/>
+        FROM xm_material_project a
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            ${dataScope}
+            <if test="reserveCodes != null ">
+                AND a.reserve_code in
+                <foreach collection="reserveCodes" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="projectCodes != null ">
+                AND a.project_code in
+                <foreach collection="projectCodes" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="reserveProjectName != null and reserveProjectName != ''">
+                AND a.reserveProjectName LIKE CONCAT(CONCAT('%',#{reserveProjectName},'%'))
+            </if>
+            <if test="reserveCode != null and reserveCode != ''">
+                AND a.reserveCode = #{reserveCode}
+            </if>
+            <if test="projectType != null and projectType != ''">
+                AND a.projectType = #{projectType}
+            </if>
+            <if test="batchPlan != null and batchPlan != ''">
+                AND a.reserveCode = #{batchPlan}
+            </if>
+            <if test="issuePlan != null and issuePlan != ''">
+                AND a.issuePlan = #{issuePlan}
+            </if>
+            <if test="monthPlan != null and monthPlan != ''">
+                AND a.monthPlan = #{monthPlan}
+            </if>
+            <if test="hasPlan != null and hasPlan != ''">
+                AND a.hasPlan = #{hasPlan}
+            </if>
+            <if test="halfPlan != null and halfPlan != ''">
+                AND a.halfPlan = #{halfPlan}
+            </if>
+            <if test="projectId != null and projectId != ''">
+                AND a.projectId = #{projectId}
+            </if>
+            <if test="projectName != null and projectName != ''">
+                AND a.projectName = #{projectName}
+            </if>
+        </where>
+        <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>
+
+    <select id="findByList" resultType="com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject">
+        SELECT
+        <include refid="infoColumns"/>
+        FROM xm_material_project a
+        <where>
+            a.reserveProjectName in
+            <foreach collection="list" item="item" open="(" close=")" separator=",">
+                #{item.reserveProjectName}
+            </foreach>
+        </where>
+    </select>
+
+    <select id="findAllList" resultType="MaterialProject">
+        SELECT
+        <include refid="infoColumns"/>
+        FROM xm_material_project a
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            ${dataScope}
+        </where>
+        <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>
+
+    <select id="findBatch" resultType="com.jeeplus.modules.sg.managementcenter.materialproject.entity.MaterialProject">
+        SELECT DISTINCT(batch) AS suppliesBatch
+        from xm_material_standard
+    </select>
+
+    <insert id="insert">
+        INSERT INTO xm_material_project(id,
+                                        create_by,
+                                        create_date,
+                                        update_by,
+                                        update_date,
+                                        remarks,
+                                        del_flag,
+                                        reserveProjectName,
+                                        reserveCode,
+                                        projectType,
+                                        batchPlan,
+                                        issuePlan,
+                                        monthPlan,
+                                        hasPlan,
+                                        halfPlan,
+                                        projectName,
+                                        projectId)
+        VALUES (#{id},
+                #{createBy.id},
+                #{createDate},
+                #{updateBy.id},
+                #{updateDate},
+                #{remarks},
+                '0',
+                #{reserveProjectName},
+                #{reserveCode},
+                #{projectType},
+                #{batchPlan},
+                #{issuePlan},
+                #{monthPlan},
+                #{hasPlan},
+                #{halfPlan},
+                #{projectName},
+                #{projectId})
+    </insert>
+
+    <insert id="insertList">
+        INSERT INTO xm_material_project(
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        remarks,
+        del_flag,
+        reserveProjectName,
+        reserveCode,
+        projectType,
+        batchPlan,
+        issuePlan,
+        monthPlan,
+        hasPlan,
+        halfPlan,
+        projectName,
+        projectId
+        ) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.id},
+            #{item.createBy.id},
+            #{item.createDate},
+            #{item.updateBy.id},
+            #{item.updateDate},
+            #{item.remarks},
+            '0',
+            #{item.reserveProjectName},
+            #{item.reserveCode},
+            #{item.projectType},
+            #{item.batchPlan},
+            #{item.issuePlan},
+            #{item.monthPlan},
+            #{item.hasPlan},
+            #{item.halfPlan},
+            #{item.projectName},
+            #{item.projectId}
+            )
+        </foreach>
+    </insert>
+
+    <insert id="replaceList">
+        replace INTO xm_material_project(
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        del_flag,
+        remarks,
+        reserveProjectName,
+        reserveCode,
+        projectType,
+        batchPlan,
+        issuePlan,
+        monthPlan,
+        hasPlan,
+        halfPlan,
+        projectName,
+        projectId
+        ) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.id},
+            #{item.createBy.id},
+            #{item.createDate},
+            #{item.updateBy.id},
+            #{item.updateDate},
+            '0',
+            #{item.remarks},
+            #{item.reserveProjectName},
+            #{item.reserveCode},
+            #{item.projectType},
+            #{item.batchPlan},
+            #{item.issuePlan},
+            #{item.monthPlan},
+            #{item.hasPlan},
+            #{item.halfPlan},
+            #{item.projectName},
+            #{item.projectId}
+            )
+        </foreach>
+    </insert>
+    <update id="update">
+        UPDATE xm_material_project
+        SET update_by          = #{updateBy.id},
+            update_date        = #{updateDate},
+            reserveProjectName = #{reserveProjectName},
+            reserveCode        = #{reserveCode},
+            projectType        = #{projectType},
+            batchPlan          = #{batchPlan},
+            issuePlan          = #{issuePlan},
+            monthPlan          = #{monthPlan},
+            hasPlan            = #{hasPlan},
+            halfPlan           = #{halfPlan},
+            projectName        = #{projectName},
+            projectId          = #{projectId}
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateList">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update xm_material_project
+            set
+            reserveCode = #{item.reserveCode},
+            projectType = #{item.projectType},
+            batchPlan = #{item.batchPlan},
+            issuePlan = #{item.issuePlan},
+            monthPlan = #{item.monthPlan},
+            hasPlan = #{item.hasPlan},
+            halfPlan = #{item.halfPlan},
+            projectName = #{item.projectName},
+            projectId = #{item.projectId}
+            where reserveProjectName = #{item.reserveProjectName}
+        </foreach>
+    </update>
+
+    <!--物理删除-->
+    <update id="delete">
+        DELETE
+        FROM xm_material_project
+        WHERE id = #{id}
+    </update>
+
+    <!--逻辑删除-->
+    <update id="deleteByLogic">
+        UPDATE xm_material_project
+        SET del_flag = #{DEL_FLAG_DELETE}
+        WHERE id = #{id}
+    </update>
 
-    
-	<select id="get" resultType="MaterialProject" >
-		SELECT 
-			<include refid="infoColumns"/>
-		FROM xm_material_project a
-		WHERE a.id = #{id}
-	</select>
-	
-	<select id="findList" resultType="MaterialProject" >
-		SELECT 
-			<include refid="infoColumns"/>
-		FROM xm_material_project a
-		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
-			${dataScope}
-			<if test="projectStatus == '' ">
-				<if test="reserveCodes != null ">
-					AND a.reserve_code in
-					<foreach collection="reserveCodes" index="index" item="item" open="(" separator="," close=")">
-						#{item}
-					</foreach>
-				</if>
-				<if test="projectCodes != null ">
-					AND a.project_code in
-					<foreach collection="projectCodes" index="index" item="item" open="(" separator="," close=")">
-						#{item}
-					</foreach>
-				</if>
-				<if test="reserveProjectName != null and reserveProjectName != ''">
-					AND a.reserve_project_name LIKE CONCAT(CONCAT('%',#{reserveProjectName},'%'))
-				</if>
-				<if test="projectName != null and projectName != ''">
-					AND a.project_name LIKE CONCAT(CONCAT('%',#{projectName},'%'))
-				</if>
-				<if test="reserveCode != null and reserveCode != ''">
-					AND a.reserve_code LIKE CONCAT(CONCAT('%',#{reserveCode},'%'))
-				</if>
-				<if test="projectCode != null and projectCode != ''">
-					AND a.project_code LIKE CONCAT(CONCAT('%',#{projectCode},'%'))
-				</if>
-				<if test="projectDefine != null and projectDefine !=''">
-					AND a.project_define LIKE CONCAT(CONCAT('%',#{projectDefine},'%'))
-				</if>
-				<if test="projectAttribute != null and projectAttribute != ''">
-					AND a.project_attribute LIKE CONCAT(CONCAT('%',#{projectAttribute},'%'))
-				</if>
-				<if test="projectBatch != null and projectBatch != ''">
-					AND a.project_batch LIKE CONCAT(CONCAT('%',#{projectBatch},'%'))
-				</if>
-				<if test="suppliesBatch != null and suppliesBatch !=''">
-					AND a.supplies_batch LIKE CONCAT(CONCAT('%',#{suppliesBatch},'%'))
-				</if>
-			</if>
-			<if test="projectStatus != '' ">
-				<if test="reserveCodes != null ">
-					AND a.reserve_code in
-					<foreach collection="reserveCodes" index="index" item="item" open="(" separator="," close=")">
-						#{item}
-					</foreach>
-				</if>
-				<if test="projectCodes != null ">
-					AND a.project_code in
-					<foreach collection="projectCodes" index="index" item="item" open="(" separator="," close=")">
-						#{item}
-					</foreach>
-				</if>
-				<if test="reserveProjectName != null and reserveProjectName != ''">
-					AND a.reserve_project_name =  #{reserveProjectName}
-				</if>
-				<if test="projectName != null and projectName != ''">
-					AND a.project_name = #{projectName}
-				</if>
-				<if test="reserveCode != null and reserveCode != ''">
-					AND a.reserve_code = #{reserveCode}
-				</if>
-				<if test="projectCode != null and projectCode != ''">
-					AND a.project_code = #{projectCode}
-				</if>
-				<if test="projectDefine != null and projectDefine !=''">
-					AND a.project_define = #{projectDefine}
-				</if>
-				<if test="projectAttribute != null and projectAttribute != ''">
-					AND a.project_attribute = #{projectAttribute}
-				</if>
-				<if test="projectBatch != null and projectBatch != ''">
-					AND a.project_batch = #{projectBatch}
-				</if>
-				<if test="suppliesBatch != null and suppliesBatch !=''">
-					AND a.supplies_batch = #{suppliesBatch}
-				</if>
-			</if>
-		</where>
-		<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>
 
-	<select id="findByList" resultType="MaterialProject">
-		SELECT
-		<include refid="infoColumns"/>
-		FROM xm_material_project a
-		<where>
-			a.reserve_project_name in
-			<foreach collection="list" item="item" open="(" close=")" separator=",">
-				#{item.reserveProjectName}
-			</foreach>
-		</where>
-	</select>
-	
-	<select id="findAllList" resultType="MaterialProject" >
-		SELECT 
-			<include refid="infoColumns"/>
-		FROM xm_material_project a
-		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
-			${dataScope}
-		</where>		
-		<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>
-	
-	<select id="findBatch" resultType="MaterialProject">
-		SELECT DISTINCT(batch) AS suppliesBatch
-		from  xm_material_standard
-	</select>
-	
-	<insert id="insert">
-		INSERT INTO xm_material_project(
-			id,
-			create_by,
-			create_date,
-			update_by,
-			update_date,
-			remarks,
-			del_flag,
-			reserve_project_name,
-		    project_name,
-		    reserve_code,
-		    project_code,
-		    project_define,
-		    project_attribute,
-		    project_batch
-		) VALUES (
-			#{id},
-			#{createBy.id},
-			#{createDate},
-			#{updateBy.id},
-			#{updateDate},
-			#{remarks},
-			#{delFlag},
-			#{reserveProjectName},
-			#{projectName},
-			#{reserveCode},
-			#{projectCode},
-			#{projectDefine},
-			#{projectAttribute},
-			#{projectBatch}
-		)
-	</insert>
+    <!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+    <select id="findUniqueByProperty" resultType="TestNote" statementType="STATEMENT">
+        select *
+        FROM xm_material_project
+        where ${propertyName} = '${value}'
+    </select>
 
-	<insert id="insertList">
-		INSERT INTO xm_material_project(
-		id,
-		create_by,
-		create_date,
-		update_by,
-		update_date,
-		remarks,
-		del_flag,
-		reserve_project_name,
-		project_name,
-		reserve_code,
-		project_code,
-		project_define,
-		project_attribute,
-		project_batch
-		) VALUES
-		<foreach collection="list" item="item" index="index" separator=",">
-		  (
-			#{item.id},
-			#{item.createBy.id},
-			#{item.createDate},
-			#{item.updateBy.id},
-			#{item.updateDate},
-			#{item.remarks},
-			#{item.delFlag},
-			#{item.reserveProjectName},
-			#{item.projectName},
-			#{item.reserveCode},
-			#{item.projectCode},
-			#{item.projectDefine},
-			#{item.projectAttribute},
-			#{item.projectBatch}
-		  )
-		</foreach>
-	</insert>
+    <select id="findAllReserveName" resultType="java.lang.String">
+        select reserveProjectName
+        from xm_material_project
+    </select>
 
-	<insert id="replaceList">
-		replace INTO xm_material_project(
-		id,
-		create_by,
-		create_date,
-		update_by,
-		update_date,
-		remarks,
-		del_flag,
-		reserve_project_name,
-		project_name,
-		reserve_code,
-		project_code,
-		project_define,
-		project_attribute,
-		project_batch
-		) VALUES
-		<foreach collection="list" item="item" index="index" separator=",">
-			(
-			#{item.id},
-			#{item.createBy.id},
-			#{item.createDate},
-			#{item.updateBy.id},
-			#{item.updateDate},
-			#{item.remarks},
-			#{item.delFlag},
-			#{item.reserveProjectName},
-			#{item.projectName},
-			#{item.reserveCode},
-			#{item.projectCode},
-			#{item.projectDefine},
-			#{item.projectAttribute},
-			#{item.projectBatch}
-			)
-		</foreach>
-	</insert>
-	<update id="update">
-		UPDATE xm_material_project SET
-			update_by = #{updateBy.id},
-			update_date = #{updateDate},
-			remarks = #{remarks},
-			reserve_project_name = #{reserveProjectName},
-			project_name = #{projectName},
-			reserve_code = #{reserveCode},
-			project_code = #{projectCode},
-			project_define = #{projectDefine},
-			project_attribute = #{projectAttribute},
-			project_batch = #{projectBatch}
-		WHERE id = #{id}
-	</update>
-	
-	
-	<!--物理删除-->
-	<update id="delete">
-		DELETE FROM xm_material_project
-		WHERE id = #{id}
-	</update>
-	
-	<!--逻辑删除-->
-	<update id="deleteByLogic">
-		UPDATE xm_material_project SET
-			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
-	</update>
-	
-	
-	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
-	<select id="findUniqueByProperty" resultType="TestNote" statementType="STATEMENT">
-		select * FROM xm_material_project  where ${propertyName} = '${value}'
-	</select>
-	
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java

@@ -54,14 +54,7 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		super.delete(materialProject);
 		materialInfoService.deleteByPro(materialProject.getReserveProjectName());
 	}
-	//文件导入
-	@Transactional(readOnly = false)
-	public void savaList(List<MaterialProject> list){
-		for (MaterialProject materialProject:list){
-			materialProject.preInsert();
-		}
-		materialProjectMapper.insertList(list);
-	}
+
 	//文件导入
 	@Transactional(readOnly = false)
 	public void replaceList(List<MaterialProject> list){
@@ -72,7 +65,6 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 	}
 	public void getSearch(MaterialProject materialProject,MaterialProject materialProject1){
 		String reserveCode = materialProject.getReserveCode();
-		String projectCode = materialProject.getProjectCode();
 		if (StringUtils.isNotBlank(reserveCode)){
 			String[] reserveCodes= reserveCode.split("\\s+");
 			if(reserveCodes.length == 1){
@@ -82,23 +74,10 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 				materialProject.setReserveCode("");
 			}
 		}
-		if (StringUtils.isNotBlank(projectCode)){
-			String[] projectCodes = projectCode.split("\\s+");
-			if(projectCodes.length == 1){
-				materialProject.setProjectCode(projectCodes[0]);
-			}else {
-				materialProject.setProjectCodes(projectCodes);
-				materialProject.setProjectCode("");
-			}
-		}
 		materialProject1.setProjectStatus("");
 		materialProject1.setReserveProjectName(materialProject.getReserveProjectName());
 		materialProject1.setProjectName(materialProject.getProjectName());
-		materialProject1.setProjectCode(materialProject.getProjectCode());
 		materialProject1.setReserveCode(materialProject.getReserveCode());
-		materialProject1.setProjectAttribute(materialProject.getProjectAttribute());
-		materialProject1.setProjectDefine(materialProject.getProjectDefine());
-		materialProject1.setProjectBatch(materialProject.getProjectBatch());
 		materialProject1.setReserveCodes(materialProject.getReserveCodes());
 		materialProject1.setProjectCodes(materialProject.getProjectCodes());
 		String strProject = "";
@@ -108,21 +87,9 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		if (null!=materialProject.getProjectName()&&!materialProject.getProjectName().equals("")){
 			strProject+=materialProject.getReserveProjectName()+",";
 		}
-		if (null!=materialProject.getProjectCode()&&!materialProject.getProjectCode().equals("")){
-			strProject+=materialProject.getProjectCode()+",";
-		}
 		if (null!=materialProject.getReserveCode()&&!materialProject.getReserveCode().equals("")){
 			strProject+=materialProject.getReserveCode()+",";
 		}
-		if (null!=materialProject.getProjectAttribute()&&!materialProject.getProjectAttribute().equals("")){
-			strProject+=materialProject.getProjectAttribute()+",";
-		}
-		if (null!=materialProject.getProjectDefine()&&!materialProject.getProjectDefine().equals("")){
-			strProject+=materialProject.getProjectDefine()+",";
-		}
-		if (null!=materialProject.getProjectBatch()&&!materialProject.getProjectBatch().equals("")){
-			strProject+=materialProject.getProjectBatch()+",";
-		}
 		if (null!=materialProject.getProjectCodes()){
 			strProject+=materialProject.getProjectCodes();
 		}
@@ -136,4 +103,13 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		}
 	}
 
+	public List<String> findAllReserveName() {
+		return materialProjectMapper.findAllReserveName();
+	}
+
+	@Transactional(readOnly = false)
+	public void updateList(List<MaterialProject> materialProjectList) {
+		materialProjectMapper.updateList(materialProjectList);
+	}
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/util/MaterialProUtil.java

@@ -18,20 +18,21 @@ public  class MaterialProUtil {
         int lastRow = importUtil.getLastDataRowNum();
         List<MaterialProject> list = new ArrayList<MaterialProject>();
         MaterialProject materialProject = null;
-        String costEstimate="";//费用估算
         for(int i=1; i<=lastRow;i++){
             materialProject = new MaterialProject();
             Row row = importUtil.getRow(i);
             String reserveProjectName = (String) importUtil.getCellValue(row,0);
             if(StringUtils.isNotBlank(reserveProjectName)) {
                 materialProject.setReserveProjectName(reserveProjectName);
-                materialProject.setProjectName((String)importUtil.getCellValue(row,1));//项目名称
-                materialProject.setReserveCode((String)importUtil.getCellValue(row,2));//储备编码
-                materialProject.setProjectCode((String)importUtil.getCellValue(row,3));//项目编码
-                materialProject.setProjectDefine((String)importUtil.getCellValue(row,4));//项目定义
-                materialProject.setProjectAttribute((String)importUtil.getCellValue(row,5));//项目属性
-                materialProject.setProjectBatch((String)importUtil.getCellValue(row,6));//项目批次
-//                materialProject.setSuppliesBatch((String)importUtil.getCellValue(row,7));//物料批次
+                materialProject.setReserveCode((String)importUtil.getCellValue(row,1));//项目名称
+                materialProject.setProjectType((String)importUtil.getCellValue(row,2));
+                materialProject.setBatchPlan((String)importUtil.getCellValue(row,3));
+                materialProject.setIssuePlan((String)importUtil.getCellValue(row,4));
+                materialProject.setMonthPlan((String)importUtil.getCellValue(row,5));
+                materialProject.setHasPlan((String)importUtil.getCellValue(row,6));
+                materialProject.setHalfPlan((String)importUtil.getCellValue(row,7));
+                materialProject.setProjectId((String)importUtil.getCellValue(row,8));
+                materialProject.setProjectName((String)importUtil.getCellValue(row,9));
                 list.add(materialProject);
             }
         }

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/web/MaterialProjectController.java

@@ -165,9 +165,8 @@ public class MaterialProjectController extends BaseController {
 		try {
             String fileName = "物料"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
 			List<MaterialProject> list = new ArrayList<MaterialProject>();
-			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")||!materialProject1.getProjectCode().equals("")||
-					!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")
-			||null!=materialProject1.getReserveCodes()||null!=materialProject1.getProjectCodes()){
+			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")
+					||!materialProject1.getReserveCode().equals("")||null!=materialProject1.getReserveCodes()||null!=materialProject1.getProjectCodes()){
 				list = materialProjectService.findList(materialProject1);
 			}else {
 				list = materialProjectService.findList(materialProject);
@@ -202,9 +201,8 @@ public class MaterialProjectController extends BaseController {
 			String fileName = "项目表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
 //			Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response, -1), materialProject);
 			List<MaterialProject> list = null;
-			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")||!materialProject1.getProjectCode().equals("")||
-			!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")
-			||null!=materialProject1.getReserveCodes()||null!=materialProject1.getProjectCodes()){
+			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")
+					||!materialProject1.getReserveCode().equals("")||null!=materialProject1.getReserveCodes()||null!=materialProject1.getProjectCodes()){
 				list = materialProjectService.findList(materialProject1);
 			}else {
 				list = materialProjectService.findList(materialProject);
@@ -231,15 +229,25 @@ public class MaterialProjectController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		try {
 			ImportUtil importUtil = new ImportUtil(file, 0, 0);
-			Boolean materialProjectFlag = MaterialProUtil.getMaterialProjectFlag(importUtil);
-			if (materialProjectFlag){
-				j.setSuccess(false);
-				j.setMsg("表不符合规范");
+//			Boolean materialProjectFlag = MaterialProUtil.getMaterialProjectFlag(importUtil);
+			List<MaterialProject> materialProjects = MaterialProUtil.getProjectUtil(importUtil);
+			List<MaterialProject> updateList = new ArrayList<>();
+			List<String> allReserveName = materialProjectService.findAllReserveName();
+			if (allReserveName.size()<=0) {
+				j.setSuccess(true);
 				return j;
 			}
-			List<MaterialProject> materialProjects = MaterialProUtil.getProjectUtil(importUtil);
-			materialProjectService.replaceList(materialProjects);
-			j.setMsg( "已成功导入 "+materialProjects.size()+" 条项目表单记录");
+			for (MaterialProject m:materialProjects) {
+				for (String s: allReserveName) {
+					if (s.trim().equals(m.getReserveProjectName().trim())) {
+						updateList.add(m);
+					}
+				}
+			}
+			if (updateList.size() > 0) {
+				materialProjectService.updateList(updateList);
+			}
+			j.setMsg( "已成功导入 "+updateList.size()+" 条项目表单记录");
 		} catch (Exception e) {
 			j.setSuccess(false);
 			j.setMsg("导入项目表单失败！失败信息："+e.getMessage());

src/main/java/com/jeeplus/modules/sg/managementcenter/privilegePre/web/PrivilegePreController.java

@@ -7,8 +7,6 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.managementcenter.privilegePre.entity.PrivilegePre;
 import com.jeeplus.modules.sg.managementcenter.privilegePre.service.PrivilegePreService;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

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

@@ -0,0 +1,124 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+
+public class Approval {
+    //储备项目名称
+    private String projectId;
+    //对应项目包
+    private String projectPackage;
+    //项目发文预算
+    private String projectBudget;
+    //录入系统金额
+    private String enterSystemAmount;
+    //调概后金额
+    private String afterAmount;
+    //调概原因
+    private String adjustmentReasons;
+    //施工费
+    private String constructionCost;
+    //物资费
+    private String materialCost;
+    //设计费
+    private String designFee;
+    //监理费
+    private String supervisionFee;
+    //政策处理费
+    private String policyFee;
+    //其他费用
+    private String otherExpenses;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectPackage() {
+        return projectPackage;
+    }
+
+    public void setProjectPackage(String projectPackage) {
+        this.projectPackage = projectPackage;
+    }
+
+    public String getProjectBudget() {
+        return projectBudget;
+    }
+
+    public void setProjectBudget(String projectBudget) {
+        this.projectBudget = projectBudget;
+    }
+
+    public String getEnterSystemAmount() {
+        return enterSystemAmount;
+    }
+
+    public void setEnterSystemAmount(String enterSystemAmount) {
+        this.enterSystemAmount = enterSystemAmount;
+    }
+
+    public String getAfterAmount() {
+        return afterAmount;
+    }
+
+    public void setAfterAmount(String afterAmount) {
+        this.afterAmount = afterAmount;
+    }
+
+    public String getAdjustmentReasons() {
+        return adjustmentReasons;
+    }
+
+    public void setAdjustmentReasons(String adjustmentReasons) {
+        this.adjustmentReasons = adjustmentReasons;
+    }
+
+    public String getConstructionCost() {
+        return constructionCost;
+    }
+
+    public void setConstructionCost(String constructionCost) {
+        this.constructionCost = constructionCost;
+    }
+
+    public String getMaterialCost() {
+        return materialCost;
+    }
+
+    public void setMaterialCost(String materialCost) {
+        this.materialCost = materialCost;
+    }
+
+    public String getDesignFee() {
+        return designFee;
+    }
+
+    public void setDesignFee(String designFee) {
+        this.designFee = designFee;
+    }
+
+    public String getSupervisionFee() {
+        return supervisionFee;
+    }
+
+    public void setSupervisionFee(String supervisionFee) {
+        this.supervisionFee = supervisionFee;
+    }
+
+    public String getPolicyFee() {
+        return policyFee;
+    }
+
+    public void setPolicyFee(String policyFee) {
+        this.policyFee = policyFee;
+    }
+
+    public String getOtherExpenses() {
+        return otherExpenses;
+    }
+
+    public void setOtherExpenses(String otherExpenses) {
+        this.otherExpenses = otherExpenses;
+    }
+}

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

@@ -0,0 +1,276 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+/**
+ * 施工任务分配信息
+ * */
+public class Assignment {
+    //储备项目名称
+    private String reserveProjectName;
+    //交底类型
+    private String disclosureType;
+    //项目下达批次
+    private String projectReleaseBatch;
+    //正式图交付日期
+    private String deliveryDate;
+    //施工包号
+    private String packageNo;
+    //费率
+    private String rate;
+    //合同单位
+    private String assignedUnit;
+    //施工单位
+    private String constructionUnit;
+    //施工分包单位
+    private String constructionSubcontractor;
+    //甲方代表
+    private String behalf;
+    //施工单位物资专职
+    private String constructionFullTime;
+    //施工单位技经专职
+    private String constructionTechnical;
+    //施工项目经理
+    private String constructionManage;
+    //施工单位领导
+    private String constructionLeader;
+    //分包联系人
+    private String subcontractingContact;
+    //设计人员
+    private String designer;
+    //设计单位领导
+    private String designLeader;
+    //业主项目经理
+    private String ownerManager;
+    //配网工程专职
+    private String distribution;
+    //配网物资专职
+    private String distributionFullTime;
+    //配网系统维护专职
+    private String distributionSystem;
+    //配网政策处理
+    private String distributionPolicy;
+    //项目管理中心领导
+    private String centerLeader;
+    //项目管理中心技经专职
+    private String centerTechnical;
+    //经研所角色
+    private String instituteRole;
+    //运行单位业主代表
+    private String repUnit;
+    //运行单位运检专职
+    private String inspectionUnit;
+
+    public String getReserveProjectName() {
+        return reserveProjectName;
+    }
+
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getDisclosureType() {
+        return disclosureType;
+    }
+
+    public void setDisclosureType(String disclosureType) {
+        this.disclosureType = disclosureType;
+    }
+
+    public String getProjectReleaseBatch() {
+        return projectReleaseBatch;
+    }
+
+    public void setProjectReleaseBatch(String projectReleaseBatch) {
+        this.projectReleaseBatch = projectReleaseBatch;
+    }
+
+    public String getDeliveryDate() {
+        return deliveryDate;
+    }
+
+    public void setDeliveryDate(String deliveryDate) {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public String getPackageNo() {
+        return packageNo;
+    }
+
+    public void setPackageNo(String packageNo) {
+        this.packageNo = packageNo;
+    }
+
+    public String getRate() {
+        return rate;
+    }
+
+    public void setRate(String rate) {
+        this.rate = rate;
+    }
+
+    public String getAssignedUnit() {
+        return assignedUnit;
+    }
+
+    public void setAssignedUnit(String assignedUnit) {
+        this.assignedUnit = assignedUnit;
+    }
+
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+
+    public String getConstructionSubcontractor() {
+        return constructionSubcontractor;
+    }
+
+    public void setConstructionSubcontractor(String constructionSubcontractor) {
+        this.constructionSubcontractor = constructionSubcontractor;
+    }
+
+    public String getBehalf() {
+        return behalf;
+    }
+
+    public void setBehalf(String behalf) {
+        this.behalf = behalf;
+    }
+
+    public String getConstructionFullTime() {
+        return constructionFullTime;
+    }
+
+    public void setConstructionFullTime(String constructionFullTime) {
+        this.constructionFullTime = constructionFullTime;
+    }
+
+    public String getConstructionTechnical() {
+        return constructionTechnical;
+    }
+
+    public void setConstructionTechnical(String constructionTechnical) {
+        this.constructionTechnical = constructionTechnical;
+    }
+
+    public String getConstructionManage() {
+        return constructionManage;
+    }
+
+    public void setConstructionManage(String constructionManage) {
+        this.constructionManage = constructionManage;
+    }
+
+    public String getConstructionLeader() {
+        return constructionLeader;
+    }
+
+    public void setConstructionLeader(String constructionLeader) {
+        this.constructionLeader = constructionLeader;
+    }
+
+    public String getSubcontractingContact() {
+        return subcontractingContact;
+    }
+
+    public void setSubcontractingContact(String subcontractingContact) {
+        this.subcontractingContact = subcontractingContact;
+    }
+
+    public String getDesigner() {
+        return designer;
+    }
+
+    public void setDesigner(String designer) {
+        this.designer = designer;
+    }
+
+    public String getDesignLeader() {
+        return designLeader;
+    }
+
+    public void setDesignLeader(String designLeader) {
+        this.designLeader = designLeader;
+    }
+
+    public String getOwnerManager() {
+        return ownerManager;
+    }
+
+    public void setOwnerManager(String ownerManager) {
+        this.ownerManager = ownerManager;
+    }
+
+    public String getDistribution() {
+        return distribution;
+    }
+
+    public void setDistribution(String distribution) {
+        this.distribution = distribution;
+    }
+
+    public String getDistributionFullTime() {
+        return distributionFullTime;
+    }
+
+    public void setDistributionFullTime(String distributionFullTime) {
+        this.distributionFullTime = distributionFullTime;
+    }
+
+    public String getDistributionSystem() {
+        return distributionSystem;
+    }
+
+    public void setDistributionSystem(String distributionSystem) {
+        this.distributionSystem = distributionSystem;
+    }
+
+    public String getDistributionPolicy() {
+        return distributionPolicy;
+    }
+
+    public void setDistributionPolicy(String distributionPolicy) {
+        this.distributionPolicy = distributionPolicy;
+    }
+
+    public String getCenterLeader() {
+        return centerLeader;
+    }
+
+    public void setCenterLeader(String centerLeader) {
+        this.centerLeader = centerLeader;
+    }
+
+    public String getCenterTechnical() {
+        return centerTechnical;
+    }
+
+    public void setCenterTechnical(String centerTechnical) {
+        this.centerTechnical = centerTechnical;
+    }
+
+    public String getInstituteRole() {
+        return instituteRole;
+    }
+
+    public void setInstituteRole(String instituteRole) {
+        this.instituteRole = instituteRole;
+    }
+
+    public String getRepUnit() {
+        return repUnit;
+    }
+
+    public void setRepUnit(String repUnit) {
+        this.repUnit = repUnit;
+    }
+
+    public String getInspectionUnit() {
+        return inspectionUnit;
+    }
+
+    public void setInspectionUnit(String inspectionUnit) {
+        this.inspectionUnit = inspectionUnit;
+    }
+}

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

@@ -0,0 +1,210 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+
+/**
+ * 项目前期基本信息
+ * @author lem
+ * @date 2020-04-29
+ * @version 1
+ * */
+public class BasicInformation {
+    //信息id
+    private String id;
+    //储备项目名称
+    private String reserveProjectName;
+    //市公司
+    private String municipalCompany;
+    //县公司
+    private String countyCompany;
+    //项目性质
+    private String projectNature;
+    //需求单位
+    private String demandUnit;
+    //运维单位
+    private String operationUnit;
+    //供电区域
+    private String powerSupplyArea;
+    //网格编号
+    private String gridNumber;
+    //单元格编号
+    private String cellNumber;
+    //项目储备编号
+    private String projectReserveNo;
+    //电网项目编号
+    private String gridProjectNo;
+    //ERP编号
+    private String erpNo;
+    //建设必要性及内容
+    private String necessityContent;
+    //变电站名称
+    private String subStationName;
+    //线路名称
+    private String lineName;
+    //项目类型
+    private String projectType;
+    //是否迎峰度夏项目
+    private String whetherSummer;
+    //项目基本说明
+    private String basicDescription;
+    //工区备注
+    private String workAreaRemarks;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getReserveProjectName() {
+        return reserveProjectName;
+    }
+
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getMunicipalCompany() {
+        return municipalCompany;
+    }
+
+    public void setMunicipalCompany(String municipalCompany) {
+        this.municipalCompany = municipalCompany;
+    }
+
+    public String getCountyCompany() {
+        return countyCompany;
+    }
+
+    public void setCountyCompany(String countyCompany) {
+        this.countyCompany = countyCompany;
+    }
+
+    public String getProjectNature() {
+        return projectNature;
+    }
+
+    public void setProjectNature(String projectNature) {
+        this.projectNature = projectNature;
+    }
+
+    public String getDemandUnit() {
+        return demandUnit;
+    }
+
+    public void setDemandUnit(String demandUnit) {
+        this.demandUnit = demandUnit;
+    }
+
+    public String getOperationUnit() {
+        return operationUnit;
+    }
+
+    public void setOperationUnit(String operationUnit) {
+        this.operationUnit = operationUnit;
+    }
+
+    public String getPowerSupplyArea() {
+        return powerSupplyArea;
+    }
+
+    public void setPowerSupplyArea(String powerSupplyArea) {
+        this.powerSupplyArea = powerSupplyArea;
+    }
+
+    public String getGridNumber() {
+        return gridNumber;
+    }
+
+    public void setGridNumber(String gridNumber) {
+        this.gridNumber = gridNumber;
+    }
+
+    public String getCellNumber() {
+        return cellNumber;
+    }
+
+    public void setCellNumber(String cellNumber) {
+        this.cellNumber = cellNumber;
+    }
+
+    public String getProjectReserveNo() {
+        return projectReserveNo;
+    }
+
+    public void setProjectReserveNo(String projectReserveNo) {
+        this.projectReserveNo = projectReserveNo;
+    }
+
+    public String getGridProjectNo() {
+        return gridProjectNo;
+    }
+
+    public void setGridProjectNo(String gridProjectNo) {
+        this.gridProjectNo = gridProjectNo;
+    }
+
+    public String getErpNo() {
+        return erpNo;
+    }
+
+    public void setErpNo(String erpNo) {
+        this.erpNo = erpNo;
+    }
+
+    public String getNecessityContent() {
+        return necessityContent;
+    }
+
+    public void setNecessityContent(String necessityContent) {
+        this.necessityContent = necessityContent;
+    }
+
+    public String getSubStationName() {
+        return subStationName;
+    }
+
+    public void setSubStationName(String subStationName) {
+        this.subStationName = subStationName;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    public String getWhetherSummer() {
+        return whetherSummer;
+    }
+
+    public void setWhetherSummer(String whetherSummer) {
+        this.whetherSummer = whetherSummer;
+    }
+
+    public String getBasicDescription() {
+        return basicDescription;
+    }
+
+    public void setBasicDescription(String basicDescription) {
+        this.basicDescription = basicDescription;
+    }
+
+    public String getWorkAreaRemarks() {
+        return workAreaRemarks;
+    }
+
+    public void setWorkAreaRemarks(String workAreaRemarks) {
+        this.workAreaRemarks = workAreaRemarks;
+    }
+}

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

@@ -0,0 +1,268 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+/***
+ * 资金计划管理实体类
+ * */
+public class CapitalPlan extends DataEntity<CapitalPlan> {
+    //项目名称
+    private String projectName;
+    //项目定义号
+    private String projectId;
+    //项目批次
+    private String projectBatch;
+    //项目预算
+    private String projectBudget;
+    //项目实际费用
+    private String actualCost;
+    //项目差额
+    private String projectDifference;
+    //施工费
+    private String constructionCost;
+    //项目实际施工费
+    private String actualConstructionCost;
+    //施工差额
+    private String constructionDifference;
+    //物资费
+    private String materialCost;
+    //项目实际物资费
+    private String actualMaterialCost;
+    //物资差额
+    private String costDifference;
+    //设计费
+    private String designFee;
+    //应付设计费
+    private String DesignPayFee;
+    //项目实际设计费
+    private String actualDesignCost;
+    //设计差额
+    private String designDifference;
+    //监理费
+    private String supervisionFee;
+    //应付监理费
+    private String supervisionPayFee;
+    //项目实际监理费
+    private String actualSupervisionCost;
+    //监理差额
+    private String supervisionDifference;
+    //政策处理费用
+    private String policyProcessingFee;
+    //项目实际管理费
+    private String ActualManagementFee;
+    //政策处理差额
+    private String policyDifference;
+    //其他费用
+    private String otherExpenses;
+    //实际其他费用
+    private String actualOtherCost;
+    //其它差额
+    private String otherDifference;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectBatch() {
+        return projectBatch;
+    }
+
+    public void setProjectBatch(String projectBatch) {
+        this.projectBatch = projectBatch;
+    }
+
+    public String getProjectBudget() {
+        return projectBudget;
+    }
+
+    public void setProjectBudget(String projectBudget) {
+        this.projectBudget = projectBudget;
+    }
+
+    public String getActualCost() {
+        return actualCost;
+    }
+
+    public void setActualCost(String actualCost) {
+        this.actualCost = actualCost;
+    }
+
+    public String getProjectDifference() {
+        return projectDifference;
+    }
+
+    public void setProjectDifference(String projectDifference) {
+        this.projectDifference = projectDifference;
+    }
+
+    public String getConstructionCost() {
+        return constructionCost;
+    }
+
+    public void setConstructionCost(String constructionCost) {
+        this.constructionCost = constructionCost;
+    }
+
+    public String getActualConstructionCost() {
+        return actualConstructionCost;
+    }
+
+    public void setActualConstructionCost(String actualConstructionCost) {
+        this.actualConstructionCost = actualConstructionCost;
+    }
+
+    public String getConstructionDifference() {
+        return constructionDifference;
+    }
+
+    public void setConstructionDifference(String constructionDifference) {
+        this.constructionDifference = constructionDifference;
+    }
+
+    public String getMaterialCost() {
+        return materialCost;
+    }
+
+    public void setMaterialCost(String materialCost) {
+        this.materialCost = materialCost;
+    }
+
+    public String getActualMaterialCost() {
+        return actualMaterialCost;
+    }
+
+    public void setActualMaterialCost(String actualMaterialCost) {
+        this.actualMaterialCost = actualMaterialCost;
+    }
+
+    public String getCostDifference() {
+        return costDifference;
+    }
+
+    public void setCostDifference(String costDifference) {
+        this.costDifference = costDifference;
+    }
+
+    public String getDesignFee() {
+        return designFee;
+    }
+
+    public void setDesignFee(String designFee) {
+        this.designFee = designFee;
+    }
+
+    public String getDesignPayFee() {
+        return DesignPayFee;
+    }
+
+    public void setDesignPayFee(String designPayFee) {
+        DesignPayFee = designPayFee;
+    }
+
+    public String getActualDesignCost() {
+        return actualDesignCost;
+    }
+
+    public void setActualDesignCost(String actualDesignCost) {
+        this.actualDesignCost = actualDesignCost;
+    }
+
+    public String getDesignDifference() {
+        return designDifference;
+    }
+
+    public void setDesignDifference(String designDifference) {
+        this.designDifference = designDifference;
+    }
+
+    public String getSupervisionFee() {
+        return supervisionFee;
+    }
+
+    public void setSupervisionFee(String supervisionFee) {
+        this.supervisionFee = supervisionFee;
+    }
+
+    public String getSupervisionPayFee() {
+        return supervisionPayFee;
+    }
+
+    public void setSupervisionPayFee(String supervisionPayFee) {
+        this.supervisionPayFee = supervisionPayFee;
+    }
+
+    public String getActualSupervisionCost() {
+        return actualSupervisionCost;
+    }
+
+    public void setActualSupervisionCost(String actualSupervisionCost) {
+        this.actualSupervisionCost = actualSupervisionCost;
+    }
+
+    public String getSupervisionDifference() {
+        return supervisionDifference;
+    }
+
+    public void setSupervisionDifference(String supervisionDifference) {
+        this.supervisionDifference = supervisionDifference;
+    }
+
+    public String getPolicyProcessingFee() {
+        return policyProcessingFee;
+    }
+
+    public void setPolicyProcessingFee(String policyProcessingFee) {
+        this.policyProcessingFee = policyProcessingFee;
+    }
+
+    public String getActualManagementFee() {
+        return ActualManagementFee;
+    }
+
+    public void setActualManagementFee(String actualManagementFee) {
+        ActualManagementFee = actualManagementFee;
+    }
+
+    public String getPolicyDifference() {
+        return policyDifference;
+    }
+
+    public void setPolicyDifference(String policyDifference) {
+        this.policyDifference = policyDifference;
+    }
+
+    public String getOtherExpenses() {
+        return otherExpenses;
+    }
+
+    public void setOtherExpenses(String otherExpenses) {
+        this.otherExpenses = otherExpenses;
+    }
+
+    public String getActualOtherCost() {
+        return actualOtherCost;
+    }
+
+    public void setActualOtherCost(String actualOtherCost) {
+        this.actualOtherCost = actualOtherCost;
+    }
+
+    public String getOtherDifference() {
+        return otherDifference;
+    }
+
+    public void setOtherDifference(String otherDifference) {
+        this.otherDifference = otherDifference;
+    }
+}

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

@@ -0,0 +1,134 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+
+public class DisclosurePlan {
+    //储备项目名称
+    private String reserveProjectName;
+    //交底类型
+    private String disclosureType;
+    //项目类型
+    private String projectType;
+    //交底方式
+    private String disclosureMethod;
+    //运维单位
+    private String operationUnit;
+    //施工单位
+    private String constructionUnit;
+    //供电所
+    private String powerSupplyStation;
+    //施工项目经理
+    private String constructionManage;
+    //运维人员
+    private String maintenance;
+    //自动化联系人
+    private String automationContacts;
+    //带电查勘联系人
+    private String liveSurveyContact;
+    //供电所查勘人
+    private String inspector;
+    //交底计划日期
+    private String disclosurePlanDate;
+
+    public String getReserveProjectName() {
+        return reserveProjectName;
+    }
+
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
+    }
+
+    public String getDisclosureType() {
+        return disclosureType;
+    }
+
+    public void setDisclosureType(String disclosureType) {
+        this.disclosureType = disclosureType;
+    }
+
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    public String getDisclosureMethod() {
+        return disclosureMethod;
+    }
+
+    public void setDisclosureMethod(String disclosureMethod) {
+        this.disclosureMethod = disclosureMethod;
+    }
+
+    public String getOperationUnit() {
+        return operationUnit;
+    }
+
+    public void setOperationUnit(String operationUnit) {
+        this.operationUnit = operationUnit;
+    }
+
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+
+    public String getPowerSupplyStation() {
+        return powerSupplyStation;
+    }
+
+    public void setPowerSupplyStation(String powerSupplyStation) {
+        this.powerSupplyStation = powerSupplyStation;
+    }
+
+    public String getConstructionManage() {
+        return constructionManage;
+    }
+
+    public void setConstructionManage(String constructionManage) {
+        this.constructionManage = constructionManage;
+    }
+
+    public String getMaintenance() {
+        return maintenance;
+    }
+
+    public void setMaintenance(String maintenance) {
+        this.maintenance = maintenance;
+    }
+
+    public String getAutomationContacts() {
+        return automationContacts;
+    }
+
+    public void setAutomationContacts(String automationContacts) {
+        this.automationContacts = automationContacts;
+    }
+
+    public String getLiveSurveyContact() {
+        return liveSurveyContact;
+    }
+
+    public void setLiveSurveyContact(String liveSurveyContact) {
+        this.liveSurveyContact = liveSurveyContact;
+    }
+
+    public String getInspector() {
+        return inspector;
+    }
+
+    public void setInspector(String inspector) {
+        this.inspector = inspector;
+    }
+
+    public String getDisclosurePlanDate() {
+        return disclosurePlanDate;
+    }
+
+    public void setDisclosurePlanDate(String disclosurePlanDate) {
+        this.disclosurePlanDate = disclosurePlanDate;
+    }
+}

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

@@ -0,0 +1,274 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+
+public class ImportErp {
+    //公司代码
+    private String companyCode;
+    //利润中心
+    private String profitCenter;
+    //过账日期
+    private String postingDate;
+    //凭证编码
+    private String voucherCode;
+    //归档凭证类型
+    private String archiveType;
+    //归档凭证编码
+    private String archiveCode;
+    //凭证抬头文本
+    private String headerText;
+    //挂接WBS编码
+    private String hangUpCode;
+    //WBS编码
+    private String code;
+    //WBS描述
+    private String description;
+    //项目定义编码
+    private String projectId;
+    //项目定义描述
+    private String projectDescription;
+    //科目代码
+    private String accountCode;
+    //科目名称
+    private String accountName;
+    //借贷方向
+    private String lendingDirection;
+    //行项目金额
+    private String LineAmount;
+    //数量
+    private String number;
+    //批次
+    private String batch;
+    //物料编码
+    private String itemCode;
+    //物料描述
+    private String itemDescription;
+    //单位
+    private String company;
+    //进项税额
+    private String amountOfTaxes;
+    //转出进项税额
+    private String inputTax;
+    //转出凭证号码
+    private String voucherNo;
+    //转出凭证过账日期
+    private String postingDateOut;
+    //供应商
+    private String supplier;
+    //供应商名称
+    private String supplierName;
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getProfitCenter() {
+        return profitCenter;
+    }
+
+    public void setProfitCenter(String profitCenter) {
+        this.profitCenter = profitCenter;
+    }
+
+    public String getPostingDate() {
+        return postingDate;
+    }
+
+    public void setPostingDate(String postingDate) {
+        this.postingDate = postingDate;
+    }
+
+    public String getVoucherCode() {
+        return voucherCode;
+    }
+
+    public void setVoucherCode(String voucherCode) {
+        this.voucherCode = voucherCode;
+    }
+
+    public String getArchiveType() {
+        return archiveType;
+    }
+
+    public void setArchiveType(String archiveType) {
+        this.archiveType = archiveType;
+    }
+
+    public String getArchiveCode() {
+        return archiveCode;
+    }
+
+    public void setArchiveCode(String archiveCode) {
+        this.archiveCode = archiveCode;
+    }
+
+    public String getHeaderText() {
+        return headerText;
+    }
+
+    public void setHeaderText(String headerText) {
+        this.headerText = headerText;
+    }
+
+    public String getHangUpCode() {
+        return hangUpCode;
+    }
+
+    public void setHangUpCode(String hangUpCode) {
+        this.hangUpCode = hangUpCode;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectDescription() {
+        return projectDescription;
+    }
+
+    public void setProjectDescription(String projectDescription) {
+        this.projectDescription = projectDescription;
+    }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public String getLendingDirection() {
+        return lendingDirection;
+    }
+
+    public void setLendingDirection(String lendingDirection) {
+        this.lendingDirection = lendingDirection;
+    }
+
+    public String getLineAmount() {
+        return LineAmount;
+    }
+
+    public void setLineAmount(String lineAmount) {
+        LineAmount = lineAmount;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+
+    public String getItemDescription() {
+        return itemDescription;
+    }
+
+    public void setItemDescription(String itemDescription) {
+        this.itemDescription = itemDescription;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getAmountOfTaxes() {
+        return amountOfTaxes;
+    }
+
+    public void setAmountOfTaxes(String amountOfTaxes) {
+        this.amountOfTaxes = amountOfTaxes;
+    }
+
+    public String getInputTax() {
+        return inputTax;
+    }
+
+    public void setInputTax(String inputTax) {
+        this.inputTax = inputTax;
+    }
+
+    public String getVoucherNo() {
+        return voucherNo;
+    }
+
+    public void setVoucherNo(String voucherNo) {
+        this.voucherNo = voucherNo;
+    }
+
+    public String getPostingDateOut() {
+        return postingDateOut;
+    }
+
+    public void setPostingDateOut(String postingDateOut) {
+        this.postingDateOut = postingDateOut;
+    }
+
+    public String getSupplier() {
+        return supplier;
+    }
+
+    public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+}

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

@@ -1,227 +1,60 @@
 package com.jeeplus.modules.sg.managementcenter.project.entity;
 
-import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.List;
 
+/**
+ * 信息信息基础类
+ * */
 public class Project extends DataEntity<Project> {
-    private static final long serialVersionUID = 1L;
-    private String serialNumber;
-    private String type;//类型
-    private String demandUnit;//需求提出单位
-    private String bdzName;//变电站名称
-    private String lineName;//线路名称
-    private String requireName;//需求项目名称
-
-    private String reserveNumber;//储备编号
-
-    private String projectId;//工程编号
-    private String projectName;//项目名称
-    private String projectNumber;//项目定义号
-    private String projectManageRole;//配网项目经理
-    private String distributionEngineering;//配网工程专职
-    private String distributionMaterials;//配网物资专职
-    private String distributionSystem;//配网系统专职
-    private String distributionPolicy;//配网政策处理专职
-    private String managementLeader;//项目管理中心领导
-
-    private String skillByFull;//项目管理中心技经专职
-
-    private String runUnit;//运行单位
-    private String runUnitRole;//运行单位角色(储备)
-
-    private String runUnitInspectionRole;//运行单位角色（运检）
-
-    private String throughResearchRole;//经研所角色
-
-    private String constructionContractUnit; //施工合同单位
-    private Double constructionContractRate; //施工合同率
-    private String constructionContractSub; //施工分包单位
-
-    private String constructionUnit;//施工单位
-    private String constructionUnitRole;//施工单位角色
-    private String constructionUnitManage;//施工单位项目经理
-    private String constructionUnitLeader;//施工单位领导
-
-    private String constructionSkillByFull;//施工单位技经专职
-
-
-    private String designUnit;//设计单位
-    private String designUnitManage;//设计单位角色
-    private String designUnitLeader;//施工 单位领导
-    private String clarificaitonType;//交底类型
-    private String bulidClassificationResons;//建设理由分类
-    private String bulbidResons;//建设理由
-    private String asicEquipment;//设备基本情况
-    private String runTheClass;//运行班
-
-    private String projectTeam;//项目组（不要）
-
-    private Double costEstimate;//费用估算
-    private String whetherRheUpwind;//是否迎风期度夏项目
-    private String sureDaDate;//确定下达时间
-    private String textRemark;//备注
-    private String powerLine;//停电线路
-    private String powerScope;//停电范围
-    private List<String> powerScopeList;//停电范围拆分list
-    private String rezkey;
-
-    public String getRezkey() {
-        return rezkey;
-    }
-
-    public void setRezkey(String rezkey) {
-        this.rezkey = rezkey;
-    }
-
-    public List<String> getPowerScopeList() {
-        return powerScopeList;
-    }
-
-    public void setPowerScopeList(List<String> powerScopeList) {
-        this.powerScopeList = powerScopeList;
-    }
-
-    private String projectType;//项目类型
-    private String powerFlagPackage;//是否为停电打包项目
-    private String preliminaryJudgment;//证处初步判断
-    private String flagCivilEngineering;//是否含土建（不含钢管杆）
-    private String steelTubePole;//钢管杆基础类型
-    private String flagApprovalPlanning;//是否需要规矩报批
-    private String equCreateType;//设备改造类型
-    private String equCreateSize;//改造设备尺寸及间隔数
-    private String flagNewEquName;//是否新设备命名
-    private String includeBdzNews;//是否含变电站新闻格投运
-    private String flagNoElectrical;//是否非涉电电气施工
-    private String drawingsWork;//图纸标注的带点作业情况
-    private String flagAutomation;//是否含自动化
-    private String twoAndThreeRemote;//二或三
-    private String phoneStyle;//通信方式
-    private String stayOpenArea;//柱开集中或就业地
-    private String ringNetworkCabinet;//环网柜DTU户内或户外
-
-    private String automatedRemarks;//自动化备注
-
-    private String stationDtu;//站房DTU
-    private String status;//
-    private String acquisitionStatus;//领料状态
-    private String constructionStatus;//施工状态
-    private String whetherCloseStatus;//是否项目关闭
+    //储备项目暂定名称
+    private String reserveProjectName;
+    //储备项目暂定名称列表
+    private List<String> reserveList;
+    //项目定义
+    private String projectId;
+    //项目名称
+    private String projectName;
+    //项目基础信息表
+    private BasicInformation basicInformation;
+    //施工任务分配信息
+    private Assignment assignment;
+    //交底计划安排
+    private DisclosurePlan disclosurePlan;
+    //项目立项信息
+    private Approval approval;
+    //交底状态
+    private String status;
+    //领料状态
+    private String acquisitionStatus;
+    //施工状态
+    private String constructionStatus;
+    //是否项目关闭
+    private String whetherCloseStatus;
+    //结算状态
     private String settStatus;
-    private Integer earlyMaterial;//判断项目是否可以提前发起领料
-    private Integer preConstruction;//判断项目是否可以提前施工
-
-    private String loginNameFind;//登录名称
-    private String loginNameFindStats;//登录状态
-
-    public String getLoginNameFind() {
-        return loginNameFind;
-    }
-
-    public void setLoginNameFind(String loginNameFind) {
-        this.loginNameFind = loginNameFind;
-    }
-
-    public String getLoginNameFindStats() {
-        return loginNameFindStats;
-    }
-
-    public void setLoginNameFindStats(String loginNameFindStats) {
-        this.loginNameFindStats = loginNameFindStats;
-    }
-
-    @ExcelField(title = "序号", align = 2, sort = 1)
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getAcquisitionStatus() {
-        return acquisitionStatus;
-    }
-
-    public void setAcquisitionStatus(String acquisitionStatus) {
-        this.acquisitionStatus = acquisitionStatus;
-    }
-
-    public String getConstructionStatus() {
-        return constructionStatus;
-    }
-
-    public void setConstructionStatus(String constructionStatus) {
-        this.constructionStatus = constructionStatus;
-    }
-
-    public String getWhetherCloseStatus() {
-        return whetherCloseStatus;
-    }
-
-    public void setWhetherCloseStatus(String whetherCloseStatus) {
-        this.whetherCloseStatus = whetherCloseStatus;
-    }
-
-    public String getSettStatus() {
-        return settStatus;
-    }
-
-    public void setSettStatus(String settStatus) {
-        this.settStatus = settStatus;
-    }
-
-    @ExcelField(title = "类型", align = 2, sort = 2)
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @ExcelField(title = "需求提出单位", align = 2, sort = 3)
-    public String getDemandUnit() {
-        return demandUnit;
-    }
-
-    public void setDemandUnit(String demandUnit) {
-        this.demandUnit = demandUnit;
-    }
-
-    @ExcelField(title = "变电站名称", align = 2, sort = 4)
-    public String getBdzName() {
-        return bdzName;
-    }
+    //判断项目是否可以提前发起领料
+    private Integer earlyMaterial;
+    //判断项目是否可以提前施工
+    private Integer preConstruction;
 
-    public void setBdzName(String bdzName) {
-        this.bdzName = bdzName;
+    public String getReserveProjectName() {
+        return reserveProjectName;
     }
 
-    @ExcelField(title = "线路名称", align = 2, sort = 5)
-    public String getLineName() {
-        return lineName;
+    public void setReserveProjectName(String reserveProjectName) {
+        this.reserveProjectName = reserveProjectName;
     }
 
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
+    public List<String> getReserveList() {
+        return reserveList;
     }
 
-    @ExcelField(title = "项目需求名称", align = 2, sort = 6)
-    public String getRequireName() {
-        return requireName;
+    public void setReserveList(List<String> reserveList) {
+        this.reserveList = reserveList;
     }
 
-    @ExcelField(title = "工程编号", align = 2, sort = 7)
     public String getProjectId() {
         return projectId;
     }
@@ -230,7 +63,6 @@ public class Project extends DataEntity<Project> {
         this.projectId = projectId;
     }
 
-    @ExcelField(title = "项目名称", align = 2, sort = 8)
     public String getProjectName() {
         return projectName;
     }
@@ -239,434 +71,76 @@ public class Project extends DataEntity<Project> {
         this.projectName = projectName;
     }
 
-    @ExcelField(title = "项目定义号", align = 2, sort = 9)
-    public String getProjectNumber() {
-        return projectNumber;
-    }
-
-    public void setProjectNumber(String projectNumber) {
-        this.projectNumber = projectNumber;
-    }
-
-    @ExcelField(title = "项目经理角色", align = 2, sort = 10)
-    public String getProjectManageRole() {
-        return projectManageRole;
-    }
-
-    @ExcelField(title = "配网工程专职角色", align = 2, sort = 11)
-    public String getDistributionEngineering() {
-        return distributionEngineering;
-    }
-
-    public void setDistributionEngineering(String distributionEngineering) {
-        this.distributionEngineering = distributionEngineering;
-    }
-
-    @ExcelField(title = "配网物资专职角色", align = 2, sort = 12)
-    public String getDistributionMaterials() {
-        return distributionMaterials;
-    }
-
-    public void setDistributionMaterials(String distributionMaterials) {
-        this.distributionMaterials = distributionMaterials;
-    }
-
-    @ExcelField(title = "配网系统专职角色", align = 2, sort = 13)
-    public String getDistributionSystem() {
-        return distributionSystem;
-    }
-
-    public void setDistributionSystem(String distributionSystem) {
-        this.distributionSystem = distributionSystem;
-    }
-
-    @ExcelField(title = "配网政策处理专职角色", align = 2, sort = 14)
-    public String getDistributionPolicy() {
-        return distributionPolicy;
-    }
-
-    public void setDistributionPolicy(String distributionPolicy) {
-        this.distributionPolicy = distributionPolicy;
-    }
-
-    @ExcelField(title = "项目管理中心领导角色", align = 2, sort = 15)
-    public String getManagementLeader() {
-        return managementLeader;
-    }
-
-    public void setManagementLeader(String managementLeader) {
-        this.managementLeader = managementLeader;
-    }
-
-    @ExcelField(title = "运行单位", align = 2, sort = 16)
-    public String getRunUnit() {
-        return runUnit;
-    }
-
-    public void setRunUnit(String runUnit) {
-        this.runUnit = runUnit;
-    }
-
-    @ExcelField(title = "运行单位角色", align = 2, sort = 17)
-    public String getRunUnitRole() {
-        return runUnitRole;
-    }
-
-    public void setRunUnitRole(String runUnitRole) {
-        this.runUnitRole = runUnitRole;
-    }
-
-    @ExcelField(title = "经研所角色", align = 2, sort = 18)
-    public String getThroughResearchRole() {
-        return throughResearchRole;
-    }
-
-    public void setThroughResearchRole(String throughResearchRole) {
-        this.throughResearchRole = throughResearchRole;
-    }
-
-    public void setProjectManageRole(String projectManageRole) {
-        this.projectManageRole = projectManageRole;
-    }
-
-    @ExcelField(title = "施工单位", align = 2, sort = 19)
-    public String getConstructionUnit() {
-        return constructionUnit;
-    }
-
-    public void setConstructionUnit(String constructionUnit) {
-        this.constructionUnit = constructionUnit;
-    }
-
-    @ExcelField(title = "施工单位角色", align = 2, sort = 20)
-    public String getConstructionUnitRole() {
-        return constructionUnitRole;
-    }
-
-    @ExcelField(title = "施工单位项目经理", align = 2, sort = 21)
-    public String getConstructionUnitManage() {
-        return constructionUnitManage;
-    }
-
-    public void setConstructionUnitManage(String constructionUnitManage) {
-        this.constructionUnitManage = constructionUnitManage;
-    }
-    @ExcelField(title = "施工单位领导", align = 2, sort = 22)
-    public String getConstructionUnitLeader() {
-        return constructionUnitLeader;
-    }
-
-    public void setConstructionUnitLeader(String constructionUnitLeader) {
-        this.constructionUnitLeader = constructionUnitLeader;
-    }
-
-    @ExcelField(title = "设计单位", align = 2, sort = 23)
-    public String getDesignUnit() {
-        return designUnit;
-    }
-
-    public void setDesignUnit(String designUnit) {
-        this.designUnit = designUnit;
-    }
-
-    @ExcelField(title = "设计单位角色", align = 2, sort = 24)
-    public String getDesignUnitManage() {
-        return designUnitManage;
-    }
-
-    public void setDesignUnitManage(String designUnitManage) {
-        this.designUnitManage = designUnitManage;
-    }
-
-    @ExcelField(title = "设计单位领导", align = 2, sort = 25)
-    public String getDesignUnitLeader() {
-        return designUnitLeader;
-    }
-
-    public void setDesignUnitLeader(String designUnitLeader) {
-        this.designUnitLeader = designUnitLeader;
-    }
-
-    public void setConstructionUnitRole(String constructionUnitRole) {
-        this.constructionUnitRole = constructionUnitRole;
+    public BasicInformation getBasicInformation() {
+        return basicInformation;
     }
 
-    @ExcelField(title = "交底类型", align = 2, sort = 26)
-    public String getClarificaitonType() {
-        return clarificaitonType;
+    public void setBasicInformation(BasicInformation basicInformation) {
+        this.basicInformation = basicInformation;
     }
 
-    public void setClarificaitonType(String clarificaitonType) {
-        this.clarificaitonType = clarificaitonType;
+    public Assignment getAssignment() {
+        return assignment;
     }
 
-    public void setRequireName(String requireName) {
-        this.requireName = requireName;
+    public void setAssignment(Assignment assignment) {
+        this.assignment = assignment;
     }
 
-    @ExcelField(title = "建设理由分类", align = 2, sort = 27)
-    public String getBulidClassificationResons() {
-        return bulidClassificationResons;
+    public DisclosurePlan getDisclosurePlan() {
+        return disclosurePlan;
     }
 
-    public void setBulidClassificationResons(String bulidClassificationResons) {
-        this.bulidClassificationResons = bulidClassificationResons;
+    public void setDisclosurePlan(DisclosurePlan disclosurePlan) {
+        this.disclosurePlan = disclosurePlan;
     }
 
-    @ExcelField(title = "建设理由", align = 2, sort = 28)
-    public String getBulbidResons() {
-        return bulbidResons;
+    public Approval getApproval() {
+        return approval;
     }
 
-    public void setBulbidResons(String bulbidResons) {
-        this.bulbidResons = bulbidResons;
+    public void setApproval(Approval approval) {
+        this.approval = approval;
     }
 
-    @ExcelField(title = "设备基本情况", align = 2, sort = 29)
-    public String getAsicEquipment() {
-        return asicEquipment;
-    }
-
-    public void setAsicEquipment(String asicEquipment) {
-        this.asicEquipment = asicEquipment;
-    }
-
-    @ExcelField(title = "运行班", align = 2, sort = 30)
-    public String getRunTheClass() {
-        return runTheClass;
-    }
-
-    public void setRunTheClass(String runTheClass) {
-        this.runTheClass = runTheClass;
-    }
-
-    public String getProjectTeam() {
-        return projectTeam;
-    }
-
-    public void setProjectTeam(String projectTeam) {
-        this.projectTeam = projectTeam;
-    }
-
-    @ExcelField(title = "费用估算", align = 2, sort = 32)
-    public Double getCostEstimate() {
-        return costEstimate;
-    }
-
-    public void setCostEstimate(Double costEstimate) {
-        this.costEstimate = costEstimate;
-    }
-
-    @ExcelField(title = "是否迎风期度夏项目", align = 2, sort = 33)
-    public String getWhetherRheUpwind() {
-        return whetherRheUpwind;
-    }
-
-    public void setWhetherRheUpwind(String whetherRheUpwind) {
-        this.whetherRheUpwind = whetherRheUpwind;
-    }
-
-    @ExcelField(title = "确定下达时间", align = 2, sort = 34)
-    public String getSureDaDate() {
-        return sureDaDate;
-    }
-
-    public void setSureDaDate(String sureDaDate) {
-        this.sureDaDate = sureDaDate;
-    }
-
-    @ExcelField(title = "备注", align = 2, sort = 35)
-    public String getTextRemark() {
-        return textRemark;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public void setTextRemark(String textRemark) {
-        this.textRemark = textRemark;
-    }
-
-    @ExcelField(title = "停电线路", align = 2, sort = 36)
-    public String getPowerLine() {
-        return powerLine;
-    }
-
-    public void setPowerLine(String powerLine) {
-        this.powerLine = powerLine;
-    }
-
-    @ExcelField(title = "停电范围", align = 2, sort = 37)
-    public String getPowerScope() {
-        return powerScope;
-    }
-
-    public void setPowerScope(String powerScope) {
-        this.powerScope = powerScope;
-    }
-
-    @ExcelField(title = "项目类型", align = 2, sort = 38)
-    public String getProjectType() {
-        return projectType;
-    }
-
-    public void setProjectType(String projectType) {
-        this.projectType = projectType;
-    }
-
-    @ExcelField(title = "是否为停电打包项目", align = 2, sort = 39)
-    public String getPowerFlagPackage() {
-        return powerFlagPackage;
-    }
-
-    public void setPowerFlagPackage(String powerFlagPackage) {
-        this.powerFlagPackage = powerFlagPackage;
-    }
-
-    @ExcelField(title = "证处初步判断", align = 2, sort = 40)
-    public String getPreliminaryJudgment() {
-        return preliminaryJudgment;
-    }
-
-    public void setPreliminaryJudgment(String preliminaryJudgment) {
-        this.preliminaryJudgment = preliminaryJudgment;
-    }
-
-    @ExcelField(title = "是否含土建（不含钢管杆）", align = 2, sort = 41)
-    public String getFlagCivilEngineering() {
-        return flagCivilEngineering;
-    }
-
-    public void setFlagCivilEngineering(String flagCivilEngineering) {
-        this.flagCivilEngineering = flagCivilEngineering;
-    }
-
-    @ExcelField(title = "钢管杆基础类型", align = 2, sort = 42)
-    public String getSteelTubePole() {
-        return steelTubePole;
-    }
-
-    public void setSteelTubePole(String steelTubePole) {
-        this.steelTubePole = steelTubePole;
-    }
-
-    @ExcelField(title = "是否需要规矩报批", align = 2, sort = 43)
-    public String getFlagApprovalPlanning() {
-        return flagApprovalPlanning;
-    }
-
-    public void setFlagApprovalPlanning(String flagApprovalPlanning) {
-        this.flagApprovalPlanning = flagApprovalPlanning;
-    }
-
-    @ExcelField(title = "设备改造类型", align = 2, sort = 44)
-    public String getEquCreateType() {
-        return equCreateType;
-    }
-
-    public void setEquCreateType(String equCreateType) {
-        this.equCreateType = equCreateType;
-    }
-
-    @ExcelField(title = "改造设备尺寸及间隔数", align = 2, sort = 45)
-    public String getEquCreateSize() {
-        return equCreateSize;
-    }
-
-    public void setEquCreateSize(String equCreateSize) {
-        this.equCreateSize = equCreateSize;
-    }
-
-    @ExcelField(title = "是否新设备命名", align = 2, sort = 46)
-    public String getFlagNewEquName() {
-        return flagNewEquName;
-    }
-
-    public void setFlagNewEquName(String flagNewEquName) {
-        this.flagNewEquName = flagNewEquName;
-    }
-
-    @ExcelField(title = "是否含变电站新闻隔投运", align = 2, sort = 47)
-    public String getIncludeBdzNews() {
-        return includeBdzNews;
-    }
-
-    public void setIncludeBdzNews(String includeBdzNews) {
-        this.includeBdzNews = includeBdzNews;
-    }
-
-    @ExcelField(title = "是否非涉电电气施工", align = 2, sort = 48)
-    public String getFlagNoElectrical() {
-        return flagNoElectrical;
-    }
-
-    public void setFlagNoElectrical(String flagNoElectrical) {
-        this.flagNoElectrical = flagNoElectrical;
-    }
-
-    @ExcelField(title = "图纸标注的带点作业情况", align = 2, sort = 49)
-    public String getDrawingsWork() {
-        return drawingsWork;
-    }
-
-    public void setDrawingsWork(String drawingsWork) {
-        this.drawingsWork = drawingsWork;
-    }
-
-    @ExcelField(title = "是否含自动化", align = 2, sort = 50)
-    public String getFlagAutomation() {
-        return flagAutomation;
-    }
-
-    public void setFlagAutomation(String flagAutomation) {
-        this.flagAutomation = flagAutomation;
-    }
-
-    @ExcelField(title = "二摇或三摇", align = 2, sort = 51)
-    public String getTwoAndThreeRemote() {
-        return twoAndThreeRemote;
+    public String getStatus() {
+        return status;
     }
 
-    public void setTwoAndThreeRemote(String twoAndThreeRemote) {
-        this.twoAndThreeRemote = twoAndThreeRemote;
+    public void setStatus(String status) {
+        this.status = status;
     }
 
-    @ExcelField(title = "通信方式", align = 2, sort = 52)
-    public String getPhoneStyle() {
-        return phoneStyle;
+    public String getAcquisitionStatus() {
+        return acquisitionStatus;
     }
 
-    public void setPhoneStyle(String phoneStyle) {
-        this.phoneStyle = phoneStyle;
+    public void setAcquisitionStatus(String acquisitionStatus) {
+        this.acquisitionStatus = acquisitionStatus;
     }
 
-    @ExcelField(title = "柱开集中或就业地", align = 2, sort = 53)
-    public String getStayOpenArea() {
-        return stayOpenArea;
+    public String getConstructionStatus() {
+        return constructionStatus;
     }
 
-    public void setStayOpenArea(String stayOpenArea) {
-        this.stayOpenArea = stayOpenArea;
+    public void setConstructionStatus(String constructionStatus) {
+        this.constructionStatus = constructionStatus;
     }
 
-    @ExcelField(title = "环网柜", align = 2, sort = 54)
-    public String getRingNetworkCabinet() {
-        return ringNetworkCabinet;
+    public String getWhetherCloseStatus() {
+        return whetherCloseStatus;
     }
 
-    public void setRingNetworkCabinet(String ringNetworkCabinet) {
-        this.ringNetworkCabinet = ringNetworkCabinet;
+    public void setWhetherCloseStatus(String whetherCloseStatus) {
+        this.whetherCloseStatus = whetherCloseStatus;
     }
 
-    @ExcelField(title = "站房DTU", align = 2, sort = 55)
-    public String getStationDtu() {
-        return stationDtu;
+    public String getSettStatus() {
+        return settStatus;
     }
 
-
-    public void setStationDtu(String stationDtu) {
-        this.stationDtu = stationDtu;
+    public void setSettStatus(String settStatus) {
+        this.settStatus = settStatus;
     }
 
     public Integer getEarlyMaterial() {
@@ -684,68 +158,4 @@ public class Project extends DataEntity<Project> {
     public void setPreConstruction(Integer preConstruction) {
         this.preConstruction = preConstruction;
     }
-    @ExcelField(title = "储备编号", align = 2, sort = 31)
-    public String getReserveNumber() {
-        return reserveNumber;
-    }
-
-    public void setReserveNumber(String reserveNumber) {
-        this.reserveNumber = reserveNumber;
-    }
-    @ExcelField(title = "项目管理中心技经专职", align = 2, sort = 56)
-    public String getSkillByFull() {
-        return skillByFull;
-    }
-
-    public void setSkillByFull(String skillByFull) {
-        this.skillByFull = skillByFull;
-    }
-    @ExcelField(title = "运行单位角色（运检", align = 2, sort = 57)
-    public String getRunUnitInspectionRole() {
-        return runUnitInspectionRole;
-    }
-
-    public void setRunUnitInspectionRole(String runUnitInspectionRole) {
-        this.runUnitInspectionRole = runUnitInspectionRole;
-    }
-    @ExcelField(title = "施工合同单位", align = 2, sort = 58)
-    public String getConstructionContractUnit() {
-        return constructionContractUnit;
-    }
-
-    public void setConstructionContractUnit(String constructionContractUnit) {
-        this.constructionContractUnit = constructionContractUnit;
-    }
-    @ExcelField(title = "施工合同率", align = 2, sort =59)
-    public Double getConstructionContractRate() {
-        return constructionContractRate;
-    }
-
-    public void setConstructionContractRate(Double constructionContractRate) {
-        this.constructionContractRate = constructionContractRate;
-    }
-    @ExcelField(title = "施工分包单位", align = 2, sort = 60)
-    public String getConstructionContractSub() {
-        return constructionContractSub;
-    }
-
-    public void setConstructionContractSub(String constructionContractSub) {
-        this.constructionContractSub = constructionContractSub;
-    }
-    @ExcelField(title = "施工单位技经专职", align = 2, sort = 61)
-    public String getConstructionSkillByFull() {
-        return constructionSkillByFull;
-    }
-
-    public void setConstructionSkillByFull(String constructionSkillByFull) {
-        this.constructionSkillByFull = constructionSkillByFull;
-    }
-    @ExcelField(title = "自动化备注", align = 2, sort = 62)
-    public String getAutomatedRemarks() {
-        return automatedRemarks;
-    }
-
-    public void setAutomatedRemarks(String automatedRemarks) {
-        this.automatedRemarks = automatedRemarks;
-    }
 }

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

@@ -0,0 +1,751 @@
+package com.jeeplus.modules.sg.managementcenter.project.entity;
+
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.core.persistence.DataEntity;
+
+import java.util.List;
+
+public class Project1 extends DataEntity<Project1> {
+    private static final long serialVersionUID = 1L;
+    private String serialNumber;
+    private String type;//类型
+    private String demandUnit;//需求提出单位
+    private String bdzName;//变电站名称
+    private String lineName;//线路名称
+    private String requireName;//需求项目名称
+
+    private String reserveNumber;//储备编号
+
+    private String projectId;//工程编号
+    private String projectName;//项目名称
+    private String projectNumber;//项目定义号
+    private String projectManageRole;//配网项目经理
+    private String distributionEngineering;//配网工程专职
+    private String distributionMaterials;//配网物资专职
+    private String distributionSystem;//配网系统专职
+    private String distributionPolicy;//配网政策处理专职
+    private String managementLeader;//项目管理中心领导
+
+    private String skillByFull;//项目管理中心技经专职
+
+    private String runUnit;//运行单位
+    private String runUnitRole;//运行单位角色(储备)
+
+    private String runUnitInspectionRole;//运行单位角色（运检）
+
+    private String throughResearchRole;//经研所角色
+
+    private String constructionContractUnit; //施工合同单位
+    private Double constructionContractRate; //施工合同率
+    private String constructionContractSub; //施工分包单位
+
+    private String constructionUnit;//施工单位
+    private String constructionUnitRole;//施工单位角色
+    private String constructionUnitManage;//施工单位项目经理
+    private String constructionUnitLeader;//施工单位领导
+
+    private String constructionSkillByFull;//施工单位技经专职
+
+
+    private String designUnit;//设计单位
+    private String designUnitManage;//设计单位角色
+    private String designUnitLeader;//施工 单位领导
+    private String clarificaitonType;//交底类型
+    private String bulidClassificationResons;//建设理由分类
+    private String bulbidResons;//建设理由
+    private String asicEquipment;//设备基本情况
+    private String runTheClass;//运行班
+
+    private String projectTeam;//项目组（不要）
+
+    private Double costEstimate;//费用估算
+    private String whetherRheUpwind;//是否迎风期度夏项目
+    private String sureDaDate;//确定下达时间
+    private String textRemark;//备注
+    private String powerLine;//停电线路
+    private String powerScope;//停电范围
+    private List<String> powerScopeList;//停电范围拆分list
+    private String rezkey;
+
+    public String getRezkey() {
+        return rezkey;
+    }
+
+    public void setRezkey(String rezkey) {
+        this.rezkey = rezkey;
+    }
+
+    public List<String> getPowerScopeList() {
+        return powerScopeList;
+    }
+
+    public void setPowerScopeList(List<String> powerScopeList) {
+        this.powerScopeList = powerScopeList;
+    }
+
+    private String projectType;//项目类型
+    private String powerFlagPackage;//是否为停电打包项目
+    private String preliminaryJudgment;//证处初步判断
+    private String flagCivilEngineering;//是否含土建（不含钢管杆）
+    private String steelTubePole;//钢管杆基础类型
+    private String flagApprovalPlanning;//是否需要规矩报批
+    private String equCreateType;//设备改造类型
+    private String equCreateSize;//改造设备尺寸及间隔数
+    private String flagNewEquName;//是否新设备命名
+    private String includeBdzNews;//是否含变电站新闻格投运
+    private String flagNoElectrical;//是否非涉电电气施工
+    private String drawingsWork;//图纸标注的带点作业情况
+    private String flagAutomation;//是否含自动化
+    private String twoAndThreeRemote;//二或三
+    private String phoneStyle;//通信方式
+    private String stayOpenArea;//柱开集中或就业地
+    private String ringNetworkCabinet;//环网柜DTU户内或户外
+
+    private String automatedRemarks;//自动化备注
+
+    private String stationDtu;//站房DTU
+    private String status;//
+    private String acquisitionStatus;//领料状态
+    private String constructionStatus;//施工状态
+    private String whetherCloseStatus;//是否项目关闭
+    private String settStatus;
+    private Integer earlyMaterial;//判断项目是否可以提前发起领料
+    private Integer preConstruction;//判断项目是否可以提前施工
+
+    private String loginNameFind;//登录名称
+    private String loginNameFindStats;//登录状态
+
+    public String getLoginNameFind() {
+        return loginNameFind;
+    }
+
+    public void setLoginNameFind(String loginNameFind) {
+        this.loginNameFind = loginNameFind;
+    }
+
+    public String getLoginNameFindStats() {
+        return loginNameFindStats;
+    }
+
+    public void setLoginNameFindStats(String loginNameFindStats) {
+        this.loginNameFindStats = loginNameFindStats;
+    }
+
+    @ExcelField(title = "序号", align = 2, sort = 1)
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getAcquisitionStatus() {
+        return acquisitionStatus;
+    }
+
+    public void setAcquisitionStatus(String acquisitionStatus) {
+        this.acquisitionStatus = acquisitionStatus;
+    }
+
+    public String getConstructionStatus() {
+        return constructionStatus;
+    }
+
+    public void setConstructionStatus(String constructionStatus) {
+        this.constructionStatus = constructionStatus;
+    }
+
+    public String getWhetherCloseStatus() {
+        return whetherCloseStatus;
+    }
+
+    public void setWhetherCloseStatus(String whetherCloseStatus) {
+        this.whetherCloseStatus = whetherCloseStatus;
+    }
+
+    public String getSettStatus() {
+        return settStatus;
+    }
+
+    public void setSettStatus(String settStatus) {
+        this.settStatus = settStatus;
+    }
+
+    @ExcelField(title = "类型", align = 2, sort = 2)
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @ExcelField(title = "需求提出单位", align = 2, sort = 3)
+    public String getDemandUnit() {
+        return demandUnit;
+    }
+
+    public void setDemandUnit(String demandUnit) {
+        this.demandUnit = demandUnit;
+    }
+
+    @ExcelField(title = "变电站名称", align = 2, sort = 4)
+    public String getBdzName() {
+        return bdzName;
+    }
+
+    public void setBdzName(String bdzName) {
+        this.bdzName = bdzName;
+    }
+
+    @ExcelField(title = "线路名称", align = 2, sort = 5)
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    @ExcelField(title = "项目需求名称", align = 2, sort = 6)
+    public String getRequireName() {
+        return requireName;
+    }
+
+    @ExcelField(title = "工程编号", align = 2, sort = 7)
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    @ExcelField(title = "项目名称", align = 2, sort = 8)
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @ExcelField(title = "项目定义号", align = 2, sort = 9)
+    public String getProjectNumber() {
+        return projectNumber;
+    }
+
+    public void setProjectNumber(String projectNumber) {
+        this.projectNumber = projectNumber;
+    }
+
+    @ExcelField(title = "项目经理角色", align = 2, sort = 10)
+    public String getProjectManageRole() {
+        return projectManageRole;
+    }
+
+    @ExcelField(title = "配网工程专职角色", align = 2, sort = 11)
+    public String getDistributionEngineering() {
+        return distributionEngineering;
+    }
+
+    public void setDistributionEngineering(String distributionEngineering) {
+        this.distributionEngineering = distributionEngineering;
+    }
+
+    @ExcelField(title = "配网物资专职角色", align = 2, sort = 12)
+    public String getDistributionMaterials() {
+        return distributionMaterials;
+    }
+
+    public void setDistributionMaterials(String distributionMaterials) {
+        this.distributionMaterials = distributionMaterials;
+    }
+
+    @ExcelField(title = "配网系统专职角色", align = 2, sort = 13)
+    public String getDistributionSystem() {
+        return distributionSystem;
+    }
+
+    public void setDistributionSystem(String distributionSystem) {
+        this.distributionSystem = distributionSystem;
+    }
+
+    @ExcelField(title = "配网政策处理专职角色", align = 2, sort = 14)
+    public String getDistributionPolicy() {
+        return distributionPolicy;
+    }
+
+    public void setDistributionPolicy(String distributionPolicy) {
+        this.distributionPolicy = distributionPolicy;
+    }
+
+    @ExcelField(title = "项目管理中心领导角色", align = 2, sort = 15)
+    public String getManagementLeader() {
+        return managementLeader;
+    }
+
+    public void setManagementLeader(String managementLeader) {
+        this.managementLeader = managementLeader;
+    }
+
+    @ExcelField(title = "运行单位", align = 2, sort = 16)
+    public String getRunUnit() {
+        return runUnit;
+    }
+
+    public void setRunUnit(String runUnit) {
+        this.runUnit = runUnit;
+    }
+
+    @ExcelField(title = "运行单位角色", align = 2, sort = 17)
+    public String getRunUnitRole() {
+        return runUnitRole;
+    }
+
+    public void setRunUnitRole(String runUnitRole) {
+        this.runUnitRole = runUnitRole;
+    }
+
+    @ExcelField(title = "经研所角色", align = 2, sort = 18)
+    public String getThroughResearchRole() {
+        return throughResearchRole;
+    }
+
+    public void setThroughResearchRole(String throughResearchRole) {
+        this.throughResearchRole = throughResearchRole;
+    }
+
+    public void setProjectManageRole(String projectManageRole) {
+        this.projectManageRole = projectManageRole;
+    }
+
+    @ExcelField(title = "施工单位", align = 2, sort = 19)
+    public String getConstructionUnit() {
+        return constructionUnit;
+    }
+
+    public void setConstructionUnit(String constructionUnit) {
+        this.constructionUnit = constructionUnit;
+    }
+
+    @ExcelField(title = "施工单位角色", align = 2, sort = 20)
+    public String getConstructionUnitRole() {
+        return constructionUnitRole;
+    }
+
+    @ExcelField(title = "施工单位项目经理", align = 2, sort = 21)
+    public String getConstructionUnitManage() {
+        return constructionUnitManage;
+    }
+
+    public void setConstructionUnitManage(String constructionUnitManage) {
+        this.constructionUnitManage = constructionUnitManage;
+    }
+    @ExcelField(title = "施工单位领导", align = 2, sort = 22)
+    public String getConstructionUnitLeader() {
+        return constructionUnitLeader;
+    }
+
+    public void setConstructionUnitLeader(String constructionUnitLeader) {
+        this.constructionUnitLeader = constructionUnitLeader;
+    }
+
+    @ExcelField(title = "设计单位", align = 2, sort = 23)
+    public String getDesignUnit() {
+        return designUnit;
+    }
+
+    public void setDesignUnit(String designUnit) {
+        this.designUnit = designUnit;
+    }
+
+    @ExcelField(title = "设计单位角色", align = 2, sort = 24)
+    public String getDesignUnitManage() {
+        return designUnitManage;
+    }
+
+    public void setDesignUnitManage(String designUnitManage) {
+        this.designUnitManage = designUnitManage;
+    }
+
+    @ExcelField(title = "设计单位领导", align = 2, sort = 25)
+    public String getDesignUnitLeader() {
+        return designUnitLeader;
+    }
+
+    public void setDesignUnitLeader(String designUnitLeader) {
+        this.designUnitLeader = designUnitLeader;
+    }
+
+    public void setConstructionUnitRole(String constructionUnitRole) {
+        this.constructionUnitRole = constructionUnitRole;
+    }
+
+    @ExcelField(title = "交底类型", align = 2, sort = 26)
+    public String getClarificaitonType() {
+        return clarificaitonType;
+    }
+
+    public void setClarificaitonType(String clarificaitonType) {
+        this.clarificaitonType = clarificaitonType;
+    }
+
+    public void setRequireName(String requireName) {
+        this.requireName = requireName;
+    }
+
+    @ExcelField(title = "建设理由分类", align = 2, sort = 27)
+    public String getBulidClassificationResons() {
+        return bulidClassificationResons;
+    }
+
+    public void setBulidClassificationResons(String bulidClassificationResons) {
+        this.bulidClassificationResons = bulidClassificationResons;
+    }
+
+    @ExcelField(title = "建设理由", align = 2, sort = 28)
+    public String getBulbidResons() {
+        return bulbidResons;
+    }
+
+    public void setBulbidResons(String bulbidResons) {
+        this.bulbidResons = bulbidResons;
+    }
+
+    @ExcelField(title = "设备基本情况", align = 2, sort = 29)
+    public String getAsicEquipment() {
+        return asicEquipment;
+    }
+
+    public void setAsicEquipment(String asicEquipment) {
+        this.asicEquipment = asicEquipment;
+    }
+
+    @ExcelField(title = "运行班", align = 2, sort = 30)
+    public String getRunTheClass() {
+        return runTheClass;
+    }
+
+    public void setRunTheClass(String runTheClass) {
+        this.runTheClass = runTheClass;
+    }
+
+    public String getProjectTeam() {
+        return projectTeam;
+    }
+
+    public void setProjectTeam(String projectTeam) {
+        this.projectTeam = projectTeam;
+    }
+
+    @ExcelField(title = "费用估算", align = 2, sort = 32)
+    public Double getCostEstimate() {
+        return costEstimate;
+    }
+
+    public void setCostEstimate(Double costEstimate) {
+        this.costEstimate = costEstimate;
+    }
+
+    @ExcelField(title = "是否迎风期度夏项目", align = 2, sort = 33)
+    public String getWhetherRheUpwind() {
+        return whetherRheUpwind;
+    }
+
+    public void setWhetherRheUpwind(String whetherRheUpwind) {
+        this.whetherRheUpwind = whetherRheUpwind;
+    }
+
+    @ExcelField(title = "确定下达时间", align = 2, sort = 34)
+    public String getSureDaDate() {
+        return sureDaDate;
+    }
+
+    public void setSureDaDate(String sureDaDate) {
+        this.sureDaDate = sureDaDate;
+    }
+
+    @ExcelField(title = "备注", align = 2, sort = 35)
+    public String getTextRemark() {
+        return textRemark;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public void setTextRemark(String textRemark) {
+        this.textRemark = textRemark;
+    }
+
+    @ExcelField(title = "停电线路", align = 2, sort = 36)
+    public String getPowerLine() {
+        return powerLine;
+    }
+
+    public void setPowerLine(String powerLine) {
+        this.powerLine = powerLine;
+    }
+
+    @ExcelField(title = "停电范围", align = 2, sort = 37)
+    public String getPowerScope() {
+        return powerScope;
+    }
+
+    public void setPowerScope(String powerScope) {
+        this.powerScope = powerScope;
+    }
+
+    @ExcelField(title = "项目类型", align = 2, sort = 38)
+    public String getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(String projectType) {
+        this.projectType = projectType;
+    }
+
+    @ExcelField(title = "是否为停电打包项目", align = 2, sort = 39)
+    public String getPowerFlagPackage() {
+        return powerFlagPackage;
+    }
+
+    public void setPowerFlagPackage(String powerFlagPackage) {
+        this.powerFlagPackage = powerFlagPackage;
+    }
+
+    @ExcelField(title = "证处初步判断", align = 2, sort = 40)
+    public String getPreliminaryJudgment() {
+        return preliminaryJudgment;
+    }
+
+    public void setPreliminaryJudgment(String preliminaryJudgment) {
+        this.preliminaryJudgment = preliminaryJudgment;
+    }
+
+    @ExcelField(title = "是否含土建（不含钢管杆）", align = 2, sort = 41)
+    public String getFlagCivilEngineering() {
+        return flagCivilEngineering;
+    }
+
+    public void setFlagCivilEngineering(String flagCivilEngineering) {
+        this.flagCivilEngineering = flagCivilEngineering;
+    }
+
+    @ExcelField(title = "钢管杆基础类型", align = 2, sort = 42)
+    public String getSteelTubePole() {
+        return steelTubePole;
+    }
+
+    public void setSteelTubePole(String steelTubePole) {
+        this.steelTubePole = steelTubePole;
+    }
+
+    @ExcelField(title = "是否需要规矩报批", align = 2, sort = 43)
+    public String getFlagApprovalPlanning() {
+        return flagApprovalPlanning;
+    }
+
+    public void setFlagApprovalPlanning(String flagApprovalPlanning) {
+        this.flagApprovalPlanning = flagApprovalPlanning;
+    }
+
+    @ExcelField(title = "设备改造类型", align = 2, sort = 44)
+    public String getEquCreateType() {
+        return equCreateType;
+    }
+
+    public void setEquCreateType(String equCreateType) {
+        this.equCreateType = equCreateType;
+    }
+
+    @ExcelField(title = "改造设备尺寸及间隔数", align = 2, sort = 45)
+    public String getEquCreateSize() {
+        return equCreateSize;
+    }
+
+    public void setEquCreateSize(String equCreateSize) {
+        this.equCreateSize = equCreateSize;
+    }
+
+    @ExcelField(title = "是否新设备命名", align = 2, sort = 46)
+    public String getFlagNewEquName() {
+        return flagNewEquName;
+    }
+
+    public void setFlagNewEquName(String flagNewEquName) {
+        this.flagNewEquName = flagNewEquName;
+    }
+
+    @ExcelField(title = "是否含变电站新闻隔投运", align = 2, sort = 47)
+    public String getIncludeBdzNews() {
+        return includeBdzNews;
+    }
+
+    public void setIncludeBdzNews(String includeBdzNews) {
+        this.includeBdzNews = includeBdzNews;
+    }
+
+    @ExcelField(title = "是否非涉电电气施工", align = 2, sort = 48)
+    public String getFlagNoElectrical() {
+        return flagNoElectrical;
+    }
+
+    public void setFlagNoElectrical(String flagNoElectrical) {
+        this.flagNoElectrical = flagNoElectrical;
+    }
+
+    @ExcelField(title = "图纸标注的带点作业情况", align = 2, sort = 49)
+    public String getDrawingsWork() {
+        return drawingsWork;
+    }
+
+    public void setDrawingsWork(String drawingsWork) {
+        this.drawingsWork = drawingsWork;
+    }
+
+    @ExcelField(title = "是否含自动化", align = 2, sort = 50)
+    public String getFlagAutomation() {
+        return flagAutomation;
+    }
+
+    public void setFlagAutomation(String flagAutomation) {
+        this.flagAutomation = flagAutomation;
+    }
+
+    @ExcelField(title = "二摇或三摇", align = 2, sort = 51)
+    public String getTwoAndThreeRemote() {
+        return twoAndThreeRemote;
+    }
+
+    public void setTwoAndThreeRemote(String twoAndThreeRemote) {
+        this.twoAndThreeRemote = twoAndThreeRemote;
+    }
+
+    @ExcelField(title = "通信方式", align = 2, sort = 52)
+    public String getPhoneStyle() {
+        return phoneStyle;
+    }
+
+    public void setPhoneStyle(String phoneStyle) {
+        this.phoneStyle = phoneStyle;
+    }
+
+    @ExcelField(title = "柱开集中或就业地", align = 2, sort = 53)
+    public String getStayOpenArea() {
+        return stayOpenArea;
+    }
+
+    public void setStayOpenArea(String stayOpenArea) {
+        this.stayOpenArea = stayOpenArea;
+    }
+
+    @ExcelField(title = "环网柜", align = 2, sort = 54)
+    public String getRingNetworkCabinet() {
+        return ringNetworkCabinet;
+    }
+
+    public void setRingNetworkCabinet(String ringNetworkCabinet) {
+        this.ringNetworkCabinet = ringNetworkCabinet;
+    }
+
+    @ExcelField(title = "站房DTU", align = 2, sort = 55)
+    public String getStationDtu() {
+        return stationDtu;
+    }
+
+
+    public void setStationDtu(String stationDtu) {
+        this.stationDtu = stationDtu;
+    }
+
+    public Integer getEarlyMaterial() {
+        return earlyMaterial;
+    }
+
+    public void setEarlyMaterial(Integer earlyMaterial) {
+        this.earlyMaterial = earlyMaterial;
+    }
+
+    public Integer getPreConstruction() {
+        return preConstruction;
+    }
+
+    public void setPreConstruction(Integer preConstruction) {
+        this.preConstruction = preConstruction;
+    }
+    @ExcelField(title = "储备编号", align = 2, sort = 31)
+    public String getReserveNumber() {
+        return reserveNumber;
+    }
+
+    public void setReserveNumber(String reserveNumber) {
+        this.reserveNumber = reserveNumber;
+    }
+    @ExcelField(title = "项目管理中心技经专职", align = 2, sort = 56)
+    public String getSkillByFull() {
+        return skillByFull;
+    }
+
+    public void setSkillByFull(String skillByFull) {
+        this.skillByFull = skillByFull;
+    }
+    @ExcelField(title = "运行单位角色（运检", align = 2, sort = 57)
+    public String getRunUnitInspectionRole() {
+        return runUnitInspectionRole;
+    }
+
+    public void setRunUnitInspectionRole(String runUnitInspectionRole) {
+        this.runUnitInspectionRole = runUnitInspectionRole;
+    }
+    @ExcelField(title = "施工合同单位", align = 2, sort = 58)
+    public String getConstructionContractUnit() {
+        return constructionContractUnit;
+    }
+
+    public void setConstructionContractUnit(String constructionContractUnit) {
+        this.constructionContractUnit = constructionContractUnit;
+    }
+    @ExcelField(title = "施工合同率", align = 2, sort =59)
+    public Double getConstructionContractRate() {
+        return constructionContractRate;
+    }
+
+    public void setConstructionContractRate(Double constructionContractRate) {
+        this.constructionContractRate = constructionContractRate;
+    }
+    @ExcelField(title = "施工分包单位", align = 2, sort = 60)
+    public String getConstructionContractSub() {
+        return constructionContractSub;
+    }
+
+    public void setConstructionContractSub(String constructionContractSub) {
+        this.constructionContractSub = constructionContractSub;
+    }
+    @ExcelField(title = "施工单位技经专职", align = 2, sort = 61)
+    public String getConstructionSkillByFull() {
+        return constructionSkillByFull;
+    }
+
+    public void setConstructionSkillByFull(String constructionSkillByFull) {
+        this.constructionSkillByFull = constructionSkillByFull;
+    }
+    @ExcelField(title = "自动化备注", align = 2, sort = 62)
+    public String getAutomatedRemarks() {
+        return automatedRemarks;
+    }
+
+    public void setAutomatedRemarks(String automatedRemarks) {
+        this.automatedRemarks = automatedRemarks;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/CapitalPlanMapper.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.managementcenter.project.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.project.entity.CapitalPlan;
+
+import java.util.List;
+
+
+@MyBatisMapper
+public interface CapitalPlanMapper extends BaseMapper<CapitalPlan> {
+    List<String> findPlanProjectId();
+
+    void insertList(List<CapitalPlan> capitalPlanList);
+
+    void updateList(List<CapitalPlan> capitalPlanList);
+}

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

@@ -6,10 +6,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.project.entity.PickingRequisition;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.entity.ProjectAcquisition;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
-import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -22,5 +20,5 @@ public interface PickingRequisitionMapper extends BaseMapper<PickingRequisition>
     //查找登录名id
     List<String> findUserId(@Param("list") List<String> list);
 
-    List<Acquisition> findListAcquisition(@Param("list")List<Project> list);
+    List<Acquisition> findListAcquisition(@Param("list")List<Project1> list);
 }

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

@@ -7,7 +7,8 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.PickingRequisition;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
+import com.sun.tools.corba.se.idl.StringGen;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,7 +16,146 @@ import java.util.List;
 @MyBatisMapper
 public interface ProjectMapper extends BaseMapper<Project> {
 
-    public void updateStatus(Project project);
+    /**
+     * 修改项目前期基本信息
+     */
+    void insertBasic(Project project);
+
+    /**
+     * 导入批量项目前期基本信息
+     */
+    void insertBasicList(List<Project> project);
+
+    /**
+     * 导入批量项目前期基本信息
+     */
+    void insertAssList(List<Project> project);
+
+    /**
+     * 导入批量项目立项信息
+     */
+    void insertApprovalList(List<Project> project);
+
+    /**
+     * 批量修改导入的项目信息
+     */
+    void updateBasicList(List<Project> project);
+
+    /**
+     * 批量修改导入的施工任务分配信息
+     */
+    void updateAssList(List<Project> project);
+
+    /**
+     * 批量修改导入的项目立项信息
+     */
+    void updateApprovalList(List<Project> project);
+
+    /**
+     * 批量导入交底计划安排
+     */
+    void insertPlanList(List<Project> project);
+
+    /**
+     * 批量修改导入的交底计划安排
+     */
+    void updatePlanList(List<Project> project);
+
+    /**
+     * 项目现有项目所有的项目名称
+     */
+    List<String> allProjectName();
+
+    /**
+     * 项目现有项目所有的项目定义号
+     */
+    List<String> allProjectId();
+
+    /**
+     * 根据名称查询项目前期基本信息
+     */
+    Project findProByName(String name);
+
+    /**
+     * 根据名称查询施工任务分配信息
+     */
+    Project findAssByName(String name);
+
+
+    /**
+     * 根据名称查询交底计划安排信息
+     */
+    Project findPlanByName(String name);
+
+    /**
+     * 根据名称查询项目立项信息
+     */
+    Project findApprovalByName(String id);
+
+    /**
+     * 修改项目前期基本信息
+     * */
+    void updateBasic(Project project);
+
+    /**
+     * 施工任务分配信息数据
+     */
+    List<Project> findAssList(Project project);
+
+    /**
+     * 交底计划安排
+     */
+    List<Project> findPlanList(Project project);
+
+    /**
+     * 项目立项信息
+     */
+    List<Project> findApprovalList(Project project);
+
+    /**
+     * 项目名称查询项目信息
+     * */
+    Project findProcess(String name);
+
+    /**
+     * 根据年度物资上报id获取施工任务分配信息
+     */
+    Project getAss(Project project);
+
+    /**
+     * 根据年度物资上报id获取交底计划安排信息
+     */
+    Project getPlan(Project project);
+
+    /**
+     * 根据年度物资上报id获取项目立项信息信息
+     */
+    Project getApproval(Project project);
+
+    /**
+     * 查找系统中所有人员信息
+     */
+    List<String> findAllMember();
+
+    /**
+     * 获取需求单位
+     */
+    String findDemandUnit(String name);
+
+    /**
+     * 通过流程定义号获取需求单位
+     */
+    String demandByProcInsId(String procInsId);
+
+
+    /**
+     * 通过id获取项目暂定名称
+     */
+    String reserveProjectNameById(String id);
+
+    /*#################################################################################################*/
+
+    void updateStatus(Project project);
 
     /**
      * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
@@ -26,12 +166,18 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     void updateAcquisitionStatus(@Param("acquisitionStatus")String acquisitionStatus,@Param("id") String id);
 
-    public List<Project> findListById(String[] proListId);
+    /**
+     * 根据id，查询所有项目信息
+     * */
+    List<Project> findListById(String[] projectIds);
 
-    int insertList(@Param("list") List<Project> list);
+    int insertList(@Param("list") List<Project1> list);
 
-    List<Project> findListProject(List<Project> projects);
+    List<Project> findListProject(List<Project1> projects);
 
+    /**
+     * 通过流程定实例id查询项目流转人员信息-施工交底流程
+     * */
     Project findUser(String procInsId);
 
     Project findWZUser(String procInsId);
@@ -42,7 +188,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     Project findUserById(String projectId);
 
-    Integer updatePreConstruction(Project project);
+    Integer updatePreConstruction(Project1 project);
 
     //查找项目信息
     List<Project> findListProjectRequisitions(@Param("list") List<PickingRequisition> list);
@@ -51,5 +197,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     String findDefId(String key);
 
-    Project findIdConProc(String procInsId);
+    Project1 findIdConProc(String procInsId);
+
+    Project findProjectList(Project project);
 }

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

@@ -0,0 +1,178 @@
+<?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.managementcenter.project.mapper.CapitalPlanMapper">
+
+    <sql id="projectColumns">
+        a.id,
+        a.projectId,
+        a.projectName
+    </sql>
+
+    <sql id="approvalColumns">
+        c.projectBudget,
+        c.constructionCost,
+        c.materialCost,
+        c.designFee,
+        c.supervisionFee,
+        c.policyFee as 'policyProcessingFee',
+        c.otherExpenses
+    </sql>
+
+    <sql id="capitalPlanColumns">
+        b.projectBatch,
+        b.actualCost,
+        b.projectDifference,
+        b.actualConstructionCost,
+        b.constructionDifference,
+        b.actualMaterialCost,
+        b.costDifference,
+        b.DesignPayFee,
+        b.actualDesignCost,
+        b.designDifference,
+        b.supervisionPayFee,
+        b.actualSupervisionCost,
+        b.supervisionDifference,
+        b.ActualManagementFee,
+        b.policyDifference,
+        b.actualOtherCost,
+        b.otherDifference
+    </sql>
+
+    <select id="get" resultType="CapitalPlan">
+        SELECT
+        <include refid="projectColumns"/>,
+        <include refid="capitalPlanColumns"/>
+        FROM xm_material_project a
+        left join xm_capital_plan b
+        on a.projectId = b.projectId
+        WHERE a.id = #{id}
+    </select>
+
+    <select id="findList" resultType="CapitalPlan">
+        SELECT
+        <include refid="projectColumns"/>,
+        <include refid="approvalColumns"/>,
+        <include refid="capitalPlanColumns"/>
+        FROM xm_material_project a
+        left join xm_capital_plan b
+        on a.projectId = b.projectId
+        left join xm_project_approval c
+        on a.projectId = c.projectId
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            ${dataScope}
+            and a.projectid != ''
+        </where>
+        <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>
+
+    <select id="findAllList" resultType="CapitalPlan">
+        SELECT
+        <include refid="projectColumns"/>,
+        <include refid="capitalPlanColumns"/>
+        FROM xm_material_project a
+        left join xm_capital_plan b
+        on a.projectId = b.projectId
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            ${dataScope}
+        </where>
+        <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_picking_contrast(
+            id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            remarks,
+            del_flag,
+            requisition,
+            projectDefinition
+            )
+        VALUES (
+            #{id},
+            #{createBy.id},
+            #{createDate},
+            #{updateBy.id},
+            #{updateDate},
+            #{remarks},
+            #{delFlag},
+            #{requisition},
+            #{projectDefinition}
+            )
+    </insert>
+
+    <select id="findPlanProjectId" resultType="java.lang.String">
+        select projectId from xm_capital_plan
+    </select>
+
+    <insert id="insertList">
+        insert into xm_capital_plan
+        (
+            id,
+            create_by,
+            create_date,
+            update_by,
+            update_date,
+            del_flag,
+            remarks,
+            projectId,
+            actualCost,
+            actualConstructionCost,
+            actualMaterialCost,
+            actualDesignCost,
+            actualSupervisionCost,
+            actualOtherCost
+        )
+        values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.id},
+            #{item.createBy.id},
+            #{item.createDate},
+            #{item.updateBy.id},
+            #{item.updateDate},
+            #{item.delFlag},
+            #{item.remarks},
+            #{item.projectId},
+            #{item.actualCost},
+            #{item.actualConstructionCost},
+            #{item.actualMaterialCost},
+            #{item.actualDesignCost},
+            #{item.actualSupervisionCost},
+            #{item.actualOtherCost}
+            )
+        </foreach>
+    </insert>
+
+    <update id="updateList">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update xm_capital_plan
+            set
+            actualCost = #{item.actualCost},
+            actualConstructionCost = #{item.actualConstructionCost},
+            actualMaterialCost = #{item.actualMaterialCost},
+            actualDesignCost = #{item.actualDesignCost},
+            actualSupervisionCost = #{item.actualSupervisionCost},
+            actualOtherCost = #{item.actualOtherCost}
+            where projectId =#{item.projectId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -0,0 +1,54 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.project.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.CapitalPlan;
+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;
+import com.jeeplus.modules.sg.managementcenter.project.mapper.CapitalPlanMapper;
+import com.jeeplus.modules.sg.managementcenter.project.mapper.PickingRequisitionMapper;
+import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 资金计划管理
+ */
+@Service
+@Transactional(readOnly = true)
+public class CapitalPlanService extends CrudService<CapitalPlanMapper, CapitalPlan> {
+    @Autowired
+	private CapitalPlanMapper capitalPlanMapper;
+
+    @Autowired
+    private ProjectMapper projectMapper;
+
+    public List<String> allProjectId() {
+        return projectMapper.allProjectId();
+    }
+
+    public List<String> findPlanProjectId() {
+        return capitalPlanMapper.findPlanProjectId();
+    }
+
+    @Transactional(readOnly = false)
+    public void insertList(List<CapitalPlan> capitalPlanList) {
+        for (CapitalPlan p : capitalPlanList) {
+            p.preInsert();
+        }
+        capitalPlanMapper.insertList(capitalPlanList);
+    }
+
+    @Transactional(readOnly = false)
+    public void updateList(List<CapitalPlan> capitalPlanList) {
+        capitalPlanMapper.updateList(capitalPlanList);
+    }
+}

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

@@ -6,7 +6,7 @@ package com.jeeplus.modules.sg.managementcenter.project.service;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 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;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.PickingRequisitionMapper;
 import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class PickingRequisitionService extends CrudService<PickingRequisitionMap
 	}
 
 	//根据项目id去查找项目领导时间
-	public List<Acquisition> getFindListDate(List<Project> projects){
+	public List<Acquisition> getFindListDate(List<Project1> projects){
 		return pickingRequisitionMapper.findListAcquisition(projects);
 	}
 }

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

@@ -3,19 +3,9 @@
  */
 package com.jeeplus.modules.sg.managementcenter.project.service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import com.jeeplus.common.json.AjaxJson;
-import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
-import com.jeeplus.modules.sg.managementcenter.project.entity.PickingRequisition;
+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.entity.ProjectManager;
 import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
-import com.jeeplus.modules.sys.entity.User;
-import io.swagger.models.auth.In;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,10 +13,12 @@ import org.springframework.transaction.annotation.Transactional;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 
+import java.util.List;
+
 /**
- * 请假表单Service
- * @author lgf
- * @version 2018-06-12
+ * 项目基础信息表单
+ * @author lem
+ * @version 2020-04-29
  */
 @Service
 @Transactional(readOnly = true)
@@ -34,49 +26,261 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
     @Autowired
 	private ProjectMapper projectMapper;
 
-	public Project get(String id) {
-		Project project = super.get(id);
-		return project;
+	@Override
+	public Page<Project> findPage(Page<Project> page, Project entity) {
+		return super.findPage(page, entity);
 	}
-	
-	public List<Project> findList(Project project) {
-		return super.findList(project);
+
+	public Page<Project> findAssPage(Page<Project> page, Project project) {
+		dataRuleFilter(project);
+		project.setPage(page);
+		page.setList(mapper.findAssList(project));
+		return page;
 	}
-	
-	public Page<Project> findPage(Page<Project> page, Project project) {
-		return super.findPage(page, project);
+
+	/**
+	 * 交底计划安排
+	 */
+	public Page<Project> findPlanPage(Page<Project> page, Project project) {
+		dataRuleFilter(project);
+		project.setPage(page);
+		page.setList(mapper.findPlanList(project));
+		return page;
 	}
 
+	/**
+	 * 项目立项信息
+	 */
+	public Page<Project> findApprovalPage(Page<Project> page, Project project) {
+		dataRuleFilter(project);
+		project.setPage(page);
+		page.setList(mapper.findApprovalList(project));
+		return page;
+	}
+
+
+	/**
+	 * 修改项目前期基础信息
+	 * */
 	@Transactional(readOnly = false)
-	public void save(Project project) {
-		super.save(project);
+	public void insertBasic(Project project) {
+		project.preInsert();
+		projectMapper.insertBasic(project);
 	}
-	
+
+	/**
+	 * 导入批量前期基础信息
+	 * */
 	@Transactional(readOnly = false)
-	public void delete(Project project) {
-		super.delete(project);
+	public void insertBasicList(List<Project> project) {
+		for (Project p : project) {
+			p.preInsert();
+		}
+		projectMapper.insertBasicList(project);
+	}
+
+	/**
+	 * 批量修改导入的项目信息
+	 * */
+	@Transactional(readOnly = false)
+	public void updateBasicList(List<Project> project) {
+		projectMapper.updateBasicList(project);
+	}
+
+	/**
+	 * 导入批量施工任务分配信息
+	 * */
+	@Transactional(readOnly = false)
+	public void insertAssList(List<Project> project) {
+		for (Project p : project) {
+			p.preInsert();
+		}
+		projectMapper.insertAssList(project);
+	}
+
+	/**
+	 * 导入批量项目立项信息
+	 */
+	@Transactional(readOnly = false)
+	public void insertApprovalList(List<Project> project) {
+		for (Project p : project) {
+			p.preInsert();
+		}
+		projectMapper.insertApprovalList(project);
+	}
+
+	/**
+	 * 批量修改导入的施工任务分配信息
+	 * */
+	@Transactional(readOnly = false)
+	public void updateAssList(List<Project> project) {
+		projectMapper.updateAssList(project);
+	}
+
+	/**
+	 * 批量修改导入的项目立项信息
+	 */
+	@Transactional(readOnly = false)
+	public void updateApprovalList(List<Project> project) {
+		projectMapper.updateApprovalList(project);
+	}
+
+	/**
+	 * 导入批量交底计划安排
+	 * */
+	@Transactional(readOnly = false)
+	public void insertPlanList(List<Project> project) {
+		for (Project p : project) {
+			p.preInsert();
+		}
+		projectMapper.insertPlanList(project);
+	}
+
+	/**
+	 * 批量修改导入的交底计划安排
+	 * */
+	@Transactional(readOnly = false)
+	public void updatePlanList(List<Project> project) {
+		projectMapper.updatePlanList(project);
+	}
+
+	/**
+	 * 修改项目前期基本信息
+	 */
+	@Transactional(readOnly = false)
+	public void updateBasic(Project project) {
+		projectMapper.updateBasic(project);
+	}
+
+	/**
+	 * 根据名称查询项目前期基本信息
+	 */
+	public Project findProByName(String name) {
+		return projectMapper.findProByName(name);
+	}
+
+	/**
+	 * 根据名称查询施工任务分配信息
+	 */
+	public Project findAssByName(String name) {
+		return projectMapper.findAssByName(name);
+	}
+
+	/**
+	 * 根据名称查询交底计划安排信息
+	 */
+	public Project findPlanByName(String name) {
+		return projectMapper.findPlanByName(name);
+	}
+
+	/**
+	 * 根据名称查询项目立项信息
+	 */
+	public Project findApprovalByName(String name) {
+		return projectMapper.findApprovalByName(name);
+	}
+
+
+	/**
+	 * 根据年度物资上报id获取施工任务分配信息
+	 */
+	public Project getAss(Project project) {
+		return projectMapper.getAss(project);
+	}
+
+	/**
+	 * 根据年度物资上报id获取交底计划安排
+	 */
+	public Project getPlan(Project project) {
+		return projectMapper.getPlan(project);
+	}
+
+	/**
+	 * 根据年度物资上报id获取项目立项信息信息
+	 */
+	public Project getApproval(Project project) {
+		return projectMapper.getApproval(project);
+	}
+
+	/**
+	 * 获取需求单位
+	 */
+	public String findDemandUnit(String name) {
+		return projectMapper.findDemandUnit(name);
+	}
+
+	/**
+	 * 通过流程定义号获取需求单位
+	 */
+	public String demandByProcInsId(String procInsId) {
+		return projectMapper.demandByProcInsId(procInsId);
+	}
+
+
+	/**
+	 * 根据id组查询所有项目信息
+	 * */
+	public List<Project> findListById(String[] projectIds) {
+		return projectMapper.findListById(projectIds);
+	}
+
+
+	/**
+	 * 通过id获取项目暂定名称
+	 */
+	public String reserveProjectNameById(String id) {
+		return projectMapper.reserveProjectNameById(id);
+	}
+
+	/**
+	 * 通过流程定实例id查询项目流转人员信息
+	 * */
+	public Project findUser(String procInsId) {
+		return projectMapper.findUser(procInsId);
+	}
+	/*public Project get(String id) {
+		Project project1 = super.get(id);
+		return project1;
+	}
+
+	public List<Project> findList(Project project1) {
+		return super.findList(project1);
+	}
+
+	public Page<Project> findPage(Page<Project> page, Project project1) {
+		return super.findPage(page, project1);
+	}
+
+	@Transactional(readOnly = false)
+	public void save(Project project1) {
+		super.save(project1);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(Project project1) {
+		super.delete(project1);
 	}
 
 	@Transactional
-	public void updateStatus(Project project){
-	    projectMapper.updateStatus(project);
+	public void updateStatus(Project project1){
+	    projectMapper.updateStatus(project1);
     }
 
 	public List<Project> findListById(String[] proListId) {
 		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);
@@ -84,7 +288,7 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 
 	//配网项目经理导入
 	@Transactional(readOnly = false)
-	public void saveList(List<Project> projects) {
+	public void saveList(List<Project> project1s) {
 		Boolean flag = false;
 		String statusString = "0";
 		Integer statusInt = 0;
@@ -92,33 +296,33 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		List<Project> list = projectMapper.findList(project1);
 		List<Project> updateList = new ArrayList<Project>();//添加状态改变的
 		List<Project> insertList = new ArrayList<Project>();//添加状态不变的
-		for (Project projectA:projects){
+		for (Project project1A : project1s){
 			flag = true;
-			for (Project projectB:list){
-				if (projectA.getRequireName().equals(projectB.getRequireName())){
-					projectA.setId(projectB.getId());
-					projectA.setStatus(projectB.getStatus());
-					projectA.setAcquisitionStatus(projectB.getAcquisitionStatus());
-					projectA.setWhetherCloseStatus(projectB.getWhetherCloseStatus());
-					projectA.setConstructionStatus(projectB.getConstructionStatus());
-					projectA.setEarlyMaterial(projectB.getEarlyMaterial());
-					projectA.setPreConstruction(projectB.getPreConstruction());
-					projectA.setRezkey(projectB.getRezkey());
-					updateList.add(projectA);
+			for (Project project1B :list){
+				if (project1A.getRequireName().equals(project1B.getRequireName())){
+					project1A.setId(project1B.getId());
+					project1A.setStatus(project1B.getStatus());
+					project1A.setAcquisitionStatus(project1B.getAcquisitionStatus());
+					project1A.setWhetherCloseStatus(project1B.getWhetherCloseStatus());
+					project1A.setConstructionStatus(project1B.getConstructionStatus());
+					project1A.setEarlyMaterial(project1B.getEarlyMaterial());
+					project1A.setPreConstruction(project1B.getPreConstruction());
+					project1A.setRezkey(project1B.getRezkey());
+					updateList.add(project1A);
 					flag = false;
 					break;
 				}
 			}
 			if (flag){
-				projectA.setStatus(statusString);
-				projectA.setAcquisitionStatus(statusString);
-				projectA.setConstructionStatus(statusString);
-				projectA.setWhetherCloseStatus(statusString);
-				projectA.setEarlyMaterial(statusInt);
-				projectA.setPreConstruction(statusInt);
-				projectA.setRezkey("0");
-				projectA.preInsert();
-				insertList.add(projectA);
+				project1A.setStatus(statusString);
+				project1A.setAcquisitionStatus(statusString);
+				project1A.setConstructionStatus(statusString);
+				project1A.setWhetherCloseStatus(statusString);
+				project1A.setEarlyMaterial(statusInt);
+				project1A.setPreConstruction(statusInt);
+				project1A.setRezkey("0");
+				project1A.preInsert();
+				insertList.add(project1A);
 			}
 		}
 		if (updateList.size()>0){
@@ -133,13 +337,11 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	}
 
 	//根据id查找项目
-	public List<Project> getListProject(List<Project> projects){
-		return  projectMapper.findListProject(projects);
+	public List<Project> getListProject(List<Project> project1s){
+		return  projectMapper.findListProject(project1s);
 	}
 
-	public Project findUser(String procInsId) {
-		return projectMapper.findUser(procInsId);
-	}
+
 
 	public Project findWZUser(String procInsId) {
 		return projectMapper.findWZUser(procInsId);
@@ -159,8 +361,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	}
 
 	//修改提前施工状态0-未提前施工 2-提前施工
-	public void updatePreConstruction(Project project){
-		projectMapper.updatePreConstruction(project);
+	public void updatePreConstruction(Project project1){
+		projectMapper.updatePreConstruction(project1);
 	}
 
 	//根据项目定义号去查找项目
@@ -175,13 +377,14 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	//查找所有用户信息
 	public List<String> findAllUser(){
 		return projectMapper.findAllUser();
-	}
+	}*/
 
+	/**
+	 * 通过key值查找对应的流程id
+	 * */
 	public String findDefId(String key) {
 		return projectMapper.findDefId(key);
 	}
 
-	public Project findIdConProc(String procInsId) {
-		return projectMapper.findIdConProc(procInsId);
-	}
+
 }

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

@@ -0,0 +1,67 @@
+package com.jeeplus.modules.sg.managementcenter.project.util;
+
+import com.jeeplus.common.utils.SpringContextHolder;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.modules.sg.managementcenter.project.entity.*;
+import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CapitalImportUtil {
+    public static Map<String, List<ImportErp>> getProjectGroup(ImportExcel ei, int lastDataRowNum) {
+        List<ImportErp> importErpList = new ArrayList<>();
+        ImportErp importErp = null;
+        Map<String, List<ImportErp>> map = new HashMap<>();
+        for (int i = 1; i < lastDataRowNum; i++) {
+            Row row = ei.getRow(i);
+            importErp = new ImportErp();
+            String projectId = (String) ei.getCellValue(row, 10);
+            if (null!=projectId && !"".equals(projectId)) {
+                importErp.setCompanyCode((String)ei.getCellValue(row, 0));
+                importErp.setProfitCenter((String)ei.getCellValue(row, 1));
+                importErp.setPostingDate((String)ei.getCellValue(row, 2));
+                importErp.setVoucherCode((String)ei.getCellValue(row, 3));
+                importErp.setArchiveType((String)ei.getCellValue(row, 4));
+                importErp.setArchiveCode((String)ei.getCellValue(row, 5));
+                importErp.setHeaderText((String)ei.getCellValue(row, 6));
+                importErp.setHangUpCode((String)ei.getCellValue(row, 7));
+                importErp.setCode((String)ei.getCellValue(row, 8));
+                importErp.setDescription((String)ei.getCellValue(row, 9));
+                importErp.setProjectId(projectId);
+                importErp.setProjectDescription((String)ei.getCellValue(row, 11));
+                importErp.setAccountCode((String)ei.getCellValue(row, 12));
+                importErp.setAccountName((String)ei.getCellValue(row, 13));
+                importErp.setLendingDirection((String)ei.getCellValue(row, 14));
+                importErp.setLineAmount((String)ei.getCellValue(row, 15));
+                importErp.setNumber((String)ei.getCellValue(row, 16));
+                importErp.setBatch((String)ei.getCellValue(row, 17));
+                importErp.setItemCode((String)ei.getCellValue(row, 18));
+                importErp.setItemDescription((String)ei.getCellValue(row, 19));
+                importErp.setCompany((String)ei.getCellValue(row, 20));
+                importErp.setAmountOfTaxes((String)ei.getCellValue(row, 21));
+                importErp.setInputTax((String)ei.getCellValue(row, 22));
+                importErp.setVoucherNo((String)ei.getCellValue(row, 23));
+                importErp.setPostingDateOut((String)ei.getCellValue(row, 24));
+                importErp.setSupplier((String)ei.getCellValue(row, 25));
+                importErp.setSupplierName((String)ei.getCellValue(row, 26));
+                importErpList.add(importErp);
+            }
+        }
+        for (ImportErp erp : importErpList) {
+            if (map.containsKey(erp.getProjectId())) {
+                map.get(erp.getProjectId()).add(erp);
+            } else {
+                List<ImportErp> mapList = new ArrayList<>();
+                mapList.add(erp);
+                map.put(erp.getProjectId(), mapList);
+            }
+        }
+        return map;
+    }
+}

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

@@ -1,21 +1,14 @@
 package com.jeeplus.modules.sg.managementcenter.project.util;
-import com.jeeplus.common.utils.SpringContextHolder;
-import com.jeeplus.common.websocket.service.system.SystemInfoSocketHandler;
-import com.jeeplus.modules.oa.entity.OaNotify;
 import com.jeeplus.modules.oa.entity.OaNotifyMaterial;
-import com.jeeplus.modules.oa.entity.OaNotifyRecord;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.util.ImportUtil;
 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;
 import com.jeeplus.modules.sg.managementcenter.project.entity.ProjectAcquisition;
 import com.jeeplus.modules.sg.picking.activiti.entity.Acquisition;
-import com.jeeplus.modules.sys.utils.UserUtils;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 
-import javax.servlet.ServletContext;
 import java.util.*;
 
 public  class PickingInfo {
@@ -302,10 +295,10 @@ public  class PickingInfo {
      * @param findListDate 根据项目的id去数据库中查找项目领导审核时间
      * @return 整合后的集合
      */
-    public static List<ProjectAcquisition> getListProjectAcquisition(List<Project> listProjectPicking,List<Acquisition> findListDate){
+    public static List<ProjectAcquisition> getListProjectAcquisition(List<Project1> listProjectPicking, List<Acquisition> findListDate){
         List<ProjectAcquisition> projectAcquisitions = new ArrayList<ProjectAcquisition>();
         ProjectAcquisition projectAcquisition = null;
-        for (Project project:listProjectPicking){
+        for (Project1 project : listProjectPicking){
             for (Acquisition acquisition:findListDate){
                 if (project.getId().equals(acquisition.getProjectId())){
                    if (null!=acquisition.getManagerTime()&&!"".equals(acquisition.getManagerTime())){

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

@@ -1,5 +1,5 @@
 package com.jeeplus.modules.sg.managementcenter.project.util;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,13 +36,13 @@ public  class ProExcelInfo {
      * @param importUtil 导入
      * @return List<ErpAccount> 导入表格数据
      */
-    public static List<Project> getProjectUtil(ImportUtil importUtil)  {
+    public static List<Project1> getProjectUtil(ImportUtil importUtil)  {
         int lastRow = importUtil.getLastDataRowNum();
-        List<Project> list = new ArrayList<Project>();
-        Project project = null;
+        List<Project1> list = new ArrayList<Project1>();
+        Project1 project = null;
         String costEstimate="";//费用估算
         for(int i=2; i<=lastRow;i++){
-            project = new Project();
+            project = new Project1();
             Row row = importUtil.getRow(i);
             String requireName= (String) importUtil.getCellValue(row,5);
             if(StringUtils.isNotBlank(requireName)) {
@@ -144,18 +144,18 @@ public  class ProExcelInfo {
     /*
         对值进行验证 配网工程专职验证
      */
-    public static String getJudgeValue(List<Project> projects,List<String> users){
+    public static String getJudgeValue(List<Project1> projects, List<String> users){
         Boolean flag = false;
         String str = "";
         boolean judgeLoginName = false;
-        for (Project project:projects){
-            if(null==project.getBdzName()||"".equals(project.getBdzName())){//变电站名称
+        for (Project1 project : projects){
+            if(null== project.getBdzName()||"".equals(project.getBdzName())){//变电站名称
                 str+="变电站名称不能为空";
             }
-            if (null==project.getLineName()||"".equals(project.getLineName())){//线路名称
+            if (null== project.getLineName()||"".equals(project.getLineName())){//线路名称
                 str+="线路名称不能为空";
             }
-            if (null==project.getProjectManageRole()||"".equals(project.getProjectManageRole())){
+            if (null== project.getProjectManageRole()||"".equals(project.getProjectManageRole())){
                 str+="配网项目经理不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getProjectManageRole());
@@ -163,7 +163,7 @@ public  class ProExcelInfo {
                     str+="配网项目经理不存在;";
                 }
             }
-            if (null==project.getDistributionEngineering()||"".equals(project.getDistributionEngineering())){//配网工程专职角色
+            if (null== project.getDistributionEngineering()||"".equals(project.getDistributionEngineering())){//配网工程专职角色
                 str+="配网工程专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getDistributionEngineering());
@@ -171,15 +171,15 @@ public  class ProExcelInfo {
                     str+="配网工程专职不存在;";
                 }
             }
-            if (null==project.getDistributionMaterials()||"".equals(project.getDistributionMaterials())){//配网物资专职角色
+            if (null== project.getDistributionMaterials()||"".equals(project.getDistributionMaterials())){//配网物资专职角色
                 str+="配网物资专职不能为空;";
             }else {
-                judgeLoginName = getJudgeLoginName(users,project.getDistributionMaterials());
+                judgeLoginName = getJudgeLoginName(users, project.getDistributionMaterials());
                 if (judgeLoginName){
                     str+="配网物资专职不存在;";
                 }
             }
-            if (null==project.getDistributionSystem()||"".equals(project.getDistributionSystem())){//配网系统专职角色
+            if (null== project.getDistributionSystem()||"".equals(project.getDistributionSystem())){//配网系统专职角色
                 str+="配网系统专职角色为空;";
             }else {
                judgeLoginName = getJudgeLoginName(users, project.getDistributionSystem());
@@ -187,7 +187,7 @@ public  class ProExcelInfo {
                     str+="配网系统专职不存在;";
                 }
             }
-            if (null==project.getDistributionPolicy()||"".equals(project.getDistributionPolicy())){//配网政策处理专职角色
+            if (null== project.getDistributionPolicy()||"".equals(project.getDistributionPolicy())){//配网政策处理专职角色
                 str+="配网政策处理专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getDistributionPolicy());
@@ -195,7 +195,7 @@ public  class ProExcelInfo {
                     str+="配网政策处理专职不存在;";
                 }
             }
-            if (null==project.getManagementLeader()||"".equals(project.getManagementLeader())){//项目管理中心领导角色
+            if (null== project.getManagementLeader()||"".equals(project.getManagementLeader())){//项目管理中心领导角色
                 str+="项目管理中心领导不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getManagementLeader());
@@ -203,7 +203,7 @@ public  class ProExcelInfo {
                     str+="项目管理中心领导不存在;";
                 }
             }
-            if (null==project.getRunUnit()||"".equals(project.getRunUnit())){//运行单位
+            if (null== project.getRunUnit()||"".equals(project.getRunUnit())){//运行单位
                 str+="运行单位不能为空;";
             }else {
                 flag = getJudge(project.getRunUnit(),PRO_LINGTING);
@@ -211,7 +211,7 @@ public  class ProExcelInfo {
                     str+="运行单位填写有误;";
                 }
             }
-            if (null==project.getRunUnitRole()||"".equals(project.getRunUnitRole())){//运行单位角色
+            if (null== project.getRunUnitRole()||"".equals(project.getRunUnitRole())){//运行单位角色
                 str+="运行单位储备专职不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getRunUnitRole());
@@ -219,7 +219,7 @@ public  class ProExcelInfo {
                     str+="运行单位储备专职不存在;";
                 }
             }
-            if (null==project.getRunUnitInspectionRole()){
+            if (null== project.getRunUnitInspectionRole()){
                 str+="运行单位运检不能为空";
             }
 /*            if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
@@ -230,10 +230,10 @@ public  class ProExcelInfo {
                     str+="经研所角色不存在;";
                 }
             }*/
-            if (null==project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
+            if (null== project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
                 str+="施工单位不能为空;";
             }
-            if (null==project.getConstructionUnitRole()||"".equals(project.getConstructionUnitRole())){//施工单位:施工单位角色
+            if (null== project.getConstructionUnitRole()||"".equals(project.getConstructionUnitRole())){//施工单位:施工单位角色
                 str+="施工单位物质专职不能为空;";
             }else {
                judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitRole());
@@ -241,7 +241,7 @@ public  class ProExcelInfo {
                     str+="施工单位物资专职不存在;";
                 }
             }
-            if (null==project.getConstructionUnitManage()||"".equals(project.getConstructionUnitManage())){//施工单位:施工单位角色
+            if (null== project.getConstructionUnitManage()||"".equals(project.getConstructionUnitManage())){//施工单位:施工单位角色
                 str+="施工单位项目经理不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitManage());
@@ -249,7 +249,7 @@ public  class ProExcelInfo {
                     str+="施工单位项目经理不存在;";
                 }
             }
-            if (null==project.getConstructionUnitLeader()||"".equals(project.getConstructionUnitLeader())){//施工单位:施工单位角色
+            if (null== project.getConstructionUnitLeader()||"".equals(project.getConstructionUnitLeader())){//施工单位:施工单位角色
                 str+="施工单位领导不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getConstructionUnitLeader());
@@ -257,18 +257,18 @@ public  class ProExcelInfo {
                     str+="施工单位领导不存在;";
                 }
             }
-            if (null==project.getDesignUnit()||"".equals(project.getDesignUnit())){//设计单位
+            if (null== project.getDesignUnit()||"".equals(project.getDesignUnit())){//设计单位
                 str+="设计单位不能为空;";
             }
-            if (null==project.getDesignUnitManage()||"".equals(project.getDesignUnitManage())){//设计单位角色
+            if (null== project.getDesignUnitManage()||"".equals(project.getDesignUnitManage())){//设计单位角色
                 str+="设计单位人员不能为空;";
             }else {
-                judgeLoginName = getJudgeLoginName(users,project.getDesignUnitManage());
+                judgeLoginName = getJudgeLoginName(users, project.getDesignUnitManage());
                 if (judgeLoginName){
                     str+="设计单位人员不存在;";
                 }
             }
-            if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
+            if (null== project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
                 str+="设计单位领导不能为空;";
             }/*else {
                 judgeLoginName = getJudgeLoginName(users, project.getDesignUnitLeader());
@@ -276,13 +276,13 @@ public  class ProExcelInfo {
                     str+="设计单位领导不存在;";
                 }
             }*/
-            if (null!=project.getType()){//类型
+            if (null!= project.getType()){//类型
                 flag = getJudge(project.getType(), PRO_TYPE);
                 if (flag){
                     str+="类型填写有误;";
                 }
             }
-            if (null!=project.getDemandUnit()){//需求提出单位
+            if (null!= project.getDemandUnit()){//需求提出单位
                 flag = getJudge(project.getDemandUnit(),PRO_NAME);
                 if (flag){
                     str+="需求提出单位填写有误;";
@@ -296,7 +296,7 @@ public  class ProExcelInfo {
 //                    str+="运行单位填写有误;";
 //                }
 //            }
-            if (null==project.getClarificaitonType()||"".equals(project.getClarificaitonType())){//交底类型
+            if (null== project.getClarificaitonType()||"".equals(project.getClarificaitonType())){//交底类型
                     str+="交底类型不能为空;";
             }else {
                 flag = getJudge(project.getClarificaitonType(),PRO_CLARIFICAITON);
@@ -304,7 +304,7 @@ public  class ProExcelInfo {
                     str+="交底类型填写有误;";
                 }
             }
-            if (null==project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
+            if (null== project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
                 str+="停电范围不能为空;";
             }/*else {
                 String[] split = project.getPowerScope().split(";");
@@ -315,7 +315,7 @@ public  class ProExcelInfo {
                     }
                 }
             }*/
-            if (null==project.getProjectType()||"".equals(project.getProjectType())){//项目类型
+            if (null== project.getProjectType()||"".equals(project.getProjectType())){//项目类型
                 str+="项目类型填写不能为空;";
             }else {
                 flag = getJudge(project.getProjectType(), PRO_PROJECT_TYPE);
@@ -323,13 +323,13 @@ public  class ProExcelInfo {
                     str+="项目类型填写有误;";
                 }
             }
-            if (null!=project.getPowerFlagPackage()){//是否为停电打包项目
+            if (null!= project.getPowerFlagPackage()){//是否为停电打包项目
                 flag = getJudge(project.getPowerFlagPackage(), PRO_FLAG);
                 if (flag){
                     str+="是否为停电打包项目填写有误;";
                 }
             }
-            if (null==project.getPreliminaryJudgment()||"".equals(project.getPreliminaryJudgment())){//政策初步判断
+            if (null== project.getPreliminaryJudgment()||"".equals(project.getPreliminaryJudgment())){//政策初步判断
                 str+="政策初步判断不能为空;";
             }else {
                 flag = getJudge(project.getPreliminaryJudgment(), PRO_PRE_JUDGEMENT);
@@ -337,7 +337,7 @@ public  class ProExcelInfo {
                     str+="政策初步判断填写有误;";
                 }
             }
-            if (null==project.getFlagCivilEngineering()||"".equals(project.getFlagCivilEngineering())){//是否含土建
+            if (null== project.getFlagCivilEngineering()||"".equals(project.getFlagCivilEngineering())){//是否含土建
                 str+="是否含土建填写不能为空;";
             }else {
                 flag = getJudge(project.getFlagCivilEngineering(),PRO_FLAG_CIVIL);
@@ -345,7 +345,7 @@ public  class ProExcelInfo {
                     str+="是否含土建填写有误;";
                 }
             }
-            if (null==project.getSteelTubePole()||"".equals(project.getSteelTubePole())){//钢管杆基础类类型
+            if (null== project.getSteelTubePole()||"".equals(project.getSteelTubePole())){//钢管杆基础类类型
                 str+="钢管杆基础类类型填写不能为空;";
             }else {
                 flag = getJudge(project.getSteelTubePole(),PRO_STEEL_TUBE);
@@ -353,7 +353,7 @@ public  class ProExcelInfo {
                     str+="钢管杆基础类类型填写有误;";
                 }
             }
-            if (null==project.getFlagApprovalPlanning()||"".equals(project.getFlagApprovalPlanning())){//是否需要规划报批
+            if (null== project.getFlagApprovalPlanning()||"".equals(project.getFlagApprovalPlanning())){//是否需要规划报批
                 str+="是否需要规划报批填写不能为空;";
             }else {
                 flag = getJudge(project.getFlagApprovalPlanning(),PRO_FLAG);
@@ -361,7 +361,7 @@ public  class ProExcelInfo {
                     str+="是否需要规划报批填写有误;";
                 }
             }
-            if (null==project.getEquCreateType()||"".equals(project.getEquCreateType())){//设备改造类型
+            if (null== project.getEquCreateType()||"".equals(project.getEquCreateType())){//设备改造类型
                 str+="设备改造类型填写有误;";
             }else {
                 flag = getJudge(project.getEquCreateType(),PRO_EQU_TYPE);
@@ -375,7 +375,7 @@ public  class ProExcelInfo {
                     }
                 }
             }
-            if (null==project.getFlagNewEquName()||"".equals(project.getFlagNewEquName())){//是否含新设备命名
+            if (null== project.getFlagNewEquName()||"".equals(project.getFlagNewEquName())){//是否含新设备命名
                 str+="是否含新设备命名填写不能为空;";
             }else {
                 flag = getJudge(project.getFlagNewEquName(),PRO_FLAG);
@@ -383,7 +383,7 @@ public  class ProExcelInfo {
                     str+="是否含新设备命名填写有误;";
                 }
             }
-            if (null==project.getIncludeBdzNews()||"".equals(project.getIncludeBdzNews())){//是否含变电站新间间隔投运
+            if (null== project.getIncludeBdzNews()||"".equals(project.getIncludeBdzNews())){//是否含变电站新间间隔投运
                     str+="是否含变电站新间间隔投运填写不能为空;";
             }else {
                 flag = getJudge(project.getIncludeBdzNews(),PRO_FLAG);
@@ -391,7 +391,7 @@ public  class ProExcelInfo {
                     str+="是否含变电站新间间隔投运填写有误;";
                 }
             }
-            if (null==project.getFlagNoElectrical()||"".equals(project.getFlagNoElectrical())){//是否含非设电电气施工
+            if (null== project.getFlagNoElectrical()||"".equals(project.getFlagNoElectrical())){//是否含非设电电气施工
                 str+="是否含非设电电气施工填写不能为空;";
             }else {
                 flag = getJudge(project.getFlagNoElectrical(),PRO_FLAG);
@@ -399,7 +399,7 @@ public  class ProExcelInfo {
                     str+="是否含非设电电气施工填写有误;";
                 }
             }
-            if (null==project.getDrawingsWork()||"".equals(project.getDrawingsWork())){//图纸标注的带点作业情况
+            if (null== project.getDrawingsWork()||"".equals(project.getDrawingsWork())){//图纸标注的带点作业情况
                 str+="图纸标注的带点作业情况填写不能为空;";
             }else {
                 flag = getJudge(project.getDrawingsWork(),PRO_DRAWING_WORK);
@@ -408,7 +408,7 @@ public  class ProExcelInfo {
                 }
             }
             //自动化
-            if (null==project.getFlagAutomation() || "".equals(project.getFlagAutomation())){//是否含自动化
+            if (null== project.getFlagAutomation() || "".equals(project.getFlagAutomation())){//是否含自动化
                     str+="是否含自动化填写不能为空;;";
             }else {
                 flag = getJudge(project.getFlagAutomation(),PRO_FLAG);
@@ -436,14 +436,14 @@ public  class ProExcelInfo {
                         }
                         boolean flag1=true;
                         //柱开集中或就业地
-                        if (null!=project.getStayOpenArea()&&!"".equals(project.getStayOpenArea())){//柱开集中或就业地
+                        if (null!= project.getStayOpenArea()&&!"".equals(project.getStayOpenArea())){//柱开集中或就业地
                             flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
                             if (flag){
                                 str+="柱开集中或就业地填写有误;";
                             }
                             flag1 = false;
                         }
-                        if (null!=project.getRingNetworkCabinet()&&!"".equals(project.getRingNetworkCabinet())){//环网柜
+                        if (null!= project.getRingNetworkCabinet()&&!"".equals(project.getRingNetworkCabinet())){//环网柜
                             flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
                             if (flag){
                                 str+="环网柜填写有误;";
@@ -457,33 +457,33 @@ public  class ProExcelInfo {
                 }
             }
             boolean flag2 = false;
-            if (null!=project.getTwoAndThreeRemote()){
+            if (null!= project.getTwoAndThreeRemote()){
                 if (project.getTwoAndThreeRemote().equals("混合")){
                     flag2 = true;
                 }
             }
-            if (null!=project.getPhoneStyle()){
+            if (null!= project.getPhoneStyle()){
                 if (project.getPhoneStyle().equals("混合")){
                     flag2 = true;
                 }
             }
-            if (null!=project.getStayOpenArea()){
+            if (null!= project.getStayOpenArea()){
                 if (project.getStayOpenArea().equals("混合")){
                     flag2 = true;
                 }
             }
-            if (null!=project.getRingNetworkCabinet()){
+            if (null!= project.getRingNetworkCabinet()){
                 if (project.getRingNetworkCabinet().equals("混合")){
                     flag2 = true;
                 }
             }
             if (flag2){
-                if (null==project.getAutomatedRemarks()||"".equals(project.getAutomatedRemarks())){
+                if (null== project.getAutomatedRemarks()||"".equals(project.getAutomatedRemarks())){
                     str+="自动化备注不能为空;";
                 }
             }
             if (!"".equals(str)){
-                str+="：错误项目为：["+project.getRequireName()+"]";
+                str+="：错误项目为：["+ project.getRequireName()+"]";
                 return str;
             }
         }
@@ -539,14 +539,14 @@ public  class ProExcelInfo {
     }
 
     //进行导入角色筛选 项目经理
-    public static List<Project> getSureProjectsManager(List<Project> projects){
+    public static List<Project1> getSureProjectsManager(List<Project1> projects){
         String loginName = UserUtils.getUser().getLoginName();
         if ("admin".equals(loginName)){
             return projects;
         }
         String name = UserUtils.getUser().getName();
         for (int i = 0; i < projects.size(); i++) {
-            if (null!=projects.get(i).getProjectManageRole()){//项目经理角色
+            if (null!= projects.get(i).getProjectManageRole()){//项目经理角色
                 if (!name.equals(projects.get(i).getProjectManageRole())){
                     projects.remove(i);
                     i--;
@@ -561,13 +561,13 @@ public  class ProExcelInfo {
      * @param projectList 数据库中查到的集合
      * @return 去掉数据库中不存在的数据
      */
-    public static List<Project> getSureManagerProject(List<Project> projectsManager,List<Project> projectList){
+    public static List<Project1> getSureManagerProject(List<Project1> projectsManager, List<Project1> projectList){
         String requireName = "";//需求项目名称
         boolean flag = false;//开关
         for (int i = 0; i < projectsManager.size(); i++) {
             requireName = projectsManager.get(i).getRequireName();
             flag = true;
-            for (Project project:projectList){
+            for (Project1 project : projectList){
                 if (project.getRequireName().equals(requireName)){
                     flag = false;
                     break;
@@ -596,13 +596,13 @@ public  class ProExcelInfo {
         return "2";
     }
 
-    public static boolean getFlagUpdate(Project project){
+    public static boolean getFlagUpdate(Project1 project){
         if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
             ||!project.getConstructionStatus().equals("0")
-            ||project.getEarlyMaterial()!=0||project.getPreConstruction()!=0){
-            if (project.getStatus().equals("3")&&project.getAcquisitionStatus().equals("3")
-                    &&project.getConstructionStatus().equals("3")
-                    &&project.getEarlyMaterial()==3 && project.getPreConstruction()==3){
+            || project.getEarlyMaterial()!=0|| project.getPreConstruction()!=0){
+            if (project.getStatus().equals("3")&& project.getAcquisitionStatus().equals("3")
+                    && project.getConstructionStatus().equals("3")
+                    && project.getEarlyMaterial()==3 && project.getPreConstruction()==3){
                 return false;
             }
             return true;

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

@@ -0,0 +1,563 @@
+package com.jeeplus.modules.sg.managementcenter.project.util;
+
+import com.jeeplus.common.utils.SpringContextHolder;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.modules.sg.audit.information.service.InformationService;
+import com.jeeplus.modules.sg.managementcenter.project.entity.*;
+import com.jeeplus.modules.sg.managementcenter.project.mapper.ProjectMapper;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import groovy.util.IFileNameFinder;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ProjectImportUtil {
+    private static ProjectMapper projectMapper = SpringContextHolder.getBean(ProjectMapper.class);
+    public static String[] PRO_NAT = {"资本", "成本"};
+    public static String[] DEM_UNIT = {"经研所", "新区", "丹徒", "城区"};
+    public static String[] OPE_UNIT = {"新区", "丹徒", "城区"};
+    public static String[] PRO_TYPE = {"配变改造", "配变新增", "电缆项目", "配变新增", "杆线项目", "混合项目", "纯自动化", "纯土建", "井盖维修", "环网柜更换", "箱变更换", "其他特殊类"};
+    public static String[] DIS_TYPE = {"项目经理组织交底", "施工单位自行交底"};
+    public static String[] ASS_UNIT = {"镇江大照电力建设有限公司", "镇江市金龙电业发展有限公司"};
+    public static String[] CON_UNIT = {"配电工区", "工程公司", "新区供电", "振农公司"};
+
+    /**
+     * 前期基本信息数据验证方法
+     */
+    public static Map<String, Object> basicValidation(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;
+        Boolean proNa = false;
+        //获取所有的已有项目信息-比对，项目名称项目的数据进行数据比对
+        List<Project> compareList = new ArrayList<>();
+        List<Project> noCompareList = new ArrayList<>();
+        List<String> strings = projectMapper.allProjectName();
+        for (String a : strings) {
+            for (int i = 6; i < lastDataRowNum; i++) {
+                project = new Project();
+                Row row = ei.getRow(i);
+                //获取表格项目名称
+                Object reserveProjectName = ei.getCellValue(row, 1);
+                if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
+                    //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
+                    Project proByName = projectMapper.findProByName((String) reserveProjectName);
+                    project.setBasicInformation(new BasicInformation());
+                    if (proByName != null) {
+                        Boolean aBoolean = checkProcess((String) reserveProjectName);
+                        if (!aBoolean) {
+                            flagStr += proByName.getBasicInformation().getReserveProjectName() + "项目流程运行中，不能更改信息\n";
+                            continue;
+                        }
+                        project.getBasicInformation().setReserveProjectName(proByName.getBasicInformation().getReserveProjectName());
+                        project.getBasicInformation().setPowerSupplyArea((String) ei.getCellValue(row, 7));
+                        project.getBasicInformation().setGridNumber((String) ei.getCellValue(row, 8));
+                        project.getBasicInformation().setCellNumber((String) ei.getCellValue(row, 9));
+                        project.getBasicInformation().setProjectReserveNo((String) ei.getCellValue(row, 10));
+                        project.getBasicInformation().setGridProjectNo((String) ei.getCellValue(row, 11));
+                        project.getBasicInformation().setNecessityContent((String) ei.getCellValue(row, 13));
+                        project.getBasicInformation().setSubStationName((String) ei.getCellValue(row, 14));
+                        project.getBasicInformation().setLineName((String) ei.getCellValue(row, 15));
+                        project.getBasicInformation().setWhetherSummer((String) ei.getCellValue(row, 17));
+                        project.getBasicInformation().setBasicDescription((String) ei.getCellValue(row, 18));
+                        project.getBasicInformation().setWorkAreaRemarks((String) ei.getCellValue(row, 19));
+                        noCompareList.add(project);
+                    } else {
+                        project.getBasicInformation().setReserveProjectName((String) ei.getCellValue(row, 1));
+                        project.getBasicInformation().setMunicipalCompany((String) ei.getCellValue(row, 2));
+                        project.getBasicInformation().setCountyCompany((String) ei.getCellValue(row, 3));
+                        project.getBasicInformation().setProjectNature((String) ei.getCellValue(row, 4));
+                        project.getBasicInformation().setDemandUnit((String) ei.getCellValue(row, 5));
+                        project.getBasicInformation().setOperationUnit((String) ei.getCellValue(row, 6));
+                        project.getBasicInformation().setPowerSupplyArea((String) ei.getCellValue(row, 7));
+                        project.getBasicInformation().setGridNumber((String) ei.getCellValue(row, 8));
+                        project.getBasicInformation().setCellNumber((String) ei.getCellValue(row, 9));
+                        project.getBasicInformation().setProjectReserveNo((String) ei.getCellValue(row, 10));
+                        project.getBasicInformation().setGridProjectNo((String) ei.getCellValue(row, 11));
+                        project.getBasicInformation().setErpNo((String) ei.getCellValue(row, 12));
+                        project.getBasicInformation().setNecessityContent((String) ei.getCellValue(row, 13));
+                        project.getBasicInformation().setSubStationName((String) ei.getCellValue(row, 14));
+                        project.getBasicInformation().setLineName((String) ei.getCellValue(row, 15));
+                        project.getBasicInformation().setProjectType((String) ei.getCellValue(row, 16));
+                        project.getBasicInformation().setWhetherSummer((String) ei.getCellValue(row, 17));
+                        project.getBasicInformation().setBasicDescription((String) ei.getCellValue(row, 18));
+                        project.getBasicInformation().setWorkAreaRemarks((String) ei.getCellValue(row, 19));
+                        compareList.add(project);
+                    }
+                }
+            }
+        }
+        //得到比对后list，进行数据验证，成功存入list返回，失败，返回
+        for (Project p : compareList) {
+            proNa = false;
+            str = "";
+            String reserveProjectName = p.getBasicInformation().getReserveProjectName();
+            String municipalCompany = p.getBasicInformation().getMunicipalCompany();
+            String countyCompany = p.getBasicInformation().getCountyCompany();
+            String projectNature = p.getBasicInformation().getProjectNature();
+            String demandUnit = p.getBasicInformation().getDemandUnit();
+            String operationUnit = p.getBasicInformation().getOperationUnit();
+            String erpNo = p.getBasicInformation().getErpNo();
+            String subStationName = p.getBasicInformation().getSubStationName();
+            String lineName = p.getBasicInformation().getLineName();
+            String projectType = p.getBasicInformation().getProjectType();
+            String whetherSummer = p.getBasicInformation().getWhetherSummer();
+            if (isaBoolean(reserveProjectName)) {
+                proNa = true;
+                str += "储备项目名称不能为空;";
+            }
+            if (isaBoolean(municipalCompany)) {
+                str += "市公司不能为空;";
+                proNa = true;
+            }
+            if (isaBoolean(countyCompany)) {
+                proNa = true;
+                str += "县公司不能为空;";
+            }
+            if (isaBoolean(projectNature)) {
+                proNa = true;
+                str += "项目性质不能为空;";
+            } else {
+                flag = checkFlag(projectNature, PRO_NAT);
+                if (flag) {
+                    proNa = true;
+                    str += "项目性质填写有误";
+                }
+            }
+            if (isaBoolean(demandUnit)) {
+                proNa = true;
+                str += "需求单位不能为空;";
+            } else {
+                flag = checkFlag(demandUnit, DEM_UNIT);
+                if (flag) {
+                    proNa = true;
+                    str += "需求单位填写有误";
+                }
+            }
+            if (isaBoolean(operationUnit)) {
+                proNa = true;
+                str += "运维单位不能为空;";
+            } else {
+                flag = checkFlag(operationUnit, OPE_UNIT);
+                if (flag) {
+                    proNa = true;
+                    str += "运维单位填写有误";
+                }
+            }
+            if (isaBoolean(erpNo)) {
+                proNa = true;
+                str += "ERP编号不能为空;";
+            }
+
+            if (isaBoolean(subStationName)) {
+                proNa = true;
+                str += "变电站名称不能为空;";
+            }
+            if (isaBoolean(lineName)) {
+                proNa = true;
+                str += "线路名称不能为空;";
+            }
+            if (isaBoolean(projectType)) {
+                proNa = true;
+                str += "项目类型不能为空;";
+            } else {
+                flag = checkFlag(projectType, PRO_TYPE);
+                if (flag) {
+                    proNa = true;
+                    str += "项目类型填写有误";
+                }
+            }
+            if (isaBoolean(whetherSummer)) {
+                proNa = true;
+                str += "是否迎峰度夏项目不能为空;";
+            }
+            if (proNa) {
+                flagStr += p.getBasicInformation().getReserveProjectName() + str + "\n";
+            } else {
+                afterValidation.add(p);
+            }
+        }
+        hashMap.put("errorMsg", flagStr);
+        hashMap.put("afterValidation", afterValidation);
+        hashMap.put("noCompareList", noCompareList);
+        return hashMap;
+    }
+
+    /**
+     * 施工任务分配信息数据验证方法
+     */
+    public static Map<String, Object> assValidation(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;
+        DecimalFormat format = new DecimalFormat("0.0000");
+        //获取所有的已有项目信息-比对，项目名称项目的数据进行数据比对
+        List<Project> compareList = new ArrayList<>();
+        List<Project> noCompareList = new ArrayList<>();
+        //获取所有的储备项目暂定名称，比对名称纯在的进行数据验证
+        List<String> strings = projectMapper.allProjectName();
+        for (String a : strings) {
+            for (int i = 4; i < lastDataRowNum; i++) {
+                project = new Project();
+                Row row = ei.getRow(i);
+                //获取表格项目名称
+                Object reserveProjectName = ei.getCellValue(row, 0);
+                if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
+                    //获得储备项目暂定名称
+
+                    //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
+                    Project proByName = projectMapper.findAssByName((String) reserveProjectName);
+                    project.setAssignment(new Assignment());
+                    if (proByName != null) {
+                        Boolean aBoolean = checkProcess((String) reserveProjectName);
+                        if (!aBoolean) {
+                            flagStr += proByName.getBasicInformation().getReserveProjectName() + "项目流程运行中，不能更改信息\n";
+                            continue;
+                        }
+                        project.getAssignment().setReserveProjectName((String) reserveProjectName);
+                        project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
+                        project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
+                        project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
+                        project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
+                        project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
+                        project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
+                        noCompareList.add(project);
+                    } else {
+                        project.getAssignment().setReserveProjectName((String) reserveProjectName);
+                        project.getAssignment().setDisclosureType((String) ei.getCellValue(row, 1));
+                        project.getAssignment().setProjectReleaseBatch((String) ei.getCellValue(row, 2));
+                        project.getAssignment().setDeliveryDate((String) ei.getCellValue(row, 3));
+                        project.getAssignment().setPackageNo((String) ei.getCellValue(row, 4));
+                        project.getAssignment().setRate(format.format(new BigDecimal((String) ei.getCellValue(row, 5))));
+                        project.getAssignment().setAssignedUnit((String) ei.getCellValue(row, 6));
+                        project.getAssignment().setConstructionUnit((String) ei.getCellValue(row, 7));
+                        project.getAssignment().setConstructionSubcontractor((String) ei.getCellValue(row, 8));
+                        project.getAssignment().setBehalf((String) ei.getCellValue(row, 9));
+                        project.getAssignment().setConstructionFullTime((String) ei.getCellValue(row, 10));
+                        project.getAssignment().setConstructionTechnical((String) ei.getCellValue(row, 11));
+                        project.getAssignment().setConstructionManage((String) ei.getCellValue(row, 12));
+                        project.getAssignment().setConstructionLeader((String) ei.getCellValue(row, 13));
+                        project.getAssignment().setSubcontractingContact((String) ei.getCellValue(row, 14));
+                        project.getAssignment().setDesigner((String) ei.getCellValue(row, 15));
+                        project.getAssignment().setDesignLeader((String) ei.getCellValue(row, 16));
+                        project.getAssignment().setOwnerManager((String) ei.getCellValue(row, 17));
+                        project.getAssignment().setDistribution((String) ei.getCellValue(row, 18));
+                        project.getAssignment().setDistributionFullTime((String) ei.getCellValue(row, 19));
+                        project.getAssignment().setDistributionSystem((String) ei.getCellValue(row, 20));
+                        project.getAssignment().setDistributionPolicy((String) ei.getCellValue(row, 21));
+                        project.getAssignment().setCenterLeader((String) ei.getCellValue(row, 22));
+                        project.getAssignment().setCenterTechnical((String) ei.getCellValue(row, 23));
+                        String demandUnit = projectMapper.findDemandUnit((String) reserveProjectName);
+                        if ("经研所".equals(demandUnit)) {
+                            project.getAssignment().setInstituteRole((String) ei.getCellValue(row, 24));
+                        }
+                        project.getAssignment().setRepUnit((String) ei.getCellValue(row, 25));
+                        project.getAssignment().setInspectionUnit((String) ei.getCellValue(row, 26));
+                        compareList.add(project);
+                    }
+                }
+            }
+        }
+        //得到比对后list，进行数据验证，成功存入list返回，失败，返回
+        for (Project p : compareList) {
+            str = "";
+            String disclosureType = project.getAssignment().getDisclosureType();
+            String assignedUnit = project.getAssignment().getAssignedUnit();
+            String constructionUnit = project.getAssignment().getConstructionUnit();
+            flag = ProjectImportUtil.checkFlag(disclosureType, ProjectImportUtil.DIS_TYPE);
+            if (flag) {
+                str += "交底类型填写有误\t";
+            }
+            flag = ProjectImportUtil.checkFlag(assignedUnit, ProjectImportUtil.ASS_UNIT);
+            if (flag) {
+                str += "合同单位填写有误\t";
+            }
+            flag = ProjectImportUtil.checkFlag(constructionUnit, ProjectImportUtil.CON_UNIT);
+            if (flag) {
+                str += "施工单位填写有误\t";
+            }
+            String s = ProjectImportUtil.checkMember(p);
+            str += s;
+            if (!"".equals(str)) {
+                flagStr += p.getAssignment().getReserveProjectName() + str + "\n";
+            }else {
+                afterValidation.add(p);
+            }
+        }
+        hashMap.put("errorMsg", flagStr);
+        hashMap.put("afterValidation", afterValidation);
+        hashMap.put("noCompareList", noCompareList);
+        return hashMap;
+    }
+
+    /**
+     * 交底计划安排信息数据验证方法
+     */
+    public static Map<String, Object> approvalValidation(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<>();
+        //获取所有的储备项目暂定名称，比对名称纯在的进行数据验证
+        List<String> strings = projectMapper.allProjectId();
+        for (String a : strings) {
+            for (int i = 6; i < lastDataRowNum; i++) {
+                project = new Project();
+                Row row = ei.getRow(i);
+                //获取表格项目名称
+                String projectId = (String) ei.getCellValue(row, 0);
+                if (projectId != null && projectId != "" && a.equals(projectId)) {
+                    project.setApproval(new Approval());
+                    project.setProjectId(projectId);
+                    project.getApproval().setProjectPackage((String) ei.getCellValue(row, 1));
+                    project.getApproval().setProjectBudget((String) ei.getCellValue(row, 2));
+                    project.getApproval().setEnterSystemAmount((String) ei.getCellValue(row, 3));
+                    project.getApproval().setAfterAmount((String) ei.getCellValue(row, 4));
+                    project.getApproval().setAdjustmentReasons((String) ei.getCellValue(row, 5));
+                    project.getApproval().setConstructionCost((String) ei.getCellValue(row, 6));
+                    project.getApproval().setMaterialCost((String) ei.getCellValue(row, 7));
+                    project.getApproval().setDesignFee((String) ei.getCellValue(row, 8));
+                    project.getApproval().setSupervisionFee((String) ei.getCellValue(row, 9));
+                    project.getApproval().setPolicyFee((String) ei.getCellValue(row, 10));
+                    project.getApproval().setOtherExpenses((String) ei.getCellValue(row, 11));
+                    //查询项目前期基本信息表中是否有该项目信息，如果有获取之前数据，修改部分信息
+                    Project proByName = projectMapper.findApprovalByName(projectId);
+                    if (proByName != null) {
+                        noCompareList.add(project);
+                    } else {
+                        compareList.add(project);
+                    }
+                }
+            }
+        }
+        hashMap.put("errorMsg", flagStr);
+        hashMap.put("afterValidation", compareList);
+        hashMap.put("noCompareList", noCompareList);
+        return hashMap;
+    }
+
+    /**
+     * 项目立项信息数据验证方法
+     */
+    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<>();
+        //获取所有的储备项目暂定名称，比对名称纯在的进行数据验证
+        List<String> strings = projectMapper.allProjectName();
+        for (String a : strings) {
+            for (int i = 5; i < lastDataRowNum; i++) {
+                project = new Project();
+                Row row = ei.getRow(i);
+                //获取表格项目名称
+                String reserveProjectName = (String) ei.getCellValue(row, 0);
+                if (reserveProjectName != null && reserveProjectName != "" && a.equals(reserveProjectName)) {
+                    Project assByName = projectMapper.findAssByName(reserveProjectName);
+                    Project basicByName = projectMapper.findProByName(reserveProjectName);
+                    if (assByName == null || basicByName == null) {
+                        flagStr +=  reserveProjectName + "请先填写对应的项目前期基本信息/施工任务分配信息\n";
+                        continue;
+                    }
+                    project.setDisclosurePlan(new DisclosurePlan());
+                    project.setReserveProjectName(reserveProjectName);
+                    project.getDisclosurePlan().setReserveProjectName(reserveProjectName);
+                    project.getDisclosurePlan().setPowerSupplyStation((String) ei.getCellValue(row, 6));
+                    project.getDisclosurePlan().setMaintenance((String) ei.getCellValue(row, 8));
+                    project.getDisclosurePlan().setAutomationContacts((String) ei.getCellValue(row, 9));
+                    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";
+                            continue;
+                        }
+                        noCompareList.add(project);
+                    } else {
+                        compareList.add(project);
+                    }
+                }
+            }
+        }
+        hashMap.put("errorMsg", flagStr);
+        hashMap.put("afterValidation", compareList);
+        hashMap.put("noCompareList", noCompareList);
+        return hashMap;
+    }
+
+
+    /**
+     * 判断是否为空
+     */
+    private static boolean isaBoolean(String operationUnit) {
+        return null == operationUnit || "".equals(operationUnit);
+    }
+
+    /**
+     * 判断是否包含规定值
+     * string【】写入静态数据比对
+     */
+    public static Boolean checkFlag(String name, String[] strings) {
+        boolean flag = true;
+        for (String str : strings) {
+            if (str.equals(name)) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 根据储备项目名称查询项目是否在流程中
+     */
+    public static Boolean checkProcess(String name) {
+        Project process = projectMapper.findProcess(name);
+        String status = process.getStatus();
+        String acquisitionStatus = process.getAcquisitionStatus();
+        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)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 判断人员是否存在
+     */
+    public static String checkMember(Project project) {
+        Boolean flag = false;
+        String str = "";
+        String constructionFullTime = project.getAssignment().getConstructionFullTime();
+        String constructionTechnical = project.getAssignment().getConstructionTechnical();
+        String constructionManage = project.getAssignment().getConstructionManage();
+        String constructionLeader = project.getAssignment().getConstructionLeader();
+        String designer = project.getAssignment().getDesigner();
+        String designLeader = project.getAssignment().getDesignLeader();
+        String ownerManager = project.getAssignment().getOwnerManager();
+        String distribution = project.getAssignment().getDistribution();
+        String distributionFullTime = project.getAssignment().getDistributionFullTime();
+        String distributionSystem = project.getAssignment().getDistributionSystem();
+        String distributionPolicy = project.getAssignment().getDistributionPolicy();
+        String centerLeader = project.getAssignment().getCenterLeader();
+        String centerTechnical = project.getAssignment().getCenterTechnical();
+        String instituteRole = project.getAssignment().getInstituteRole();
+        String repUnit = project.getAssignment().getRepUnit();
+        String inspectionUnit = project.getAssignment().getInspectionUnit();
+        List<String> allMember = projectMapper.findAllMember();
+        flag = getJudgeLoginName(allMember, constructionFullTime);
+        if (flag) {
+            str += "施工单位物资专职人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, constructionTechnical);
+        if (flag) {
+            str += "施工单位技经专职人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, constructionManage);
+        if (flag) {
+            str += "施工项目经理人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, constructionLeader);
+        if (flag) {
+            str += "施工单位领导人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, designer);
+        if (flag) {
+            str += "设计人员人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, designLeader);
+        if (flag) {
+            str += "设计单位领导人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, ownerManager);
+        if (flag) {
+            str += "业主项目经理人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, distribution);
+        if (flag) {
+            str += "配网工程专职人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, distributionFullTime);
+        if (flag) {
+            str += "配网物资专职人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, distributionSystem);
+        if (flag) {
+            str += "配网系统维护专职人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, distributionPolicy);
+        if (flag) {
+            str += "配网政策处理人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, centerLeader);
+        if (flag) {
+            str += "项目管理中心领导人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, centerTechnical);
+        if (flag) {
+            str += "项目管理中心技经专职人员有误\t";
+        }
+        //获取需求单位
+        String demandUnit = projectMapper.findDemandUnit(project.getReserveProjectName());
+        if ("经研所".equals(demandUnit)) {
+            if (isaBoolean(instituteRole)) {
+                str += "需求单位为经研所，人员不能为空\t";
+            } else {
+                flag = getJudgeLoginName(allMember, instituteRole);
+                if (flag) {
+                    str += "经研所角色人员有误\t";
+                }
+            }
+        }
+        flag = getJudgeLoginName(allMember, repUnit);
+        if (flag) {
+            str += "运行单位业主代表人员有误\t";
+        }
+        flag = getJudgeLoginName(allMember, inspectionUnit);
+        if (flag) {
+            str += "运行单位运检专职人员有误\t";
+        }
+        return str;
+    }
+
+    //对登录人进行验证 true人员不存在
+    public static boolean getJudgeLoginName(List<String> users, String string) {
+        boolean flag = true;
+        for (String user : users) {
+            if (string.equals(user)) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
+}

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

@@ -0,0 +1,321 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.project.web;
+
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.oa.service.OaNotifyService;
+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.CapitalPlan;
+import com.jeeplus.modules.sg.managementcenter.project.entity.ImportErp;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.service.CapitalPlanService;
+import com.jeeplus.modules.sg.managementcenter.project.service.PickingRequisitionService;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.managementcenter.project.util.CapitalImportUtil;
+import com.jeeplus.modules.sg.managementcenter.project.util.ProjectImportUtil;
+import com.jeeplus.modules.sys.service.SystemService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 资金计划管理
+ *
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/sg/capitalPlan")
+public class CapitalPlanController extends BaseController {
+
+    @Autowired
+    private CapitalPlanService capitalPlanService;
+
+
+    @ModelAttribute
+    public CapitalPlan get(@RequestParam(required = false) String id) {
+        CapitalPlan entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = capitalPlanService.get(id);
+        }
+        if (entity == null) {
+            entity = new CapitalPlan();
+        }
+        return entity;
+    }
+
+    /**
+     * 资金计划管理页面
+     */
+    @RequestMapping(value = "capitalPlanList")
+    public String basicInformation(Project project, Model model) {
+        model.addAttribute("project", project);
+        return "modules/sg/capitalPlan/capitalPlanList";
+    }
+
+
+
+    /**
+     * 资金计划管理 数据列表
+     */
+    @ResponseBody
+    @RequestMapping(value = "capitalPlanData")
+    public Map<String, Object> basicData(CapitalPlan capitalPlan, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CapitalPlan> page = capitalPlanService.findPage(new Page<CapitalPlan>(request, response), capitalPlan);
+        List<CapitalPlan> list = page.getList();
+        for (CapitalPlan c:list) {
+            String projectBudget = c.getProjectBudget();
+            String actualCost = c.getActualCost();
+
+            String constructionCost = c.getConstructionCost();
+            String actualConstructionCost = c.getActualConstructionCost();
+
+            String materialCost = c.getMaterialCost();
+            String actualMaterialCost = c.getActualMaterialCost();
+
+            String designFee = c.getDesignFee();
+            String actualDesignCost = c.getActualDesignCost();
+
+            String supervisionPayFee = c.getSupervisionPayFee();
+            String actualSupervisionCost = c.getActualSupervisionCost();
+
+            String policyProcessingFee = c.getPolicyProcessingFee();
+            String actualManagementFee = c.getActualManagementFee();
+
+            String otherExpenses = c.getOtherExpenses();
+            String actualOtherCost = c.getActualOtherCost();
+            //将空值初始化
+            projectBudget = getString(projectBudget);
+            actualCost = getString(actualCost);
+            constructionCost = getString(constructionCost);
+            actualConstructionCost = getString(actualConstructionCost);
+            materialCost = getString(materialCost);
+            actualMaterialCost = getString(actualMaterialCost);
+            designFee = getString(designFee);
+            actualDesignCost = getString(actualDesignCost);
+            supervisionPayFee = getString(supervisionPayFee);
+            actualSupervisionCost = getString(actualSupervisionCost);
+            policyProcessingFee = getString(policyProcessingFee);
+            actualManagementFee = getString(actualManagementFee);
+            otherExpenses = getString(otherExpenses);
+            actualOtherCost = getString(actualOtherCost);
+
+            BigDecimal projectDifference = new BigDecimal(projectBudget);
+            BigDecimal constructionDifference = new BigDecimal(constructionCost);
+            BigDecimal costDifference = new BigDecimal(materialCost);
+            BigDecimal designDifference = new BigDecimal(designFee);
+            BigDecimal supervisionDifference = new BigDecimal(supervisionPayFee);
+            BigDecimal policyDifference = new BigDecimal(policyProcessingFee);
+            BigDecimal otherDifference = new BigDecimal(otherExpenses);
+
+            projectDifference = projectDifference.subtract(new BigDecimal(actualCost));
+            constructionDifference = constructionDifference.subtract(new BigDecimal(actualConstructionCost));
+            costDifference = costDifference.subtract(new BigDecimal(actualMaterialCost));
+            designDifference = designDifference.subtract(new BigDecimal(actualDesignCost));
+            supervisionDifference = supervisionDifference.subtract(new BigDecimal(actualSupervisionCost));
+            policyDifference = policyDifference.subtract(new BigDecimal(actualManagementFee));
+            otherDifference = otherDifference.subtract(new BigDecimal(actualOtherCost));
+
+            c.setProjectDifference(projectDifference.toString());
+            c.setConstructionDifference(constructionDifference.toString());
+            c.setCostDifference(costDifference.toString());
+            c.setDesignDifference(designDifference.toString());
+            c.setSupervisionDifference(supervisionDifference.toString());
+            c.setPolicyDifference(policyDifference.toString());
+            c.setOtherDifference(otherDifference.toString());
+
+        }
+        return getBootstrapData(page);
+    }
+
+    private String getString(String projectBudget) {
+        if (null == projectBudget || "".equals(projectBudget)) {
+            projectBudget = "0";
+        }
+        return projectBudget;
+    }
+
+
+    /**
+     * 查看，增加，编辑表单表单页面
+     */
+    @RequestMapping(value = "capitalPlanForm")
+    public String basicInformationForm(Project project, Model model) {
+        model.addAttribute("project", project);
+        return "modules/sg/capitalPlan/basicInformationForm";
+    }
+
+
+
+    /**
+     * 保存表单
+     */
+    @ResponseBody
+    @RequestMapping(value = "saveCapitalPlan")
+    public AjaxJson savePlan(Project project, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        Boolean flag = false;
+
+        String str = "";
+        /**
+         * 后台hibernate-validation插件校验
+         */
+            j.setSuccess(false);
+            j.setMsg("项目流程运行中不可修改信息");
+        return j;
+    }
+
+
+
+
+    /**
+     * 导入Excel数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "importCapital")
+    public AjaxJson importCapital(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
+        AjaxJson j = new AjaxJson();
+        try {
+            ImportExcel importExcel = new ImportExcel(file, 0,0);
+            int lastDataRowNum = importExcel.getLastDataRowNum();
+            //将写入的文件先进行规则验证
+            Map<String, List<ImportErp>> projectGroupList = CapitalImportUtil.getProjectGroup(importExcel, lastDataRowNum);
+            Iterator<String> iterator = projectGroupList.keySet().iterator();
+            List<CapitalPlan> afterList = new ArrayList<>();
+            while (iterator.hasNext()) {
+                String key = iterator.next().toString();
+                List<ImportErp> importErpList = projectGroupList.get(key);
+                CapitalPlan capitalPlan = new CapitalPlan();
+                BigDecimal actualCost = new BigDecimal("0");
+                BigDecimal actualConstructionCost = new BigDecimal("0");
+                BigDecimal actualMaterialCost = new BigDecimal("0");
+                BigDecimal actualDesignCost = new BigDecimal("0");
+                BigDecimal actualSupervisionCost = new BigDecimal("0");
+                BigDecimal actualOtherCost = new BigDecimal("0");
+                for (ImportErp i:importErpList) {
+                    //根据每个项目定义号获得集合，计算每个项目定义号的项目金额、施工费、物资费、设计费、监理费、政策处理费、其它费用
+                    //科目名称
+                    String accountName = i.getAccountName();
+                    //物料描述
+                    String itemDescription = i.getItemDescription();
+                    //WBS描述
+                    String description = i.getDescription();
+
+                    //项目预算
+                    if (accountName.contains("工程成本-")) {
+                        actualCost = actualCost.add(new BigDecimal((String) i.getLineAmount()));
+                    }
+
+                    //施工费
+                    if ("".equals(itemDescription) && accountName.contains("工程成本-安装工程支出")) {
+                        actualConstructionCost = actualConstructionCost.add(new BigDecimal((String) i.getLineAmount()));
+                    }
+
+                    //物资费（设备费+材料费）
+                    if (!"".equals(itemDescription)) {
+                        actualMaterialCost = actualMaterialCost.add(new BigDecimal((String) i.getLineAmount()));
+                    }
+                    //设计费
+                    if ("".equals(itemDescription)) {
+                        if (accountName.contains("工程成本-待摊支出-其他") || accountName.contains("工程成本-待摊支出-项目法人管理费-其他") || accountName.contains("项目管理经费 - 会议费")) {
+                            if (description.contains("工程监理费")) {
+                                //监理费
+                                actualSupervisionCost = actualSupervisionCost.add(new BigDecimal((String) i.getLineAmount()));
+                            } else if (description.contains("工程设计费")) {
+                                //设计费
+                                actualDesignCost = actualDesignCost.add(new BigDecimal((String) i.getLineAmount()));
+                            } else {
+                                //其它费用
+                                actualOtherCost = actualOtherCost.add(new BigDecimal((String) i.getLineAmount()));
+                            }
+                        }
+                    }
+                    //政策处理费
+                }
+                //********************************************************//
+                capitalPlan.setProjectId(key);
+                capitalPlan.setActualCost(actualCost.toString());
+                capitalPlan.setActualConstructionCost(actualConstructionCost.toString());
+                capitalPlan.setActualMaterialCost(actualMaterialCost.toString());
+                capitalPlan.setActualDesignCost(actualDesignCost.toString());
+                capitalPlan.setActualSupervisionCost(actualSupervisionCost.toString());
+                capitalPlan.setActualOtherCost(actualOtherCost.toString());
+                afterList.add(capitalPlan);
+            }
+
+            //查询出所有的立项信息项目定义号进行插入操作
+            List<String> strings = capitalPlanService.allProjectId();
+            List<CapitalPlan> canInertList = new ArrayList<>();
+            for (CapitalPlan c : afterList) {
+                for (String a : strings) {
+                    if (c.getProjectId().equals(a)) {
+                        canInertList.add(c);
+                    }
+                }
+            }
+
+            //查询出所有的立项信息的projectId
+            List<String> planProjectId = capitalPlanService.findPlanProjectId();
+            List<CapitalPlan> updateList = new ArrayList<>();
+            List<CapitalPlan> insertList = new ArrayList<>();
+            for (CapitalPlan c : canInertList) {
+                if (checkFlag(c.getProjectId(), planProjectId)) {
+                    insertList.add(c);
+                } else {
+                    updateList.add(c);
+                }
+            }
+            if (updateList.size() > 0) {
+                capitalPlanService.updateList(updateList);
+            }
+            if (insertList.size() > 0) {
+                capitalPlanService.insertList(insertList);
+            }
+            j.setSuccess(true);
+            j.setMsg("导入成功！");
+        } catch (Exception e) {
+            j.setSuccess(false);
+            j.setMsg("导入需求基本信息表单失败！失败信息：" + e.getMessage());
+        }
+        return j;
+
+    }
+
+    /**
+     * 判断是否包含规定值
+     * string【】写入静态数据比对
+     */
+    private static Boolean checkFlag(String name, List<String> strings) {
+        boolean flag = true;
+        for (String str : strings) {
+            if (str.equals(name)) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
+
+}

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

@@ -7,8 +7,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.utils.MyActiviUtils;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -258,8 +256,8 @@ public class MaterialModuleController extends BaseController {
             String projectType = materialModule.getProjectType();
             String[] split = projectType.split("|");
             Map<String, Object> vars = Maps.newHashMap();
-            Project userById = MyActiviUtils.findUserById(projectId);
-            vars.put("manager", UserUtils.getByUserName(userById.getConstructionUnitManage()).getLoginName());
+//            Project userById = MyActiviUtils.findUserById(projectId);
+//            vars.put("manager", UserUtils.getByUserName(userById.getConstructionUnitManage()).getLoginName());
             //土建
             vars.put("contain", false);
             //电气

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -6,37 +6,26 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.sg.audit.information.entity.Information;
-import com.jeeplus.modules.sg.audit.information.entity.OutInformation;
-import com.jeeplus.modules.sg.audit.material.entity.Material;
-import com.jeeplus.modules.sg.financial.erpcredit.util.ExportUtil;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
 import com.jeeplus.modules.sg.managementcenter.materialProvided.service.MaterialProvidedService;
-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.*;
 import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 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.repository.ProcessDefinition;
-import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -199,9 +188,9 @@ public class PickIngController extends BaseController {
     public String applicationAudit(PickApplication pickApplication, Model model) {
         String id = pickApplication.getId();
         String projectId = showListService.selectProjectId(id);
-        Project project = projectService.get(projectId);
+//        Project project1 = projectService.get(projectId);
         model.addAttribute("pickApplication", pickApplication);
-        model.addAttribute("project", project);
+//        model.addAttribute("project", project1);
         return "modules/sg/picking/activiti/applicationAudit";
     }
 
@@ -474,8 +463,8 @@ public class PickIngController extends BaseController {
         }
         if (flag) {
             vars.put("full", true);
-            Project project = projectService.get(pickApplication.getProjectId());
-            vars.put("manager", UserUtils.getByUserName(project.getProjectManageRole()).getLoginName());
+//            Project project1 = projectService.get(pickApplication.getProjectId());
+//            vars.put("manager", UserUtils.getByUserName(project1.getProjectManageRole()).getLoginName());
             j.setMsg("发起流程审批成功!");
         } else {
             showListService.projectUpdate(pickApplication);

src/main/java/com/jeeplus/modules/sg/scheduleView/mapper/ScheduleViewMapper.java

@@ -5,11 +5,7 @@ package com.jeeplus.modules.sg.scheduleView.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.scheduleView.entity.ScheduleView;
-import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
-import com.jeeplus.modules.sg.settActivi.entity.SettList;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

src/main/java/com/jeeplus/modules/sg/scheduleView/service/ScheduleViewService.java

@@ -5,18 +5,12 @@ package com.jeeplus.modules.sg.scheduleView.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.scheduleView.entity.ScheduleView;
 import com.jeeplus.modules.sg.scheduleView.mapper.ScheduleViewMapper;
-import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
-import com.jeeplus.modules.sg.settActivi.entity.SettList;
-import com.jeeplus.modules.sg.settActivi.mapper.SettActiviMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * 查询模块Service
  * @author

src/main/java/com/jeeplus/modules/sg/settActivi/mapper/SettActiviMapper.java

@@ -5,7 +5,7 @@ package com.jeeplus.modules.sg.settActivi.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
 import com.jeeplus.modules.sg.settActivi.entity.SettList;
 
@@ -21,14 +21,14 @@ import java.util.List;
 public interface SettActiviMapper extends BaseMapper<SettActivi> {
 
     //根据项目idList查询项目信信息
-    List<Project> findByIdList(List<String> projectId);
+    List<Project1> findByIdList(List<String> projectId);
 
     //插入settList表中
     void insertSettList(List<SettList> settLists);
 
-    void insertSettActivi(List<Project> projectList);
+    void insertSettActivi(List<Project1> projectList);
 
-    List<SettActivi> findAllSett(List<Project> projectList);
+    List<SettActivi> findAllSett(List<Project1> projectList);
 
     void updateSetStatus(List<SettActivi> settActivis);
 

src/main/java/com/jeeplus/modules/sg/settActivi/mapper/xml/SettActiviMapper.xml

@@ -58,7 +58,7 @@
         WHERE id = #{id}
     </update>
 
-    <select id="findByIdList" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+    <select id="findByIdList" resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project1">
         select project_id,project_number,require_name,construction_unit_manage from xm_project_details where id in
         (
         <foreach collection="list" item="item" separator=",">

src/main/java/com/jeeplus/modules/sg/settActivi/service/SettActiviService.java

@@ -5,7 +5,7 @@ package com.jeeplus.modules.sg.settActivi.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
 import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sg.settActivi.mapper.SettActiviMapper;
@@ -40,7 +40,7 @@ public class SettActiviService extends CrudService<SettActiviMapper, SettActivi>
 	}
 
 	//根据项目idList查询项目信息
-	public List<Project> findByIdList(List<String> projectId) {
+	public List<Project1> findByIdList(List<String> projectId) {
 		return settActiviMapper.findByIdList(projectId);
 	}
 
@@ -54,14 +54,14 @@ public class SettActiviService extends CrudService<SettActiviMapper, SettActivi>
 	}
 
 	@Transactional(readOnly = false)
-	public void insertSettActivi(List<Project> projectList) {
-		for (Project p : projectList) {
+	public void insertSettActivi(List<Project1> projectList) {
+		for (Project1 p : projectList) {
 			p.preInsert();
 		}
 		settActiviMapper.insertSettActivi(projectList);
 	}
 
-	public List<SettActivi> findAllSett(List<Project> projectList) {
+	public List<SettActivi> findAllSett(List<Project1> projectList) {
 		return settActiviMapper.findAllSett(projectList);
 	}
 

src/main/java/com/jeeplus/modules/sg/settActivi/web/SettActiviController.java

@@ -12,7 +12,7 @@ import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
 import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project1;
 import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
 import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sg.settActivi.service.SettActiviService;
@@ -188,7 +188,7 @@ public class SettActiviController extends BaseController {
             searchList.add(split[i]);
         }
         //根据选择的项目查询项目信息
-        List<Project> byIdList = settActiviService.findByIdList(searchList);
+        List<Project1> byIdList = settActiviService.findByIdList(searchList);
         //读取文件，获取文件信息
         ImportExcel importExcel = new ImportExcel(file, 1, 0);
         int lastDataRowNum = importExcel.getLastDataRowNum();

src/main/resources/mybatis/mybatis-refresh.properties

@@ -1,8 +1,8 @@
 # enabled
 enabled=false
-# project start time[\u9879\u76ee\u542f\u52a8\u65f6\u95f4]
+# project start time[\u9879\u76EE\u542F\u52A8\u65F6\u95F4]
 delaySeconds=5
-# xml scanning interval time[\u626b\u63cf\u95f4\u9694\u65f6\u957f]
+# xml scanning interval time[\u626B\u63CF\u95F4\u9694\u65F6\u957F]
 sleepSeconds=2
-# xml file's path[xml\u6587\u4ef6\u7684\u8def\u5f84]
+# xml file's path[xml\u6587\u4EF6\u7684\u8DEF\u5F84]
 mappingPath=com/jeeplus/modules

src/main/webapp/webpage/modules/sg/capitalPlan/capitalPlanList.js

@@ -0,0 +1,339 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function () {
+    $('#projectTable').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: true,
+        //显示刷新按钮
+        showRefresh: true,
+        //显示切换手机试图按钮
+        showToggle: true,
+        //显示 内容列下拉框
+        showColumns: true,
+        //显示到处按钮
+        showExport: true,
+        //显示切换分页按钮
+        showPaginationSwitch: true,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: true,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 5,
+        //可供选择的每页的行数（*）
+        pageList: [5, 10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/sg/capitalPlan/capitalPlanData",
+        //默认值为 '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) {
+            if ($el.data("item") == "edit") {
+                edit(row.id);
+            } else if ($el.data("item") == "view") {
+                view(row.id);
+            } else if ($el.data("item") == "delete") {
+                jp.confirm('确认要删除该表单记录吗？', function () {
+                    jp.loading();
+                    jp.get("${ctx}/sg/managementcenter/project/delete?id=" + row.id, function (data) {
+                        if (data.success) {
+                            $('#projectTable').bootstrapTable('refresh');
+                            jp.success(data.msg);
+                        } else {
+                            jp.error(data.msg);
+                        }
+                    })
+                });
+            }
+        },
+
+        onClickRow: function (row, $el) {
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns:
+            [
+                {
+                    checkbox: true
+                }
+                , {
+                field: 'projectId',
+                width:100,
+                title: '项目定义',
+            }
+                , {
+                field: 'projectName',
+                width:100,
+                title: '项目名称',
+            }
+                , {
+                field: 'projectBatch',
+                width:125,
+                title: '项目批次',
+            }
+                , {
+                field: 'projectBudget',
+                width:125,
+                title: '项目预算',
+            }
+                , {
+                field: 'actualCost',
+                width:125,
+                title: '项目实际费用',
+            }
+                , {
+                field: 'projectDifference',
+                width:100,
+                title: '项目差额',
+            }
+                , {
+                field: 'constructionCost',
+                width:100,
+                title: '施工费',
+            }
+                , {
+                field: 'actualConstructionCost',
+                width:100,
+                title: '项目实际施工费',
+            }
+                , {
+                field: 'constructionDifference',
+                width:125,
+                title: '施工差额',
+            }
+                , {
+                field: 'materialCost',
+                width:125,
+                title: '物资费',
+            }
+                , {
+                field: 'actualMaterialCost',
+                width:125,
+                title: '项目实际物资费',
+            }
+                , {
+                field: 'costDifference',
+                width:150,
+                title: '物资差额',
+            }
+                , {
+                field: 'designFee',
+                width:150,
+                title: '设计费',
+            }, {
+                field: 'DesignPayFee',
+                width:150,
+                title: '应付设计费',
+            }
+                , {
+                field: 'actualDesignCost',
+                width:150,
+                title: '项目实际设计费',
+            }
+                , {
+                field: 'designDifference',
+                width:150,
+                title: '设计差额',
+            }
+                , {
+                field: 'supervisionFee',
+                width:150,
+                title: '监理费',
+            }
+                , {
+                field: 'supervisionPayFee',
+                width:150,
+                title: '应付监理费',
+            }
+                , {
+                field: 'actualSupervisionCost',
+                width:150,
+                title: '项目实际监理费',
+            }
+                , {
+                field: 'supervisionDifference',
+                width:150,
+                title: '监理差额',
+            }
+                , {
+                field: 'policyProcessingFee',
+                width:150,
+                title: '政策处理费用',
+            }
+                , {
+                field: 'ActualManagementFee',
+                width:150,
+                title: '项目实际管理费',
+            }
+                , {
+                field: 'policyDifference',
+                width:150,
+                title: '政策处理差额',
+            }
+                , {
+                field: 'otherExpenses',
+                width:150,
+                title: '其他费用',
+            }
+                , {
+                field: 'actualOtherCost',
+                width:150,
+                title: '实际其他费用',
+            }
+                , {
+                field: 'otherDifference',
+                width:150,
+                title: '其它差额',
+            }
+            ]
+    });
+
+
+    if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端
+        $('#projectTable').bootstrapTable("toggleView");
+    }
+
+    $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+        'check-all.bs.table uncheck-all.bs.table', function () {
+        $('#remove').prop('disabled', !$('#projectTable').bootstrapTable('getSelections').length);
+        $('#view,#edit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
+    });
+
+    $("#btnImport").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入数据",
+            content: "${ctx}/tag/importExcel",
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/sg/capitalPlan/importCapital', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+    $("#btnImportPicking").click(function () {
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title: "导入领料单",
+            content: "${ctx}/tag/importExcel",
+            btn: ['确定', '关闭'],
+            btn1: function (index, layero) {
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/sg/managementcenter/project/importPicking', function (data) {
+                    if (data.success) {
+                        jp.success(data.msg);
+                        refresh();
+                    } else {
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+            btn2: function (index) {
+                //  jp.close(index);
+            }
+        });
+    });
+
+    $("#export").click(function () {//导出Excel文件
+        jp.downloadFile('${ctx}/sg/managementcenter/project/export');
+    });
+
+    $("#search").click("click", function () {// 绑定查询按扭
+        $('#projectTable').bootstrapTable('refresh');
+    });
+
+    $("#reset").click("click", function () {// 绑定查询按扭
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $("#searchForm  .select-item").html("");
+        $('#projectTable').bootstrapTable('refresh');
+    });
+
+    $('#beginBeginDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endBeginDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+    $('#endDate').datetimepicker({
+        format: "YYYY-MM-DD HH:mm:ss"
+    });
+});
+
+function getIdSelections() {
+    return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+
+//刷新列表
+function refresh() {
+    $('#projectTable').bootstrapTable('refresh');
+}
+
+function add() {
+    jp.openSaveDialog('新增项目管理表单', "${ctx}/sg/managementcenter/project/form", '800px', '500px');
+}
+
+
+function edit(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openSaveDialog('编辑交底计划安排表单', "${ctx}/sg/managementcenter/project/approvalForm?id=" + id, '800px', '500px');
+}
+
+function view(id) {//没有权限时，不显示确定按钮
+    if (id == undefined) {
+        id = getIdSelections();
+    }
+    jp.openViewDialog('查看项目管理表单', "${ctx}/sg/managementcenter/project/assignmentForm?id=" + id, '800px', '500px');
+}
+
+</script>

src/main/webapp/webpage/modules/sg/capitalPlan/capitalPlanList.jsp

@@ -0,0 +1,51 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>资金计划管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="capitalPlanList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">资金计划管理</h3>
+	</div>
+	<div class="panel-body">
+		<!-- 搜索 -->
+		<div id="search-collapse" class="collapse">
+			<div class="accordion-inner">
+				<form:form id="searchForm" modelAttribute="project" class="form form-horizontal well clearfix">
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
+						<form:input path="projectId" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div style="margin-top:26px">
+							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+						</div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+			<shiro:hasPermission name="sg:managementcenter:project:import">
+				<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
+			</shiro:hasPermission>
+		    </div>
+		
+	<!-- 表格 -->
+	<table id="projectTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
+
+	</div>
+	</div>
+	</div>
+</body>
+</html>

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

@@ -0,0 +1,319 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>配网经理审核设计变更后</title>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="decorator" content="ani"/>
+    <%@ include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="economicsDesignChange.js" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt(" 审批意见", function (message) {
+                    jp.post("${ctx}/act/task/afterDistribution",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo");
+                            } else {
+                                jp.error(data.msg);
+                            }
+                        }
+                    )
+                });
+            });
+            $("#no").click(function () {
+                jp.prompt("审核意见", function (message) {
+                    jp.post("${ctx}/act/task/afterDistribution",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo");
+                            } else {
+                                jp.error(data.msg);
+                            }
+                        }
+                    )
+                });
+            });
+        });
+    </script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">配网经理审核设计变更后</h3>
+        </div>
+        <div class="panel-body">
+            <!-- 表格 -->
+            <table id="testPicTable" data-toolbar="#toolbar"></table>
+            <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>
+                        </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>
+            <!-- context menu -->
+            <ul id="context-menu" class="dropdown-menu">
+            </ul>
+        </div>
+    </div>
+</div>
+</body>
+</html>

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

@@ -1,88 +1,327 @@
 <%@ 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="economicsDesignChange.js"%>
-	<script type="text/javascript">
-
-		$(document).ready(function() {
-			//审核通过
-			$("#agree").click(function () {
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/auditDrawings", {
-						"taskId":"${uploadImages.act.taskId}",
-						"taskName":"${uploadImages.act.taskName}",
-						"taskDefKey":"${uploadImages.act.taskDefKey}",
-						"procInsId":"${uploadImages.act.procInsId}",
-						"procDefId":"${uploadImages.act.procDefId}",
-						"flag":"yes",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
-			});
-			//审核不通过
-			$("#no").click(function () {
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/auditDrawings", {
-								"taskId":"${uploadImages.act.taskId}",
-								"taskName":"${uploadImages.act.taskName}",
-								"taskDefKey":"${uploadImages.act.taskDefKey}",
-								"procInsId":"${uploadImages.act.procInsId}",
-								"procDefId":"${uploadImages.act.procDefId}",
-								"flag":"no",
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				});
-			});
-		});
-	</script>
+    <title>经研所判定是否设计变更</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="economicsDesignChange.js" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //审核通过
+            $("#agree").click(function () {
+                var currentFileValues = $("input[name='pic']").val();
+                if (currentFileValues == "" || currentFileValues == null) {
+                    jp.error("请上传文件");
+                } else {
+                    jp.prompt("审核意见", function (message) {
+                        jp.post("${ctx}/act/task/auditDrawings", {
+                                "taskId": "${construction.act.taskId}",
+                                "taskName": "${construction.act.taskName}",
+                                "taskDefKey": "${construction.act.taskDefKey}",
+                                "procInsId": "${construction.act.procInsId}",
+                                "procDefId": "${construction.act.procDefId}",
+                                "flag": "yes",
+                                "path": currentFileValues,
+                                "reserveProjectName": "${construction.reserveProjectName}",
+                                "comment": window.encodeURI(message)
+                            },
+                            function (data) {
+                                if (data.success) {
+                                    jp.success(data.msg);
+                                    jp.go("${ctx}/act/task/todo")
+                                }
+                            })
+                    });
+                }
+            });
+            //审核不通过
+            $("#no").click(function () {
+                jp.prompt("审核意见", function (message) {
+                    jp.post("${ctx}/act/task/auditDrawings", {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-				<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				<div class="panel-body">
-					<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 uploadImages.id}">
-						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
-						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
-					</c:if>
-				</div>
-			</div>
-		</div>
-	</div>
+    <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>
+                <table id="testPicTable" data-toolbar="#toolbar"></table>
+                <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">
+                                    <sys:fileUpload path="pic" fileNumLimit="50" fileSizeLimit="50"
+                                                    value="${testPic.pic}" type="file"
+                                                    uploadPath="list"></sys:fileUpload>
+                                </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>
+                            </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/confirmClose.jsp

@@ -0,0 +1,289 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp" %>
+<html>
+<head>
+    <title>配网系统专职确认系统关闭</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/confirmClose",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "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>
+                            </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="确认关闭"/>
+                            </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/constructionForm.jsp

@@ -38,8 +38,8 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
-									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="true"></sys:itemselect>
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="reserveProjectName" name="reserveProjectName" value="${project.reserveProjectName}" labelName="project.reserveProjectName" labelValue="${project.reserveProjectName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|项目定义号|项目名称')}" fieldKeys="reserveProjectName|projectId|projectName" searchLabels="${fns:urlEncode('储备项目名称')}|${fns:urlEncode('项目定义号')}|${fns:urlEncode('项目名称')}" searchKeys="reserveProjectName|projectId|projectName"  isMultiSelected="true"></sys:itemselect>
 								</td>
 								</td>
 							</tr>

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

@@ -1,335 +1,312 @@
 <%@ 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" %>
-	<script type="text/javascript">
-		$(document).ready(function () {
-			$("#agree").click(function () {
-			    var fullName = $("#loginName").val();
-                var pic = $("#pic").val();
-                // if (fullName=""||fullName==null) {
-                //     jp.error("请选择用户");
-                //     return;
-				// }
-				if (pic==""||pic==null){
-				    jp.error("请上传未盖章施工方案");
-				    return;
-				}
-                var currentFileValues = $("input[name='pic']").val();
+    <title>项目经理判定是否关闭</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
                 jp.prompt("通过", function (message) {
-                    jp.post("${ctx}/act/task/coveredTask",
+                    jp.post("${ctx}/act/task/coveredForm",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"pic":currentFileValues,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
-                            if(data.success){
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                })
+            });
+            $("#no").click(function () {
+                jp.prompt("驳回", function (message) {
+                    jp.post("${ctx}/act/task/coveredTask",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
                                 jp.success(data.msg);
                                 jp.go("${ctx}/act/task/todo")
                             }
-                        })
+                        }
+                    )
                 })
-			});
-			$("#no").click(function () {
-                var fullName = $("#loginName").val();
-				jp.prompt("驳回", function (message) {
-					jp.post("${ctx}/act/task/coveredTask",
-							{
-								"taskId": "${construction.act.taskId}",
-								"taskName": "${construction.act.taskName}",
-								"taskDefKey": "${construction.act.taskDefKey}",
-								"procInsId": "${construction.act.procInsId}",
-								"procDefId": "${construction.act.procDefId}",
-								"flag": "no",
-								"comment": window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				})
-			});
-		})
-	</script>
+            });
+        })
+    </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">
-						<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="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
-					<form:hidden path="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.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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right">上传未盖章施工方案：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
-								<td class="width-35">
-										${construction.disclose.channel}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备基础是否可以扩容：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.sceneSize}
-								</td>
-								<td class="width-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacitySize}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
-								<td class="width-35">
-										${construction.disclose.hiddenDanger}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
-								<td class="width-35">
-										${construction.disclose.influenceConstruction}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
-								<td class="width-35">
-										${construction.disclose.projectRepetition}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
-								<td class="width-35">
-										${construction.disclose.implemented}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
-								<td class="width-35">
-										${construction.disclose.transformer}
-								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.explanationOfNecessity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.lineName}
-								</td>
-								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
-								<td class="width-35">
-										${construction.disclose.quantities}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.rodNumber}
-								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.inconsistentDescription}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-								<td class="width-35">
-										${construction.disclose.administrationType}
-								</td>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
-								<td class="width-35">
-										${construction.disclose.precondition}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.policyHandlingInstructions}
-								</td>
-								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
-								<td class="width-35">
-										${construction.disclose.placementMode}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
-								<td class="width-35">
-										${construction.disclose.productionDate}
-								</td>
-								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
-								<td class="width-35">
-										${construction.disclose.integrateModule}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
-								<td class="width-35">
-										${construction.disclose.needReplace}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
-								<td class="width-35">
-										${construction.disclose.overallTransformation}
-								</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-danger btn-lg btn-parsley" type="submit" value="驳回" />
-								</div>
-							</div>
-						</div>
+    <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" 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>
+                            </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-danger btn-lg btn-parsley" type="submit" value="驳回"/>--%>
+                            </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/designUpload.jsp

@@ -1,110 +1,320 @@
 <%@ 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="economicsDesignChange.js"%>
-	<script type="text/javascript">
+    <title>运行单位经理审核方案</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="economicsDesignChange.js" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt("审核意见", function (message) {
+                    jp.post("${ctx}/act/task/designUpload",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    )
+                });
+            });
 
-		$(document).ready(function() {
-
-			$("#agree").click(function () {
-				var currentFileValues = $("input[name='pic']").val();
-			 if (currentFileValues==""||currentFileValues==null) {
-					jp.error("请上传变更后图纸");
-				} else {
-				// alert(design);
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/designUpload",
-					{
-						"taskId":"${uploadImages.act.taskId}",
-						"taskName":"${uploadImages.act.taskName}",
-						"taskDefKey":"${uploadImages.act.taskDefKey}",
-						"procInsId":"${uploadImages.act.procInsId}",
-						"procDefId":"${uploadImages.act.procDefId}",
-						"flag":"yes",
-						"pic":currentFileValues,
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
-				}
-			});
-		});
-	</script>
+            $("#no").click(function () {
+                jp.prompt("审核意见", function (message) {
+                    jp.post("${ctx}/act/task/designUpload",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				<div class="panel-body">
-					<form:form id="inputForm" modelAttribute="uploadImages" 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" />
-						<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-						<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">
-									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
-								</td>--%>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>上传变更后图纸：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-						<div class="form-group">
-							<div class="col-lg-3"></div>
-								<div class="col-lg-6">
-									<div class="form-group text-center">
-										<div>
-<%--											<input id="agree" class="btn  btn-primary btn-lg btn-parsley" value="审核" />&nbsp;--%>
-<%--											<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;--%>
-<%--											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>--%>
-										</div>
-									</div>
-								</div>
-						</div>
-					</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;
-							</div>
-						</div>
-					</div>
-					<c:if test="${not empty uploadImages.id}">
-						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
-						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
-					</c:if>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">运行单位经理审核方案</h3>
+                </div>
+                <table id="testPicTable" data-toolbar="#toolbar"></table>
+                <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">
+                                                                        <sys:fileUpload path="pic" fileNumLimit="50" fileSizeLimit="50"
+                                                                                        value="${testPic.pic}" type="file"
+                                                                                        uploadPath="list"></sys:fileUpload>
+                                                                    </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>
+                            </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/divideForm.js

@@ -45,10 +45,13 @@
                 auto: true,
                 title: "导入交底结论",
                 content: "${ctx}/tag/importExcel",
-                btn: ['确定', '关闭'],
-                btn1: function (index, layero) {
+                btn: ['下载模板','确定', '关闭'],
+                btn1: function(){
+                    jp.downloadFile("${ctx}/managementcenter/activiti/excelOut");
+                },
+                btn2: function (index, layero) {
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion1', function (data) {
+                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/activiti/importDisclose', function (data) {
                         if (data.success) {
                             jp.alert(data.msg);
                             jp.go("${ctx}/act/task/todo")
@@ -59,7 +62,7 @@
                     });//调用保存事件
                     return false;
                 },
-                btn2: function (index) {
+                btn3: function (index) {
                     jp.close(index);
                 }
             });

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

@@ -1,329 +1,318 @@
 <%@ 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="divideForm.js"%>
-	<script type="text/javascript">
-		$(document).ready(function () {
-			$("#agree").click(function () {
-				var cValue ="";//定义一个数组
-				var useflag = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
-				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
-				var flag8 = false;//代表无问题
-				var flag81 = false;//记录选择无问题的同时，有没有选择其它问题类型
-				var nValue = $('input[name="favorite"]:checked');
-				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
-					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
-					if ("pass8" == $(this).val()){
-						flag8 = true;
-					}else {
-						flag81 = true;
-					}
-					if ("pass2" == $(this).val()) {
-						flag2 = true;
-					}else {
-						useflag = true;
-					}
-					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
-				});
-				console.log(cValue);
-				if (nValue == null || nValue.size() <= 0) {
-					jp.error("请选择问题类型");
-				} else if (flag8 == true&&flag81==true) {
-					jp.error("无问题与其它类型问题不可同时发起");
-				} else if (flag2 == true&&useflag==true) {
-					jp.error("项目关闭与其它类型问题不可同时发起");
-				} else {
-					jp.prompt(" 审批意见", function (message) {
-						jp.post("${ctx}/act/task/divideForm",
-								{
-									"taskId": "${construction.act.taskId}",
-									"taskName": "${construction.act.taskName}",
-									"taskDefKey": "${construction.act.taskDefKey}",
-									"procInsId": "${construction.act.procInsId}",
-									"procDefId": "${construction.act.procDefId}",
-									"flag": cValue,
-									"projectName": "${fns:unescapeHtml(construction.projectName)}",
-									"comment": window.encodeURI(message)
-								},
-								function (data) {
-									if (data.success) {
-										jp.success(data.msg);
-										jp.go("${ctx}/act/task/todo")
-									}
-								})
-					});
-				}
-			});
-		})
-	</script>
+    <title>项目经理交底页面</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="divideForm.js" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt(" 审批意见", function (message) {
+                    jp.post("${ctx}/act/task/divideForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo");
+                            } else {
+                                jp.error(data.msg);
+                            }
+                        })
+                });
+            });
+        })
+    </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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<div class="panel-body">
-					<button id="importConclusion" 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="id"/>
-						<input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
-						<input id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
-						<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">
-									<input type="checkbox" name="favorite" value="pass8"  <c:if test="${pass_construction7=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 无问题 &nbsp;
-									<input type="checkbox" name="favorite" value="pass1" <c:if test="${pass_construction2=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 设计变更 &nbsp;
-									<input type="checkbox" name="favorite" value="pass2" <c:if test="${pass_construction1=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 项目关闭 &nbsp;
-									<input type="checkbox" name="favorite" value="pass3"  <c:if test="${pass_construction5=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 行政政处（城区道路）
-									<input type="checkbox" name="favorite" value="pass5"  <c:if test="${pass_construction3=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 农村政处
-									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 民事政处/行政政处（公路/水利）
-<%--									<input type="checkbox" name="favorite" value="pass7"  <c:if test="${pass_construction6=='0'}">checked="checked"</c:if> onclick="<c:if test="${pass_construction6!='0'}">return false</c:if>"> 人工判断--%>
-								</td>
-								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectId)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectName)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
-								<td class="width-35">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='channel'  name="channel" class="form-control required"  value="${construction.disclose.channel}"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 设备基础是否可以扩容：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.capacity}">
-											<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.disclose.capacity}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="否"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='sceneSize'  name="sceneSize" class="form-control required"  value="${construction.disclose.sceneSize}"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 最多可扩容尺寸：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='capacitySize'  name="capacitySize" class="form-control required"  value="${construction.disclose.capacitySize}"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.hiddenDanger}">
-											<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${construction.disclose.hiddenDanger}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="无"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 是否存在低压或通信线等影响施工：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.influenceConstruction}">
-											<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.disclose.influenceConstruction}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="否"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.projectRepetition}">
-											<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${construction.disclose.projectRepetition}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="否"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 是否已实施：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.implemented}">
-											<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.disclose.implemented}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="否"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.transformer}">
-											<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="${construction.disclose.transformer}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='transformer'  name="transformer" class="form-control required"  value="有"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<td class="width-15 active"><label class="pull-right">项目实施必要性描述</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='explanationOfNecessity'  name="needReplace" class="form-control required"  value="${construction.disclose.explanationOfNecessity}"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 线路名称、设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.lineName}">
-											<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="一致"/>
-										</c:otherwise>
-									</c:choose>
+    <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="importConclusion" 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="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">
+                                    <input type="checkbox" name="favorite" value="pass8"
+                                           <c:if test="${noProblem}">checked="checked"</c:if>
+                                           onclick="return false"> 无问题
+                                    &nbsp;
+                                    <input type="checkbox" name="favorite" value="pass1"
+                                           <c:if test="${design}">checked="checked"</c:if>
+                                           onclick="return false"> 设计变更
+                                    &nbsp;
+                                    <input type="checkbox" name="favorite" value="pass2"
+                                           <c:if test="${closed}">checked="checked"</c:if>
+                                           onclick="return false"> 项目关闭
+                                    &nbsp;
+                                </td>
+                                <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>
-								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.quantities}">
-											<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="${construction.disclose.quantities}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='quantities'  name="quantities" class="form-control required"  value="是"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
+                                <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>
+                            </tbody>
+                        </table>
+                    </form:form>
 
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='inconsistentDescription'  name="overallTransformation" class="form-control required"  value="${construction.disclose.inconsistentDescription}"/>
-								</td>
 
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.administrationType}">
-											<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="${construction.disclose.administrationType}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='administrationType'  name="administrationType" class="form-control required"  value="4.无"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='precondition'  name="precondition" class="form-control required"  value="${construction.disclose.precondition}"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='policyHandlingInstructions'  name="needReplace" class="form-control required"  value="${construction.disclose.policyHandlingInstructions}"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
-								<td class="width-35">
-									<c:choose>
-										<c:when test="${not empty construction.disclose.placementMode}">
-											<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.disclose.placementMode}"/>
-										</c:when>
-										<c:otherwise>
-											<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="无"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='productionDate'  name="productionDate" class="form-control required"  value="${construction.disclose.productionDate}"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 二次是否是集成模块：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value="${construction.disclose.integrateModule}"/>
-								</td>
-
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='needReplace'  name="needReplace" class="form-control required"  value="${construction.disclose.needReplace}"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right"> 设备是否有整体改造的必要：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='overallTransformation'  name="overallTransformation" class="form-control required"  value="${construction.disclose.overallTransformation}"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">其它问题类型：</label></td>
-								<td class="width-35">
-									<input type='text' readonly="readonly" id='otherProblem'  name="otherProblem" class="form-control required"  value="${construction.disclose.otherProblem}"/>
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</form:form>
-
-
-
-					<%--<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">--%>
-						<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="reject" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="存在问题" />--%>
-								</div>
-							</div>
-						</div>
-					<%--</c:if>--%>
-
-					<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="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">--%>
+                    <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;
+                            </div>
+                        </div>
+                    </div>
+                    <%--</c:if>--%>
+                    <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/documentsForm.jsp

@@ -1,30 +1,21 @@
 <%@ 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="sealForm.js"%>
-	<script type="text/javascript">
+    <title>配网项目经理判定变更或关闭</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
         $(document).ready(function () {
             $("#agree").click(function () {
-                var pic = $("#pic").val();
-                if (pic == "" || pic == null) {
-                    jp.error("请上传收据");
-                    return;
-                }
-                var currentFileValues = $("input[name='pic']").val();
                 jp.prompt("审核通过", function (message) {
-                    jp.post("${ctx}/act/task/policyPay1Task",
+                    jp.post("${ctx}/act/task/documentsForm",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "pic": currentFileValues,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -33,12 +24,13 @@
                                 jp.success(data.msg);
                                 jp.go("${ctx}/act/task/todo")
                             }
-                        })
+                        }
+                    )
                 })
             });
             $("#no").click(function () {
                 jp.prompt("驳回", function (message) {
-                    jp.post("${ctx}/act/task/policyPay1Task",
+                    jp.post("${ctx}/act/task/documentsForm",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
@@ -53,282 +45,268 @@
                                 jp.success(data.msg);
                                 jp.go("${ctx}/act/task/todo")
                             }
-                        })
+                        }
+                    )
                 })
             })
         })
-	</script>
+    </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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<div style="margin: 0px 25px 0px 25px">
-					<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				</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 type="hidden" id="procInsId" name="procInsId" value="${construction.act.procInsId}"/>
-						<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.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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right">上传借款单据：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
-								<td class="width-35">
-										${construction.disclose.channel}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备基础是否可以扩容：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.sceneSize}
-								</td>
-								<td class="width-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacitySize}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
-								<td class="width-35">
-										${construction.disclose.hiddenDanger}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
-								<td class="width-35">
-										${construction.disclose.influenceConstruction}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
-								<td class="width-35">
-										${construction.disclose.projectRepetition}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
-								<td class="width-35">
-										${construction.disclose.implemented}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
-								<td class="width-35">
-										${construction.disclose.transformer}
-								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.explanationOfNecessity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.lineName}
-								</td>
-								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
-								<td class="width-35">
-										${construction.disclose.quantities}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.rodNumber}
-								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.inconsistentDescription}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-								<td class="width-35">
-										${construction.disclose.administrationType}
-								</td>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
-								<td class="width-35">
-										${construction.disclose.precondition}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.policyHandlingInstructions}
-								</td>
-								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
-								<td class="width-35">
-										${construction.disclose.placementMode}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
-								<td class="width-35">
-										${construction.disclose.productionDate}
-								</td>
-								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
-								<td class="width-35">
-										${construction.disclose.integrateModule}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
-								<td class="width-35">
-										${construction.disclose.needReplace}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
-								<td class="width-35">
-										${construction.disclose.overallTransformation}
-								</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-danger btn-lg btn-parsley" type="submit" value="驳回" />
-								</div>
-							</div>
-						</div>
+    <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>
 
-					<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>
+                                <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>
+                            </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-danger btn-lg btn-parsley" type="submit" value="驳回"/>
+                            </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/economicsDesignChange.js

@@ -2,7 +2,6 @@
 <script>
 $(document).ready(function() {
 	var procInsId = $("#procInsId").val();
-
 	// alert(procInsId);
 	$('#testPicTable').bootstrapTable({
 		  //请求方法
@@ -39,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
+               url: "${ctx}/managementcenter/activiti/uploadData?procInsId="+procInsId,
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -84,7 +83,7 @@ $(document).ready(function() {
 		},
                columns: [{
 		        field: 'path',
-		        title: '图片路径',
+		        title: '文件路径',
 		        sortable: true,
 		        sortName: 'path',
 		        formatter:function(value, row , index){
@@ -107,10 +106,10 @@ $(document).ready(function() {
 				   sortable: true,
 				   sortName: 'imgName',
 			   },{
-				   field: 'uId',
+				   field: 'uid',
 				   title: '上传人员',
 				   sortable: true,
-				   sortName: 'uId',
+				   sortName: 'uid',
 			   }]
 		});
 		

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-    <title>项目经理交底页面</title>
+    <title>交底结论修改页面</title>
     <meta name="decorator" content="ani"/>
     <!-- SUMMERNOTE -->
     <%@include file="/webpage/include/summernote.jsp" %>
@@ -32,51 +32,78 @@
                 format: "YYYY-MM-DD HH:mm:ss"
             });
             $('select').change(function () {
-                var hiddenDanger = $('#hiddenDanger').val();
-                var influenceConstruction = $('#influenceConstruction').val();
-                var projectRepetition = $('#projectRepetition').val();
-                var implemented = $('#implemented').val();
-                var transformer = $('#transformer').val();
-                if (hiddenDanger == '有' || influenceConstruction == '是' || projectRepetition == '是' || implemented == '是' || transformer == '无') {
-                    $('#explanationOfNecessity').attr('placeholder', '项目实施必要性描述不能为空');
-                } else if (hiddenDanger == '无' && influenceConstruction == '否' && projectRepetition == '否' && implemented == '否' && transformer == '有') {
-                    $('#explanationOfNecessity').removeAttr('placeholder');
+                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();
+                if (hasImplemented == '是') {
+                    $('#sceneDescription').attr('placeholder', '现场情况描述不能为空');
+                }else {
+                    $('#sceneDescription').removeAttr('placeholder');
                 }
-
-                var lineName = $('#lineName').val();
-                var quantities = $('#quantities').val();
-                if (lineName == '不一致' || quantities == '否') {
-                    $('#inconsistentDescription').attr('placeholder', '项目实施必要性描述不能为空');
-                } else if (lineName == '一致' && quantities == '是') {
-                    $('#inconsistentDescription').removeAttr('placeholder');
+                if (isImplement == '否') {
+                    $('#noImplementation').attr('placeholder', '实施无必要描述不能为空');
+                }else {
+                    $('#noImplementation').removeAttr('placeholder');
                 }
-
-                var administrationType = $('#administrationType').val();
-                if (administrationType != '1.无') {
-                    $('#policyHandlingInstructions').attr('placeholder', '项目实施必要性描述不能为空');
-                } else {
-                    $('#policyHandlingInstructions').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');
                 }
-
             });
-
         });
 
         function save() {
-            var val = getVal();
-            console.log(val);
-            var policyHandlingInstructions = $('#policyHandlingInstructions').val();
-            if (val.indexOf('无') >= 0 && val.indexOf(";") >= 1) {
-                jp.error("无不可以和其它类型一起选择");
+            var b = check();
+            if (!b) {
+                jp.error("请正确填写信息");
                 return false;
-            } else {
-                if (val.indexOf('无') != 0){
-                    console.log(val);
-                    if (policyHandlingInstructions == '') {
-                        jp.error("政策处理说明不能为空");
-                        return false;
-                    }
-                }
             }
             jp.loading();
             jp.post("${ctx}/managementcenter/activiti/editConSave", $("#inputForm").serialize(), function (data) {
@@ -90,14 +117,86 @@
                 }
             })
         }
-        function getVal(groups){
-            var chk_value =[];//定义一个数组
-            $('input[name="administrationTypeList"]:checked').each(function(){//遍历每一个名字为nodes的复选框，其中选中的执行函数
+
+        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();
+            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;
+                }
+            }
+            return flag;
+        }
     </script>
 </head>
 <body>
@@ -106,174 +205,179 @@
         <div class="col-md-12">
             <div class="panel panel-primary">
                 <div class="panel-body">
-                    <form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
-                               method="post" class="form-horizontal">
+                    <form:form id="inputForm" modelAttribute="construction" action="" method="post"
+                               class="form-horizontal">
                         <form:hidden path="id"/>
                         <input id="procInsId" type="hidden" value="${fns:unescapeHtml(construction.procInsId)}">
                         <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="disclose.channel" 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 path="disclose.capacity" cssClass="form-control">
+                                    <form:select id="hasImplemented" path="disclose.hasImplemented"
+                                                 cssClass="form-control">
                                         <form:option value="否"/>
                                         <form:option value="是"/>
                                     </form:select>
+                                        <%--                                    <form:input path="disclose.hasImplemented" cssClass="form-control required"/>--%>
                                 </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 path="disclose.sceneSize" cssClass="form-control"/>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right"> 最多可扩容尺寸：</label></td>
-                                <td class="width-35">
-                                    <form:input path="disclose.capacitySize" cssClass="form-control"/>
+                                    <form:input id="sceneDescription" path="disclose.sceneDescription"
+                                                cssClass="form-control required"/>
                                 </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="hiddenDanger" path="disclose.hiddenDanger" cssClass="form-control">
-                                        <form:option value="无"/>
-                                        <form:option value="有"/>
+                                    <form:select id="isImplement" path="disclose.isImplement" 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-15 active"><label class="pull-right"> 实施无必要描述：</label></td>
                                 <td class="width-35">
-                                    <form:select id="influenceConstruction" path="disclose.influenceConstruction"
-                                                 cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
+                                    <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-15 active"><label class="pull-right">图纸是否完整：</label></td>
                                 <td class="width-35">
-                                    <form:select id="projectRepetition" path="disclose.projectRepetition"
+                                    <form:select id="whetherComplete" path="disclose.whetherComplete"
                                                  cssClass="form-control">
-                                        <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:select id="implemented" path="disclose.implemented" cssClass="form-control">
-                                        <form:option value="否"/>
-                                        <form:option value="是"/>
-                                    </form:select>
+                                    <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-15 active"><label class="pull-right">图纸是否规范：</label></td>
                                 <td class="width-35">
-                                    <form:select id="transformer" path="disclose.transformer" cssClass="form-control">
-                                        <form:option value="有"/>
-                                        <form:option value="无"/>
+                                    <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-15 active"><label class="pull-right"> 图纸规范性描述：</label></td>
                                 <td class="width-35">
-                                    <form:input id="explanationOfNecessity" path="disclose.explanationOfNecessity"
+                                    <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="lineName" path="disclose.lineName" 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="quantities" path="disclose.quantities" cssClass="form-control">
-                                        <form:option value="是"/>
+                                    <form:select id="whetherDrawing" path="disclose.whetherDrawing"
+                                                 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:input id="inconsistentDescription" path="disclose.inconsistentDescription"
+                                    <form:input id="problemDescription" path="disclose.problemDescription"
                                                 cssClass="form-control"/>
-                                </td>
-                                <td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-                                <td class="width-35">
-                                    <form:checkboxes onclick="checkboxOnclick(this)" path="administrationTypeList" items="${fns:getDictList('administrationType')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
-<%--                                    <form:select id="administrationType" path="disclose.administrationType" cssClass="form-control">
-                                        <form:option value="1.无"/>
-                                        <form:option value="2.农村政处"/>
-                                        <form:option value="3.民事政处/行政政处（公路/水利）"/>
-                                        <form:option value="4.行政政处（城区道路）"/>
-                                        <form:option value="5.农村政处;民事政处/行政政处（公路/水利）"/>
-                                        <form:option value="6.农村政处;行政政处（城区道路）"/>
-                                        <form:option value="7.民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-                                        <form:option value="8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
-                                    </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:input id="policyHandlingInstructions"
-                                                path="disclose.policyHandlingInstructions" cssClass="form-control"/>
+                                    <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-15 active"><label class="pull-right">施工通道情况描述：</label></td>
                                 <td class="width-35">
-                                    <form:input id="precondition" path="disclose.precondition" cssClass="form-control"/>
+                                    <form:input id="constructionDescription" path="disclose.constructionDescription"
+                                                cssClass="form-control"/>
+
                                 </td>
                             </tr>
                             <tr>
-                                <td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
+                                <td class="width-15 active"><label class="pull-right"> 土建是否需要调整：</label></td>
                                 <td class="width-35">
-                                    <form:select path="disclose.placementMode" cssClass="form-control">
-                                        <form:option value="无"/>
-                                        <form:option value="户内"/>
-                                        <form:option value="户外"/>
+                                    <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-15 active"><label class="pull-right">土建方案变更内容描述：</label></td>
                                 <td class="width-35">
-                                    <form:input path="disclose.productionDate" cssClass="form-control"/>
+                                    <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 class="width-15 active"><label class="pull-right"> 二次是否是集成模块：</label></td>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">电气方案是否需要调整：</label></td>
                                 <td class="width-35">
-                                    <form:select path="disclose.integrateModule" cssClass="form-control">
+                                    <form:select id="electricalAdjusted" path="disclose.electricalAdjusted"
+                                                 cssClass="form-control">
                                         <form:option value="否"/>
                                         <form:option value="是"/>
                                     </form:select>
                                 </td>
-                                <td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></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 path="disclose.needReplace" cssClass="form-control">
+                                    <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-35">
+                                    <form:input id="automatedAdjustment" path="disclose.automatedAdjustment"
+                                                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 path="disclose.overallTransformation" cssClass="form-control">
+                                    <form:select id="otherAdjusted" path="disclose.otherAdjusted"
+                                                 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:input id="otherProblem" path="disclose.otherProblem" cssClass="form-control"/>
+                                    <form:input id="descriptionReasons" path="disclose.descriptionReasons"
+                                                cssClass="form-control"/>
                                 </td>
                             </tr>
                             </tbody>

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

@@ -31,39 +31,5 @@
                 }
             }
         });
-
-        /**
-         * 导入交底结论
-         * */
-        $("#importConclusion").click(function () {
-            var projectId = $("#id").val();
-            var procInsId = $("#procInsId").val();
-            var projectName = $("#projectName").val();
-            jp.open({
-                type: 2,
-                area: [500, 200],
-                auto: true,
-                title: "导入交底结论",
-                content: "${ctx}/tag/importExcel",
-                btn: ['确定', '关闭'],
-                btn1: function (index, layero) {
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    iframeWin.contentWindow.importExcel('${ctx}/managementcenter/divide/importConclusion?procInsId='+procInsId+"&projectName="+encodeURI(encodeURI(projectName)), function (data) {
-                        if (data.success) {
-                            jp.alert(data.msg);
-                            location.reload();
-                        } else {
-                            jp.alert(data.msg);
-                        }
-                        jp.close(index);
-                    });//调用保存事件
-                    return false;
-                },
-                btn2: function (index) {
-                    jp.close(index);
-                }
-            });
-        });
-
     })
 </script>

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

@@ -2,65 +2,65 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>项目经理人工判断页面</title>
+	<title>运行人员审核</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<%@include file="humanReview.js"%>
 	<script type="text/javascript">
 		$(document).ready(function () {
-			var a = $("#percondition").val();
-			if (a!="undefined"&&a!=null&&a!="") {
-                $("#no").css("display", "none");
-            }
 			$("#agree").click(function () {
-				var cValue ="";//定义一个数组
-				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
-				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
-				var flagNo= false;//代表是否选择无问题之外的类型
-				var flag7 = false;//代表是否选择了无问题
-				var nValue = $('input[name="favorite"]:checked');
+				var closed = true;
+				var design = true;
+				var noProblem = true;
+				var cValue = "";
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
-                    //判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
-					if ("pass7"==$(this).val()){//无问题
-					    flag7 = true;
-					}else {
-						flagNo = true;
+                    if ("noProblem" == $(this).val()){
+						noProblem = false;
 					}
-                    if ("pass2" == $(this).val()) {//项目关闭
-                        flag2 = true;
-                    }else {
-                        flag1 = true;
-                    }
-					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
+					if ("design" == $(this).val()){
+						design = false;
+					}
+					if ("closed" == $(this).val()){
+						closed = false;
+					}
+					cValue += $(this).val()
 				});
-				if (nValue == null || nValue.size() <= 0) {
-					jp.error("请选择问题类型");
-				} else if(flag1==true&&flag2==true){
-					jp.error("项目关闭与其它类型问题不可同时发起");
-				}else if (flag7&&flagNo){
-                    jp.error("无问题与其他类型不可同时发起")
-				} else {
-					jp.prompt(" 审批意见", function (message) {
-						jp.post("${ctx}/act/task/humanReviewTask",
-						{
-							"taskId":"${construction.act.taskId}",
-							"taskName":"${construction.act.taskName}",
-							"taskDefKey":"${construction.act.taskDefKey}",
-							"procInsId":"${construction.act.procInsId}",
-							"procDefId":"${construction.act.procDefId}",
-							"flag":cValue,
-							"projectName":"${fns:unescapeHtml(construction.projectName)}",
-							"comment":window.encodeURI(message)
-						},
-						function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								jp.go("${ctx}/act/task/todo")
-							}
-						})
-					});
+				if (closed && noProblem && design) {
+					jp.error("请选择类型");
+					return false;
+				}
+				if (!noProblem) {
+					if (!design || !closed) {
+						jp.error("请正确选择问题类型");
+						return false;
+					}
+				}
+				if (!closed) {
+					if (!design) {
+						jp.error("项目关闭不可与其它类型同时发起");
+						return false;
+					}
 				}
+				jp.prompt(" 审批意见", function (message) {
+					jp.post("${ctx}/act/task/humanReview",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":cValue,
+						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
+				});
 			});
 		})
 	</script>
@@ -72,34 +72,30 @@
 			<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 class="panel-title">运行人员审核</h3>
 					</h3>
 				</div>
 				<div class="panel-body">
-					<button id="importConclusion" class="btn btn-info">
-						<i class="fa fa-folder-open-o"></i> 导入交地结论
-					</button>
-					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
-					<form:hidden path="id"/>
+					<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 id="projectName" type="hidden" value="${fns:unescapeHtml(construction.projectName)}">
 						<input type="hidden" value="${fns:unescapeHtml(construction.id)}">
-						<input id="percondition" type="hidden" value="${construction.disclose.precondition}">
 						<table class="table table-bordered">
 							<tbody>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">问题类型：</label></td>
 								<td class="width-35">
-									<input type="checkbox" name="favorite" value="pass7"  <c:if test="${pass_construction7=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 无问题 &nbsp;
-									<input type="checkbox" name="favorite" value="pass1" <c:if test="${pass_construction2=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 设计变更 &nbsp;
-									<input type="checkbox" name="favorite" value="pass2" <c:if test="${pass_construction1=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 项目关闭 &nbsp;
-									<input type="checkbox" name="favorite" value="pass3"  <c:if test="${pass_construction5=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 行政政处（城区道路）
-									<input type="checkbox" name="favorite" value="pass5"  <c:if test="${pass_construction3=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 农村政处
-									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if> <c:if test="${pass_construction6 !='0'}">onclick="return false"</c:if>> 民事政处/行政政处（公路/水利）
+									<input type="checkbox" name="favorite" value="noProblem"
+										   <c:if test="${noProblem}">checked="checked"</c:if>> 无问题
+									<input type="checkbox" name="favorite" value="design"
+										   <c:if test="${design}">checked="checked"</c:if>> 设计变更
+									<input type="checkbox" name="favorite" value="closed"
+										   <c:if test="${closed}">checked="checked"</c:if>> 项目关闭
 								</td>
-								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+								<td class="width-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.projectName)}
+										${fns:unescapeHtml(construction.reserveProjectName)}
 								</td>
 							</tr>
 							<tr>
@@ -107,223 +103,216 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.projectId)}
 								</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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+										${fns:unescapeHtml(construction.projectName)}
 								</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">
-										${fns:unescapeHtml(construction.powerLine)}
+										${fns:unescapeHtml(construction.basicInformation.municipalCompany)}
 								</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">
-										${fns:unescapeHtml(construction.blackoutArea)}
+										${fns:unescapeHtml(construction.basicInformation.countyCompany)}
 								</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">
-										${fns:unescapeHtml(construction.projectType)}
+										${fns:unescapeHtml(construction.basicInformation.projectNature)}
 								</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">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
+										${fns:unescapeHtml(construction.basicInformation.demandUnit)}
 								</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">
-										${fns:unescapeHtml(construction.civilEngineering)}
+										${fns:unescapeHtml(construction.basicInformation.operationUnit)}
 								</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">
-										${fns:unescapeHtml(construction.baseType)}
+										${fns:unescapeHtml(construction.basicInformation.powerSupplyArea)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-15 active"><label class="pull-right">网格编号：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
+										${fns:unescapeHtml(construction.basicInformation.gridNumber)}
 								</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">
-										${fns:unescapeHtml(construction.transformationType)}
+										${fns:unescapeHtml(construction.basicInformation.cellNumber)}
 								</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">
-										${fns:unescapeHtml(construction.transformationEquipment)}
+										${fns:unescapeHtml(construction.basicInformation.projectReserveNo)}
 								</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">
-										${fns:unescapeHtml(construction.newNamed)}
+										${fns:unescapeHtml(construction.basicInformation.gridProjectNo)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
+										${fns:unescapeHtml(construction.basicInformation.erpNo)}
 								</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">
-										${fns:unescapeHtml(construction.electricalConstruction)}
+										${fns:unescapeHtml(construction.basicInformation.necessityContent)}
 								</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">
-										${fns:unescapeHtml(construction.theAssignment)}
+										${fns:unescapeHtml(construction.basicInformation.subStationName)}
 								</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">
-										${fns:unescapeHtml(construction.automation)}
+										${fns:unescapeHtml(construction.basicInformation.lineName)}
 								</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">
-										${fns:unescapeHtml(construction.remote)}
+										${fns:unescapeHtml(construction.basicInformation.projectType)}
 								</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">
-										${fns:unescapeHtml(construction.communicationMode)}
+										${fns:unescapeHtml(construction.basicInformation.whetherSummer)}
 								</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">
-										${fns:unescapeHtml(construction.inSitu)}
+										${fns:unescapeHtml(construction.basicInformation.basicDescription)}
 								</td>
-								<td class="width-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
+								<td class="width-15 active"><label class="pull-right">工区备注：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
+										${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
+										${fns:unescapeHtml(construction.disclose.hasImplemented)}
 								</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">
-										${fns:unescapeHtml(construction.powerFailure)}
+										${fns:unescapeHtml(construction.disclose.sceneDescription)}
 								</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">
-										${construction.disclose.channel}
+										${fns:unescapeHtml(construction.disclose.isImplement)}
 								</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">
-										${construction.disclose.capacity}
+										${fns:unescapeHtml(construction.disclose.noImplementation)}
 								</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">
-										${construction.disclose.sceneSize}
+										${fns:unescapeHtml(construction.disclose.whetherComplete)}
 								</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">
-										${construction.disclose.capacitySize}
+										${fns:unescapeHtml(construction.disclose.drawingDescription)}
 								</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">
-										${construction.disclose.hiddenDanger}
+										${fns:unescapeHtml(construction.disclose.whetherStandard)}
 								</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">
-										${construction.disclose.influenceConstruction}
+										${fns:unescapeHtml(construction.disclose.normativeDrawings)}
 								</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">
-										${construction.disclose.projectRepetition}
+										${fns:unescapeHtml(construction.disclose.whetherDrawing)}
 								</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">
-										${construction.disclose.implemented}
+										${fns:unescapeHtml(construction.disclose.problemDescription)}
 								</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">
-										${construction.disclose.transformer}
+										${fns:unescapeHtml(construction.disclose.whetherChannel)}
 								</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">
-										${construction.disclose.explanationOfNecessity}
+										${fns:unescapeHtml(construction.disclose.constructionDescription)}
 								</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">
-										${construction.disclose.lineName}
+										${fns:unescapeHtml(construction.disclose.civilAdjusted)}
 								</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">
-										${construction.disclose.quantities}
+										${fns:unescapeHtml(construction.disclose.descriptionPlans)}
 								</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">
-										${construction.disclose.inconsistentDescription}
+										${fns:unescapeHtml(construction.disclose.descriptionAdjustment)}
 								</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">
-										${construction.disclose.administrationType}
+										${fns:unescapeHtml(construction.disclose.electricalAdjusted)}
 								</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">
-										${construction.disclose.precondition}
+										${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
 								</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">
-										${construction.disclose.policyHandlingInstructions}
+										${fns:unescapeHtml(construction.disclose.doesChange)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 自动化方案调整内容：</label></td>
 								<td class="width-35">
-										${construction.disclose.placementMode}
+										${fns:unescapeHtml(construction.disclose.automatedContent)}
 								</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">
-										${construction.disclose.productionDate}
+										${fns:unescapeHtml(construction.disclose.automatedAdjustment)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
-								<td class="width-35">
-										${construction.disclose.integrateModule}
-								</td>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+
+								<td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整：</label></td>
 								<td class="width-35">
-										${construction.disclose.needReplace}
+										${fns:unescapeHtml(construction.disclose.otherAdjusted)}
 								</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">
-										${construction.disclose.overallTransformation}
+										${fns:unescapeHtml(construction.disclose.descriptionReasons)}
 								</td>
 							</tr>
 							</tbody>
 						</table>
 					</form:form>
 
-
-
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">

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

@@ -1,115 +1,319 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-	<title>配网项目经理判断变更后材料</title>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<meta name="decorator" content="ani"/>
-	<%@ include file="/webpage/include/bootstraptable.jsp"%>
-	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="managerUploadList.js" %>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("#agree").click(function () {
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/managerUpload",
-					{
-						"taskId":"${uploadImages.act.taskId}",
-						"taskName":"${uploadImages.act.taskName}",
-						"taskDefKey":"${uploadImages.act.taskDefKey}",
-						"procInsId":"${uploadImages.act.procInsId}",
-						"procDefId":"${uploadImages.act.procDefId}",
-						"flag":"yes",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
-			});
-			$("#no").click(function () {
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/managerUpload",
-						{
-							"taskId":"${uploadImages.act.taskId}",
-							"taskName":"${uploadImages.act.taskName}",
-							"taskDefKey":"${uploadImages.act.taskDefKey}",
-							"procInsId":"${uploadImages.act.procInsId}",
-							"procDefId":"${uploadImages.act.procDefId}",
-							"flag":"no",
-							"comment":window.encodeURI(message)
-						},
-						function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								jp.go("${ctx}/act/task/todo")
-							}
-						})
-					});
-				});
-		});
-	</script>
+    <title>运行经理审核设计变更后</title>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="decorator" content="ani"/>
+    <%@ include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="economicsDesignChange.js" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt(" 审批意见", function (message) {
+                    jp.post("${ctx}/act/task/managerUpload",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo");
+                            } else {
+                                jp.error(data.msg);
+                            }
+                        }
+                    )
+                });
+            });
+            $("#no").click(function () {
+                jp.prompt("审核意见", function (message) {
+                    jp.post("${ctx}/act/task/managerUpload",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo");
+                            } else {
+                                jp.error(data.msg);
+                            }
+                        }
+                    )
+                });
+            });
+        });
+    </script>
 </head>
 <body>
-	<div class="wrapper wrapper-content">
-	<div class="panel panel-primary">
-	<div class="panel-heading">
-		<h3 class="panel-title">配网项目经理判断变更后材料</h3>
-	</div>
-	<div class="panel-body">
-	
-	<!-- 搜索 -->
-	<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}"/>
-	</form:form>
-	</div>
-	</div>
-	<!-- 工具栏 -->
-	<div id="toolbar">
+<div class="wrapper wrapper-content">
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">运行经理审核设计变更后</h3>
+        </div>
+        <div class="panel-body">
+            <!-- 表格 -->
+            <table id="testPicTable" data-toolbar="#toolbar"></table>
+            <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>
 
-		    </div>
-	<!-- 表格 -->
-	<table id="testPicTable"   data-toolbar="#toolbar"></table>
-		<div class="panel-body">
-			<form:form id="inputForm" modelAttribute="uploadImages" 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"/>
-				<div class="form-group">
-					<div class="col-lg-3"></div>
-					<div class="col-lg-6">
-						<div class="form-group text-center">
-						</div>
-					</div>
-				</div>
-			</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 uploadImages.id}">
-				<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
-				<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
-			</c:if>
-		</div>
-    <!-- context menu -->
-    <ul id="context-menu" class="dropdown-menu">
-    </ul>  
-	</div>
-	</div>
-	</div>
+                            <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>
+                        </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>
+            <!-- context menu -->
+            <ul id="context-menu" class="dropdown-menu">
+            </ul>
+        </div>
+    </div>
+</div>
 </body>
 </html>

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

@@ -2,72 +2,50 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>运行人员设计变更页面</title>
+	<title>运行单位经理判定设计变更</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<script type="text/javascript">
 		$(document).ready(function () {
-			var demandUnit = $("#demandUnit").val();
-			var flag = false;
-			if (demandUnit=="经研所") {
-				$("#demandUnit1").css("display", "none");
-				$("#demandUnit4").css("display", "none");
-				flag = true;
-			}else {
-				$("#demandUnit2").css("display", "none");
-				$("#demandUnit5").css("display", "none");
-			}
 			$("#agree").click(function () {
-				var currentFileValues = $("input[name='pic']").val();
-				var selected = $("#selected").val();
-				if (flag==false&&currentFileValues == "" && selected == "0") {
-					jp.error("请选择上传的文件");
-				} else {
-					jp.prompt("审核意见", function (message) {
-						jp.post("${ctx}/act/task/operator",
-								{
-									"taskId":"${construction.act.taskId}",
-									"taskName":"${construction.act.taskName}",
-									"taskDefKey":"${construction.act.taskDefKey}",
-									"procInsId":"${construction.act.procInsId}",
-									"procDefId":"${construction.act.procDefId}",
-									"flag":"yes",
-									"pic":currentFileValues,
-									"projectName":"${fns:unescapeHtml(construction.projectName)}",
-									"comment":window.encodeURI(message)
-								},
-								function (data) {
-									if(data.success){
-										jp.success(data.msg);
-										jp.go("${ctx}/act/task/todo")
-									}else {
-										jp.error("请选择与需求提出单位对应的人员")
-									}
-								})
-					});
-				}
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/operator",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"yes",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if (data.success) {
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo");
+						}
+					})
+				});
 			});
 			$("#no").click(function () {
-				// alert(design);
 				jp.prompt("审核意见", function (message) {
 					jp.post("${ctx}/act/task/operator",
-							{
-								"taskId":"${construction.act.taskId}",
-								"taskName":"${construction.act.taskName}",
-								"taskDefKey":"${construction.act.taskDefKey}",
-								"procInsId":"${construction.act.procInsId}",
-								"procDefId":"${construction.act.procDefId}",
-								"flag":"no",
-								"projectName":"${fns:unescapeHtml(construction.projectName)}",
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if (data.success) {
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo");
-								}
-							})
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"no",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if (data.success) {
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo");
+						}
+					})
 				});
 			});
 		})
@@ -80,265 +58,247 @@
 			<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 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 type="hidden" id="demandUnit" value="${construction.demandUnit}">
-<%--						<input id="procInsId" type="text" value="${fns:unescapeHtml(construction.procInsId)}">
-						<input id="projectName" type="text" value="${fns:unescapeHtml(construction.projectName)}">
-						<input type="text" value="${fns:unescapeHtml(construction.id)}">--%>
+					<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-15 active"><label class="pull-right">储备项目暂定名称：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.projectId)}
+										${fns:unescapeHtml(construction.reserveProjectName)}
 								</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">
-										${fns:unescapeHtml(construction.projectName)}
+										${fns:unescapeHtml(construction.basicInformation.demandUnit)}
 								</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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+										${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" id="demandUnit4">
-									<select id="selected" class="form-control">
-										<option value="0">是</option>
-										<option value="1">否</option>
-									</select>
-								</td>
-								<td id="demandUnit5">无需选择是否变更</td>
-								<td id="demandUnit3" class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
-								<td id="demandUnit1" class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-								<td id="demandUnit2">又经研所上传图纸</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">
-										${fns:unescapeHtml(construction.powerLine)}
+										${fns:unescapeHtml(construction.basicInformation.municipalCompany)}
 								</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">
-										${fns:unescapeHtml(construction.blackoutArea)}
+										${fns:unescapeHtml(construction.basicInformation.countyCompany)}
 								</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">
-										${fns:unescapeHtml(construction.projectType)}
+										${fns:unescapeHtml(construction.basicInformation.projectNature)}
 								</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">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
+										${fns:unescapeHtml(construction.basicInformation.demandUnit)}
 								</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">
-										${fns:unescapeHtml(construction.civilEngineering)}
+										${fns:unescapeHtml(construction.basicInformation.operationUnit)}
 								</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">
-										${fns:unescapeHtml(construction.baseType)}
+										${fns:unescapeHtml(construction.basicInformation.powerSupplyArea)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+								<td class="width-15 active"><label class="pull-right">网格编号：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
+										${fns:unescapeHtml(construction.basicInformation.gridNumber)}
 								</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">
-										${fns:unescapeHtml(construction.transformationType)}
+										${fns:unescapeHtml(construction.basicInformation.cellNumber)}
 								</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">
-										${fns:unescapeHtml(construction.transformationEquipment)}
+										${fns:unescapeHtml(construction.basicInformation.projectReserveNo)}
 								</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">
-										${fns:unescapeHtml(construction.newNamed)}
+										${fns:unescapeHtml(construction.basicInformation.gridProjectNo)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+								<td class="width-15 active"><label class="pull-right"> ERP编号</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
+										${fns:unescapeHtml(construction.basicInformation.erpNo)}
 								</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">
-										${fns:unescapeHtml(construction.electricalConstruction)}
+										${fns:unescapeHtml(construction.basicInformation.necessityContent)}
 								</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">
-										${fns:unescapeHtml(construction.theAssignment)}
-							</td>
-								<td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
+										${fns:unescapeHtml(construction.basicInformation.subStationName)}
+								</td>
+								<td class="width-15 active"><label class="pull-right">线路名称：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
+										${fns:unescapeHtml(construction.basicInformation.lineName)}
 								</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">
-										${fns:unescapeHtml(construction.remote)}
+										${fns:unescapeHtml(construction.basicInformation.projectType)}
 								</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">
-										${fns:unescapeHtml(construction.communicationMode)}
+										${fns:unescapeHtml(construction.basicInformation.whetherSummer)}
 								</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">
-										${fns:unescapeHtml(construction.inSitu)}
+										${fns:unescapeHtml(construction.basicInformation.basicDescription)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"> 环网柜DTU户外或户内：</label></td>
+								<td class="width-15 active"><label class="pull-right">工区备注：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
+										${fns:unescapeHtml(construction.basicInformation.workAreaRemarks)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
 								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
+										${fns:unescapeHtml(construction.disclose.hasImplemented)}
 								</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">
-										${fns:unescapeHtml(construction.powerFailure)}
+										${fns:unescapeHtml(construction.disclose.sceneDescription)}
 								</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">
-										${construction.disclose.channel}
+										${fns:unescapeHtml(construction.disclose.isImplement)}
 								</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">
-										${construction.disclose.capacity}
-										<%--<select id="capacity"  maxlength="100"  class=" form-control">
-										<option value="是">是</option>
-										<option value="否">否</option>
-									</select>--%>
+										${fns:unescapeHtml(construction.disclose.noImplementation)}
 								</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">
-										${construction.disclose.sceneSize}
+										${fns:unescapeHtml(construction.disclose.whetherComplete)}
 								</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">
-										${construction.disclose.capacitySize}
+										${fns:unescapeHtml(construction.disclose.drawingDescription)}
 								</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">
-										${construction.disclose.hiddenDanger}
+										${fns:unescapeHtml(construction.disclose.whetherStandard)}
 								</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">
-										${construction.disclose.influenceConstruction}
+										${fns:unescapeHtml(construction.disclose.normativeDrawings)}
 								</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">
-										${construction.disclose.projectRepetition}
+										${fns:unescapeHtml(construction.disclose.whetherDrawing)}
 								</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">
-										${construction.disclose.implemented}
+										${fns:unescapeHtml(construction.disclose.problemDescription)}
 								</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">
-										${construction.disclose.transformer}
+										${fns:unescapeHtml(construction.disclose.whetherChannel)}
 								</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">
-										${construction.disclose.lineName}
+										${fns:unescapeHtml(construction.disclose.constructionDescription)}
 								</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">
-										${construction.disclose.quantities}
+										${fns:unescapeHtml(construction.disclose.civilAdjusted)}
 								</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">
-										${construction.disclose.rodNumber}
+										${fns:unescapeHtml(construction.disclose.descriptionPlans)}
 								</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">
-										${construction.disclose.administrationType}
+										${fns:unescapeHtml(construction.disclose.descriptionAdjustment)}
 								</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">
+										${fns:unescapeHtml(construction.disclose.electricalAdjusted)}
 								</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">
-										${construction.disclose.precondition}
+										${fns:unescapeHtml(construction.disclose.adjustmentDescription)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right">自动化是否需要变更：</label></td>
 								<td class="width-35">
-										${construction.disclose.placementMode}
+										${fns:unescapeHtml(construction.disclose.doesChange)}
 								</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">
-										${construction.disclose.productionDate}
+										${fns:unescapeHtml(construction.disclose.automatedContent)}
 								</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">
-										${construction.disclose.integrateModule}
+										${fns:unescapeHtml(construction.disclose.automatedAdjustment)}
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
+
+								<td class="width-15 active"><label class="pull-right"> 其他方案是否需要调整：</label></td>
 								<td class="width-35">
-										${construction.disclose.needReplace}
+										${fns:unescapeHtml(construction.disclose.otherAdjusted)}
 								</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">
-										${construction.disclose.overallTransformation}
+										${fns:unescapeHtml(construction.disclose.descriptionReasons)}
 								</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;
-<%--									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="判断没有问题" />--%>
 								</div>
 							</div>
 						</div>

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

@@ -1,125 +1,304 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-	<title>配网运行人员判断变更后材料</title>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<meta name="decorator" content="ani"/>
-	<%@ include file="/webpage/include/bootstraptable.jsp"%>
-	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="operatorUploadList.js" %>
-	<script type="text/javascript">
-
-		$(document).ready(function() {
-			$("#agree").click(function () {
-				var currentFileValues = $("input[name='pic']").val();
-					jp.prompt("审核意见", function (message) {
-						jp.post("${ctx}/act/task/operatorUpload",
-						{
-							"taskId":"${uploadImages.act.taskId}",
-							"taskName":"${uploadImages.act.taskName}",
-							"taskDefKey":"${uploadImages.act.taskDefKey}",
-							"procInsId":"${uploadImages.act.procInsId}",
-							"procDefId":"${uploadImages.act.procDefId}",
-							"flag":"yes",
-							"pic":currentFileValues,
-							"comment":window.encodeURI(message)
-						},
-						function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								jp.go("${ctx}/act/task/todo")
-							}
-						})
-					});
-				// alert(design);
-			});
-			$("#no").click(function () {
-				var currentFileValues = $("input[name='pic']").val();
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/operatorUpload",
-						{
-							"taskId":"${uploadImages.act.taskId}",
-							"taskName":"${uploadImages.act.taskName}",
-							"taskDefKey":"${uploadImages.act.taskDefKey}",
-							"procInsId":"${uploadImages.act.procInsId}",
-							"procDefId":"${uploadImages.act.procDefId}",
-							"flag":"no",
-							"pic":currentFileValues,
-							"comment":window.encodeURI(message)
-						},
-						function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								jp.go("${ctx}/act/task/todo")
-							}
-						})
-				});
-			});
-		});
-	</script>
+    <title>设计单位人员重新设计</title>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="decorator" content="ani"/>
+    <%@ include file="/webpage/include/bootstraptable.jsp" %>
+    <%@include file="economicsDesignChange.js" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                var currentFileValues = $("input[name='pic']").val();
+                if (currentFileValues == '' || currentFileValues == null) {
+                    jp.error("请上传文件");
+                    return false;
+                }
+                jp.prompt("审核意见", function (message) {
+                    jp.post("${ctx}/act/task/operatorUpload",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "path": currentFileValues,
+                            "reserveProjectName": "${construction.reserveProjectName}",
+                            "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="panel panel-primary">
-	<div class="panel-heading">
-		<h3 class="panel-title">配网运行人员判断变更后材料</h3>
-	</div>
-	<div class="panel-body">
-	
-	<!-- 搜索 -->
-	<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}"/>
-	</form:form>
-	</div>
-	</div>
-
-	<!-- 工具栏 -->
-	<div id="toolbar">
-
-		    </div>
-		
-	<!-- 表格 -->
-	<table id="testPicTable"   data-toolbar="#toolbar"></table>
-		<div class="panel-body">
-			<form:form id="inputForm" modelAttribute="uploadImages" 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"/>
-				<div class="form-group">
-					<div class="col-lg-3"></div>
-					<div class="col-lg-6">
-						<div class="form-group text-center">
-						</div>
-					</div>
-				</div>
-			</form:form>
+<div class="wrapper wrapper-content">
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">设计单位人员重新设计</h3>
+        </div>
+        <div class="panel-body">
+            <!-- 表格 -->
+            <table id="testPicTable" data-toolbar="#toolbar"></table>
+            <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">
+                                <sys:fileUpload path="pic" fileNumLimit="50" fileSizeLimit="50"
+                                                value="${testPic.pic}" type="file"
+                                                uploadPath="list"></sys:fileUpload>
+                            </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>
+                        </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;
+                        </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 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 uploadImages.id}">
-				<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
-				<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
-			</c:if>
-		</div>
-    <!-- context menu -->
-    <ul id="context-menu" class="dropdown-menu">
-    </ul>  
-	</div>
-	</div>
-	</div>
+        </div>
+    </div>
+</div>
 </body>
 </html>

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

@@ -1,335 +1,338 @@
 <%@ 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="sealForm.js"%>
-	<script type="text/javascript">
-		$(document).ready(function () {
-			$("#agree").click(function () {
-                var pic = $("#pic").val();
-				if (pic==""||pic==null){
-				    jp.error("请上传收据");
-				    return;
-				}
-                var currentFileValues = $("input[name='pic']").val();
-                jp.prompt("审核通过", function (message) {
-                    jp.post("${ctx}/act/task/receiptTask",
+    <title>配网运行人员判定是否关闭</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt("审核变更或关闭", function (message) {
+                    jp.post("${ctx}/act/task/receiptForm",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"pic":currentFileValues,
-                            "flag": "yes",
+                            "flag": "pass",
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
-                            if(data.success){
+                            if (data.success) {
                                 jp.success(data.msg);
                                 jp.go("${ctx}/act/task/todo")
                             }
-                        })
-                })
-			});
-
-			$("#no").click(function () {
-				jp.prompt("驳回", function (message) {
-					jp.post("${ctx}/act/task/receiptTask",
-							{
-								"taskId": "${construction.act.taskId}",
-								"taskName": "${construction.act.taskName}",
-								"taskDefKey": "${construction.act.taskDefKey}",
-								"procInsId": "${construction.act.procInsId}",
-								"procDefId": "${construction.act.procDefId}",
-								"flag": "no",
-								"comment": window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				})
-			});
-		})
-	</script>
+                        }
+                    );
+                });
+            });
+            $("#no").click(function () {
+                jp.prompt("驳回", function (message) {
+                    jp.post("${ctx}/act/task/receiptForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "return",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        }
+                    );
+                });
+            });
+            $("#determine").click(function () {
+                jp.prompt("确认关闭", function (message) {
+                    jp.post("${ctx}/act/task/receiptForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "determine",
+                            "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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<div style="margin: 0px 25px 0px 25px">
-					<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				</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 type="hidden" id="procInsId" name="procInsId" value="${construction.act.procInsId}"/>
-						<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.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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right">上传收据：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
-								<td class="width-35">
-										${construction.disclose.channel}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备基础是否可以扩容：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.sceneSize}
-								</td>
-								<td class="width-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacitySize}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
-								<td class="width-35">
-										${construction.disclose.hiddenDanger}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
-								<td class="width-35">
-										${construction.disclose.influenceConstruction}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
-								<td class="width-35">
-										${construction.disclose.projectRepetition}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
-								<td class="width-35">
-										${construction.disclose.implemented}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
-								<td class="width-35">
-										${construction.disclose.transformer}
-								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.explanationOfNecessity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.lineName}
-								</td>
-								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
-								<td class="width-35">
-										${construction.disclose.quantities}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.rodNumber}
-								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.inconsistentDescription}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-								<td class="width-35">
-										${construction.disclose.administrationType}
-								</td>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
-								<td class="width-35">
-										${construction.disclose.precondition}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.policyHandlingInstructions}
-								</td>
-								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
-								<td class="width-35">
-										${construction.disclose.placementMode}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
-								<td class="width-35">
-										${construction.disclose.productionDate}
-								</td>
-								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
-								<td class="width-35">
-										${construction.disclose.integrateModule}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
-								<td class="width-35">
-										${construction.disclose.needReplace}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
-								<td class="width-35">
-										${construction.disclose.overallTransformation}
-								</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-danger btn-lg btn-parsley" type="submit" value="驳回" />
-								</div>
-							</div>
-						</div>
+    <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 style="margin: 0px 25px 0px 25px">
+                    <table id="testPicTable" data-toolbar="#toolbar"></table>
+                </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>
+                            </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="determine" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="确认关闭"/>
+                                <input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回"/>
+                            </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/sealForm.js

@@ -1,229 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-<script>
-$(document).ready(function() {
-	var procInsId = $("#procInsId").val();
-	// alert(procInsId);
-	$('#testPicTable').bootstrapTable({
-		  //请求方法
-               method: 'post',
-               //类型json
-               dataType: "json",
-               contentType: "application/x-www-form-urlencoded",
-               //显示检索按钮
-	           showSearch: false,
-               //显示刷新按钮
-               showRefresh: true,
-               //显示切换手机试图按钮
-               showToggle: true,
-               //显示 内容列下拉框
-    	       showColumns: true,
-    	       //显示到处按钮
-    	       showExport: true,
-    	       //显示切换分页按钮
-    	       showPaginationSwitch: false,
-    	       //最低显示2行
-    	       minimumCountColumns: 2,
-               //是否显示行间隔色
-               striped: true,
-               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
-               cache: false,    
-               //是否显示分页（*）  
-               pagination: false,
-                //排序方式 
-               sortOrder: "asc",  
-               //初始化加载第一页，默认第一页
-               pageNumber:1,   
-               //每页的记录行数（*）   
-               pageSize: 10,  
-               //可供选择的每页的行数（*）    
-               pageList: [10, 25, 50, 100],
-               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/managementcenter/upload/data?procInsId="+procInsId,
-               //默认值为 '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){
-                   if($el.data("item") == "edit"){
-                   		edit(row.id);
-                   }else if($el.data("item") == "view"){
-                       view(row.id);
-                   } else if($el.data("item") == "delete"){
-                        jp.confirm('确认要删除该图片管理记录吗？', function(){
-                       	jp.loading();
-                       	jp.get("${ctx}/test/pic/testPic/delete?id="+row.id, function(data){
-                   	  		if(data.success){
-                   	  			$('#testPicTable').bootstrapTable('refresh');
-                   	  			jp.success(data.msg);
-                   	  		}else{
-                   	  			jp.error(data.msg);
-                   	  		}
-                   	  	})
-                   	   
-                   	});
-                      
-                   } 
-               },
-              
-               onClickRow: function(row, $el){
-               },
-               	onShowSearch: function () {
-			$("#search-collapse").slideToggle();
-		},
-               columns: [{
-		        field: 'path',
-		        title: '图片路径',
-		        sortable: false,
-		        sortName: 'path',
-		        formatter:function(value, row , index){
-		        	var valueArray = value.split("|");
-		        	var labelArray = [];
-		        	for(var i =0 ; i<valueArray.length; i++){
-		        		if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
-		        		{
-		        			labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
-		        		}else{
-		        			labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
-		        		}
-		        	}
-		        	return labelArray.join(" ");
-		        }
-		       
-		    },{
-				   field: 'imgName',
-				   title: '文件用途',
-				   sortable: true,
-				   sortName: 'imgName',
-			   },{
-				   field: 'uId',
-				   title: '上传人员',
-				   sortable: false,
-				   sortName: 'uId',
-			   }]
-		});
-		
-		  
-	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
-
-		 
-		  $('#testPicTable').bootstrapTable("toggleView");
-		}
-	  
-	  $('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
-                'check-all.bs.table uncheck-all.bs.table', function () {
-            $('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
-            $('#view,#edit').prop('disabled', $('#testPicTable').bootstrapTable('getSelections').length!=1);
-        });
-		  
-		$("#btnImport").click(function(){
-			jp.open({
-			    type: 2,
-                area: [500, 200],
-                auto: true,
-			    title:"导入数据",
-			    content: "${ctx}/tag/importExcel" ,
-			    btn: ['下载模板','确定', '关闭'],
-				    btn1: function(index, layero){
-					  jp.downloadFile('${ctx}/test/pic/testPic/import/template');
-				  },
-			    btn2: function(index, layero){
-				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-						iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/import', function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								refresh();
-							}else{
-								jp.error(data.msg);
-							}
-                            jp.close(index);
-                        });//调用保存事件
-                    return false;
-				  },
-				 
-				  btn3: function(index){ 
-					  jp.close(index);
-	    	       }
-			}); 
-		});
-		
-		
-	 $("#export").click(function(){//导出Excel文件
-			jp.downloadFile('${ctx}/test/pic/testPic/export');
-	  });
-
-		    
-	  $("#search").click("click", function() {// 绑定查询按扭
-		  $('#testPicTable').bootstrapTable('refresh');
-		});
-	 
-	 $("#reset").click("click", function() {// 绑定查询按扭
-		  $("#searchForm  input").val("");
-		  $("#searchForm  select").val("");
-		  $("#searchForm  .select-item").html("");
-		  $('#testPicTable').bootstrapTable('refresh');
-		});
-		
-		
-	});
-		
-  function getIdSelections() {
-        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
-        });
-    }
-  
-  function deleteAll(){
-
-		jp.confirm('确认要删除该图片管理记录吗？', function(){
-			jp.loading();  	
-			jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
-         	  		if(data.success){
-         	  			$('#testPicTable').bootstrapTable('refresh');
-         	  			jp.success(data.msg);
-         	  		}else{
-         	  			jp.error(data.msg);
-         	  		}
-         	  	})
-          	   
-		})
-  }
-
-    //刷新列表
-  function refresh(){
-  	$('#testPicTable').bootstrapTable('refresh');
-  }
-  
-   function add(){
-	  jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
-  }
-
-
-  
-   function edit(id){//没有权限时，不显示确定按钮
-       if(id == undefined){
-	      id = getIdSelections();
-	}
-	jp.openSaveDialog('编辑图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
-  }
-  
- function view(id){//没有权限时，不显示确定按钮
-      if(id == undefined){
-             id = getIdSelections();
-      }
-        jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
- }
-
-
-
-</script>

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

@@ -1,338 +1,313 @@
 <%@ 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="sealForm.js"%>
-	<script type="text/javascript">
-		$(document).ready(function () {
-			$("#agree").click(function () {
-                var pic = $("#pic").val();
-                if (pic==""||pic==null){
-                    jp.error("请上传已盖章施工方案");
-                    return;
-                }
-                var currentFileValues = $("input[name='pic']").val();
-				jp.prompt("审核通过", function (message) {
-					jp.post("${ctx}/act/task/sealTask",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"flag":"yes",
-						"pic":currentFileValues,
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
-			});
-			$("#no").click(function () {
-				jp.prompt("驳回", function (message) {
-					jp.post("${ctx}/act/task/sealTask",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"flag":"no",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
-			});
-		})
-	</script>
+    <title>配网工程专职判定是否关闭</title>
+    <meta name="decorator" content="ani"/>
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <%@include file="/webpage/include/bootstraptable.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
+                jp.prompt("审核通过", function (message) {
+                    jp.post("${ctx}/act/task/sealForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "yes",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                });
+            });
+            $("#no").click(function () {
+                jp.prompt("驳回", function (message) {
+                    jp.post("${ctx}/act/task/sealForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<div style="margin: 0px 25px 0px 25px">
-					<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				</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 type="hidden" id="procInsId" name="procInsId" value="${construction.act.procInsId}"/>
-						<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.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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right">上传已盖章施工方案：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
-								<td class="width-35">
-										${construction.disclose.channel}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备基础是否可以扩容：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.sceneSize}
-								</td>
-								<td class="width-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacitySize}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
-								<td class="width-35">
-										${construction.disclose.hiddenDanger}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
-								<td class="width-35">
-										${construction.disclose.influenceConstruction}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
-								<td class="width-35">
-										${construction.disclose.projectRepetition}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
-								<td class="width-35">
-										${construction.disclose.implemented}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
-								<td class="width-35">
-										${construction.disclose.transformer}
-								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.explanationOfNecessity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.lineName}
-								</td>
-								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
-								<td class="width-35">
-										${construction.disclose.quantities}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.rodNumber}
-								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.inconsistentDescription}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-								<td class="width-35">
-										${construction.disclose.administrationType}
-								</td>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
-								<td class="width-35">
-										${construction.disclose.precondition}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.policyHandlingInstructions}
-								</td>
-								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
-								<td class="width-35">
-										${construction.disclose.placementMode}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
-								<td class="width-35">
-										${construction.disclose.productionDate}
-								</td>
-								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
-								<td class="width-35">
-										${construction.disclose.integrateModule}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
-								<td class="width-35">
-										${construction.disclose.needReplace}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
-								<td class="width-35">
-										${construction.disclose.overallTransformation}
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</form:form>
+    <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>
 
-
-
-						<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="审核" />
-									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
-								</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>
+                                <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>
+                            </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="审核"/>
+                                <input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回"/>
+                            </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/singleForm.jsp

@@ -1,335 +1,317 @@
 <%@ 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="sealForm.js"%>
-	<script type="text/javascript">
-		$(document).ready(function () {
-			$("#agree").click(function () {
-                var pic = $("#pic").val();
-				if (pic==""||pic==null){
-				    jp.error("请上传收据");
-				    return;
-				}
-                var currentFileValues = $("input[name='pic']").val();
+    <title>配网工程专职判定变更或关闭</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#agree").click(function () {
                 jp.prompt("审核通过", function (message) {
-                    jp.post("${ctx}/act/task/singleTask",
+                    jp.post("${ctx}/act/task/singleForm",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"pic":currentFileValues,
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
-                            if(data.success){
+                            if (data.success) {
                                 jp.success(data.msg);
                                 jp.go("${ctx}/act/task/todo")
                             }
-                        })
+                        }
+                    )
                 })
-			});
-
-			$("#no").click(function () {
-				jp.prompt("驳回", function (message) {
-					jp.post("${ctx}/act/task/singleTask",
-							{
-								"taskId": "${construction.act.taskId}",
-								"taskName": "${construction.act.taskName}",
-								"taskDefKey": "${construction.act.taskDefKey}",
-								"procInsId": "${construction.act.procInsId}",
-								"procDefId": "${construction.act.procDefId}",
-								"flag": "no",
-								"comment": window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
-				})
-			});
-		})
-	</script>
+            });
+            $("#no").click(function () {
+                jp.prompt("驳回", function (message) {
+                    jp.post("${ctx}/act/task/singleForm",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "flag": "no",
+                            "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">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<div style="margin: 0px 25px 0px 25px">
-					<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				</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 type="hidden" id="procInsId" name="procInsId" value="${construction.act.procInsId}"/>
-						<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.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">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-								<td class="width-15 active"><label class="pull-right">上传缴费单：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">施工通道：</label></td>
-								<td class="width-35">
-										${construction.disclose.channel}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备基础是否可以扩容：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">现场设备尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.sceneSize}
-								</td>
-								<td class="width-15 active"><label class="pull-right">最多可扩容尺寸：</label></td>
-								<td class="width-35">
-										${construction.disclose.capacitySize}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">方案安全隐患：</label></td>
-								<td class="width-35">
-										${construction.disclose.hiddenDanger}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否存在低压或通信线等影响施工：</label></td>
-								<td class="width-35">
-										${construction.disclose.influenceConstruction}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">立项重复：</label></td>
-								<td class="width-35">
-										${construction.disclose.projectRepetition}
-								</td>
-								<td class="width-15 active"><label class="pull-right">是否已实施：</label></td>
-								<td class="width-35">
-										${construction.disclose.implemented}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">变压器无负荷：</label></td>
-								<td class="width-35">
-										${construction.disclose.transformer}
-								</td>
-								<td class="width-15 active"><label class="pull-right">必要性问题描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.explanationOfNecessity}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">线路名称一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.lineName}
-								</td>
-								<td class="width-15 active"><label class="pull-right">工程量是否一致：</label></td>
-								<td class="width-35">
-										${construction.disclose.quantities}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">设备、开关、杆号一致性：</label></td>
-								<td class="width-35">
-										${construction.disclose.rodNumber}
-								</td>
-								<td class="width-15 active"><label class="pull-right">图纸现场不一致描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.inconsistentDescription}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政处类型：</label></td>
-								<td class="width-35">
-										${construction.disclose.administrationType}
-								</td>
-								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
-								<td class="width-35">
-										${construction.disclose.precondition}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
-								<td class="width-35">
-										${construction.disclose.policyHandlingInstructions}
-								</td>
-								<td class="width-15 active"><label class="pull-right">DTU安放方式核查：</label></td>
-								<td class="width-35">
-										${construction.disclose.placementMode}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">核查环网柜生产日期：</label></td>
-								<td class="width-35">
-										${construction.disclose.productionDate}
-								</td>
-								<td class="width-15 active"><label class="pull-right">二次是否是集成模块：</label></td>
-								<td class="width-35">
-										${construction.disclose.integrateModule}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">PT是否需要更换：</label></td>
-								<td class="width-35">
-										${construction.disclose.needReplace}
-								</td>
-								<td class="width-15 active"><label class="pull-right">设备是否有整体改造的必要：</label></td>
-								<td class="width-35">
-										${construction.disclose.overallTransformation}
-								</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-danger btn-lg btn-parsley" type="submit" value="驳回" />
-								</div>
-							</div>
-						</div>
+    <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 style="margin: 0px 25px 0px 25px">
+                    <table id="testPicTable" data-toolbar="#toolbar"></table>
+                </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>
+                            </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-danger btn-lg btn-parsley" type="submit" value="驳回"/>
+                            </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>