Merge remote-tracking branch 'origin/master'

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

@@ -122,6 +122,8 @@ public class ActTaskService extends BaseService {
     private AdvanceService advanceService;
     @Autowired
     private OaNotifyService oaNotifyService;
+    @Autowired
+    private PickIngService pickIngService;
 
     /**
      * 获取待办任务列表
@@ -1756,7 +1758,7 @@ public class ActTaskService extends BaseService {
         // 对不同环节的业务逻辑进行操作
         String taskDefKey = act.getTaskDefKey();
         // 提交流程任务
-//        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
     }
 
     /**
@@ -2684,7 +2686,6 @@ public class ActTaskService extends BaseService {
         ShowList showList = new ShowList();
         showList.setAct(act);
         List<ShowList> newTemList = showListService.findNewTemList(showList);
-        PickIngService pickIngService = new PickIngService();
         pickIngService.processList(newTemList);
         Project wzUser = MyActiviUtils.findWZUser(act.getProcInsId());
         // 提交流程任务
@@ -2712,7 +2713,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);
@@ -2736,7 +2737,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getConstructionUnitLeader()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);
@@ -2763,7 +2764,7 @@ public class ActTaskService extends BaseService {
             showListService.updateManagerTime(act.getProcInsId());
         }
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? "" : loginName);
         complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
@@ -2786,7 +2787,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getDistributionMaterials()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);
@@ -2810,7 +2811,7 @@ public class ActTaskService extends BaseService {
         // 提交流程任务
         Map<String, Object> vars = Maps.newHashMap();
         vars.put("pass", "yes".equals(flag) ? true : false);
-        Project user = MyActiviUtils.findUser(act.getProcInsId());
+        Project user = MyActiviUtils.findWZUser(act.getProcInsId());
         String loginName = UserUtils.getByUserName(user.getManagementLeader()).getLoginName();
         String loginName1 = UserUtils.getByUserName(user.getProjectManageRole()).getLoginName();
         vars.put("manager", "yes".equals(flag) ? loginName : loginName1);

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

@@ -39,8 +39,10 @@ import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleServ
 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.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;
@@ -454,7 +456,9 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传新图纸");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -562,7 +566,9 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传借款单据");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -608,8 +614,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传未签字版政策处理清单");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("2");
+                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");
@@ -636,8 +644,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传签字版政策处理清单");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("3");
+                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");
@@ -663,8 +673,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传签字版合同");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("4");
+                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");
@@ -690,8 +702,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && !"".equals(pic)) {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
-                uploadImages.setImgName("新方案图纸");
+                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");
@@ -738,7 +752,7 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("变更后图纸");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setuId(UserUtils.getUser().getName());
                 uploadImagesService.insert(uploadImages);
             }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
@@ -1043,8 +1057,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传未盖章施工方案");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -1072,8 +1088,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传盖章施工方案");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -1120,8 +1138,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传收据");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -1149,8 +1169,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传缴费单");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -1174,8 +1196,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && !pic.equals("")) {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传借款单据");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                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");
@@ -1337,7 +1361,7 @@ public class ActTaskController extends BaseController {
                 a.preInsert();
                 a.setProcInsId(act.getProcInsId());
             }
-            pickIngService.processList(showLists);
+            pickIngService.delAllTem();
             pickIngService.processTemList(showLists);
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
@@ -1504,14 +1528,16 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "nonPowerStartTask")
-    public AjaxJson nonPowerStartTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson nonPowerStartTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("11");
+                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");
@@ -1529,14 +1555,16 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "electricalStartTask")
-    public AjaxJson electricalStartTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson electricalStartTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("14");
+                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");
@@ -1554,14 +1582,16 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "nonPowerMiddleTask")
-    public AjaxJson nonPowerMiddleTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson nonPowerMiddleTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("12");
+                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");
@@ -1579,14 +1609,18 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "electricalMiddleTask")
-    public AjaxJson electricalMiddleTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson electricalMiddleTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
+                Project project = MyActiviUtils.sgFindUser(act.getProcInsId());
+                project.getId();
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("15");
+                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");
@@ -1661,14 +1695,16 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "electricalEndTask")
-    public AjaxJson electricalEndTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson electricalEndTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("16");
+                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");
@@ -1724,14 +1760,16 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "nonPowerEndTask")
-    public AjaxJson nonPowerEndTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson nonPowerEndTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("13");
+                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");
@@ -1815,7 +1853,8 @@ public class ActTaskController extends BaseController {
             //根据项目信息查询计划开工日期
             String projectName = materialModuleService.findProjectName(procInsId);
             Date specificTime = materialModuleService.findSpecificTime(projectName);
-            String[] needUser = {imgName};
+            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);
@@ -1852,8 +1891,10 @@ public class ActTaskController extends BaseController {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName("上传涉电开工流程");
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("17");
+                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");
@@ -1871,14 +1912,16 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "PowerEndTask")
-    public AjaxJson PowerEndTask(Act act, String pic, String imgName, UploadImages uploadImages) {
+    public AjaxJson PowerEndTask(Act act, String pic, UploadImages uploadImages) {
         AjaxJson j = new AjaxJson();
         try {
             if (pic != null && pic != "") {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
-                uploadImages.setImgName(imgName);
-                uploadImages.setuId(UserUtils.getUser().getLoginName());
+                uploadImages.setImgName("18");
+                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");
@@ -1899,7 +1942,7 @@ public class ActTaskController extends BaseController {
     public AjaxJson PowerWhetherTask(Act act) {
         AjaxJson j = new AjaxJson();
         try {
-            //对项目现在二次涉电的时候
+            //对项目选择二次涉电的时候
             String flag = act.getFlag();
             if ("second".equals(flag)) {
                 //获取项目定义号，查询项目信息

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

@@ -1,13 +1,22 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 
 public class UploadImages extends ActEntity<UploadImages> {
+    //附近用途
     private String imgName;
+    //上传地址
     private String path;
+    //流程定义号
     private String procInsId;
     private String uId;
+    //项目名称
     private String projectName;
+    //项目id
+    private String projectId;
+
+    private Project project;
 
     public String getProjectName() {
         return projectName;
@@ -50,4 +59,20 @@ public class UploadImages extends ActEntity<UploadImages> {
     public void setuId(String uId) {
         this.uId = uId;
     }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Project getProject() {
+        return project;
+    }
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
 }

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

@@ -56,4 +56,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     void insertDisclose(Construction construction);
 
+    List<Construction> findDisclosePage(Construction construction);
+
 }

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

@@ -23,4 +23,12 @@ public interface UploadImagesMapper extends BaseMapper<UploadImages> {
     String findPathByProcInsID(String procInsId);
 
     String findProjectNameByProcInsId(String procInsId);
+
+    //施工交底流程
+    UploadImages findJdById(String procInsId);
+    //领料流程
+    UploadImages findWzById(String procInsId);
+    //施工验收流程
+    UploadImages findSgById(String procInsId);
+    //结算模块
 }

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

@@ -364,4 +364,37 @@
 		#{disclose.otherProblem}
 		);
 	</insert>
+
+	<select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
+		select a.project_id,
+		a.require_name,
+		channel,
+		b.requireName,
+		b.capacity,
+		b.sceneSize,
+		b.capacitySize,
+		b.hiddenDanger,
+		b.influenceConstruction,
+		b.projectRepetition,
+		b.implemented,
+		b.transformer,
+		b.lineName,
+		b.quantities,
+		b.rodNumber,
+		b.administrationType,
+		b.precondition,
+		b.placementMode,
+		b.productionDate,
+		b.IntegrateModule,
+		b.needReplace,
+		b.overallTransformation,
+		b.explanationOfNecessity,
+		b.inconsistentDescription,
+		b.policyHandlingInstructions,
+		b.otherProblem,
+		b.implementedContent
+		from xm_project_details  a
+		LEFT JOIN xm_disclose_conclusion b
+		on a.require_name = b.requireName
+	</select>
 </mapper>

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

@@ -14,9 +14,70 @@
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
+	</sql>
 
+	<sql id="projectColumns">
+	  	b.require_name AS "project.requireName",
+	  	b.project_id AS "project.projectId",
+	  	b.project_name AS "project.projectName",
+	  	b.project_number AS "project.projectNumber",
+		b.project_manage_role AS "project.projectManageRole",
+		b.distribution_engineering AS "project.distributionEngineering",
+		b.distribution_materials AS "project.distributionMaterials",
+		b.distribution_system AS "project.distributionSystem",
+		b.distribution_policy AS "project.distributionPolicy",
+		b.management_leader AS "project.managementLeader",
+		b.run_unit AS "project.runUnit",
+		b.run_unit_role AS "project.runUnitRole",
+		b.through_research_role AS "project.throughResearchRole",
+		b.construction_unit AS "project.constructionUnit",
+		b.construction_unit_role AS "project.constructionUnitRole",
+		b.construction_unit_manage AS "project.constructionUnitManage",
+		b.construction_unit_leader AS "project.constructionUnitLeader",
+    	b.design_unit AS "project.design_unit",
+		b.design_unit_manage AS "project.designUnitManage",
+		b.design_unit_leader AS "project.designUnitLeader",
+		b.clarificaiton_type AS "project.clarificaitonType",
+		b.build_classification_resons As "project.bulidClassificationResons",
+		b.bulbid_resons As "project.bulbidResons",
+		b.asic_equipment AS "project.asicEquipment",
+		b.run_the_class As "project.runTheClass",
+		b.project_team AS "project.projectTeam",
+		b.cost_estimate As "project.costEstimate",
+		b.whether_rhe_upwind AS "project.whetherRheUpwind",
+		b.sure_da_date AS "project.sureDaDate",
+		b.text_remark AS "project.textRemark",
+		b.power_line AS "project.powerLine",
+    	b.power_scope AS "project.powerScope",
+    	b.project_type AS "project.projectType",
+        b.power_flag_package AS "project.powerFlagPackage",
+     	b.preliminary_judgment AS "project.preliminaryJudgment",
+    	b.flag_civil_engineering AS "project.flagCivilEngineering",
+    	b.steel_tube_pole AS "project.steelTubePole",
+    	b.flag_approval_planning AS "project.flagApprovalPlanning",
+    	b.equ_create_type AS "project.equCreateType",
+    	b.equ_create_size AS "project.equCreateSize",
+    	b.flag_new_equ_name AS "project.flagNewEquName",
+    	b.include_bdz_news AS "project.includeBdzNews",
+    	b.flag_no_electrical AS "project.flagNoElectrical",
+		b.drawings_work AS "project.drawingsWork",
+    	b.flag_automation AS "project.flagAutomation",
+    	b.two_and_three_remote AS "project.twoAndThreeRemote",
+    	b.phone_style AS "project.phoneStyle",
+    	b.stay_open_area AS "project.stayOpenArea",
+    	b.ring_network_cabinet AS "project.ringNetworkCabinet",
+    	b.station_dtu AS "project.stationDtu",
+    	b.reserve_number AS "project.reserveNumber",
+    	b.run_unit_inspection_role AS "project.runUnitInspectionRole",
+    	b.construction_contract_unit AS "project.constructionContractUnit",
+    	b.construction_contract_rate AS "project.constructionContractRate",
+    	b.construction_contract_sub AS "project.constructionContractSub",
+    	b.construction_skill_by_full AS "project.constructionSkillByFull",
+    	b.automated_remarks AS "project.automatedRemarks",
+    	b.skill_by_full AS "project.skillByFull"
 	</sql>
 
+
 	<select id="get" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages" >
 		SELECT *
 		FROM xm_upolad_images a
@@ -24,16 +85,26 @@
 	</select>
 	
 	<select id="findList" resultType="UploadImages" >
-		SELECT a.*,b.project_name as projectName
-		FROM xm_upolad_images a,xm_construction_clarificaiton b
+		SELECT a.*,<include refid="projectColumns"/>
+		FROM xm_upolad_images a
+		LEFT JOIN xm_project_details b
+		on a.projectId = b.id
 		<where>
-			a.proc_ins_id=b.proc_ins_id
 			<if test="dataScope != null and dataScope != ''">
 				${dataScope}
 			</if>
 			<if test="uId != null and uId != ''">
 				AND a.uId = #{uId}
 			</if>
+			<if test="imgName!=null and imgName!=''">
+				AND a.imgName = #{imgName}
+			</if>
+			<if test="project.requireName != null and project.requireName != ''">
+				and b.require_name =#{project.requireName}
+			</if>
+			<if test="project.projectId != null and project.projectId != ''">
+				and b.project_id =#{project.projectId}
+			</if>
 			<if test="procInsId!=null and procInsId!=''">
 				and a.proc_ins_id = #{procInsId}
 			</if>
@@ -81,7 +152,8 @@
 			imgName,
 			path,
 			proc_ins_id,
-			uId
+			uId,
+			projectId
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -93,7 +165,8 @@
 			#{imgName},
 			#{path},
 			#{procInsId},
-			#{uId}
+			#{uId},
+			#{projectId}
 		)
 	</insert>
 	
@@ -127,4 +200,15 @@
 		select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId};
 	</select>
 	
+	<select id="findJdById" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages">
+		select require_name,project_id from xm_project_details where id = (select project_id from xm_construction_clarificaiton where proc_ins_id = #{procInsId})
+	</select>
+
+	<select id="findWzById" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages">
+		select require_name,project_id from xm_project_details where id = (select project_id from md_acquisition_process where proc_ins_id = #{procInsId})
+	</select>
+
+	<select id="findSgById" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages">
+		select require_name,project_id from xm_project_details where id = (select project_id from sg_construction_process where proc_ins_id = #{procInsId})
+	</select>
 </mapper>

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

@@ -43,6 +43,14 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 	public Page<Construction> findPage(Page<Construction> page, Construction construction) {
 		return super.findPage(page, construction);
 	}
+
+	public Page<Construction> findDisclosePage(Page<Construction> page, Construction construction) {
+		dataRuleFilter(construction);
+		construction.setPage(page);
+		page.setList(constructionMapper.findDisclosePage(construction));
+		return page;
+	}
+
 	
 	@Transactional(readOnly = false)
 	public void save(Construction construction) {

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

@@ -66,4 +66,19 @@ public class UploadImagesService extends CrudService<UploadImagesMapper, UploadI
 		return page;
 	}
 
+	//施工交底流程
+	public UploadImages findJdById(String procInsId) {
+		return uploadImagesMapper.findJdById(procInsId);
+	}
+
+	//领料流程
+	public UploadImages findWzById(String procInsId) {
+		return uploadImagesMapper.findWzById(procInsId);
+	}
+
+	//施工验收流程
+	public UploadImages findSgById(String procInsId) {
+		return uploadImagesMapper.findSgById(procInsId);
+	}
+
 }

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

@@ -1,9 +1,13 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
+import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 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;
@@ -14,12 +18,10 @@ public class EndTaskListen implements Serializable, ExecutionListener {
      */
     private static final long serialVersionUID = 8513750196548027535L;
 
-    @Autowired
-    private ProjectService projectService;
-
     @Override
     public void notify(DelegateExecution delegateExecution) throws Exception {
         try {
+            ProjectService projectService = SpringContextHolder.getBean(ProjectService.class);
             String processInstanceId = delegateExecution.getProcessInstanceId();
             projectService.updateStatusBy("2", processInstanceId);
         } catch (Exception e) {

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

@@ -226,7 +226,7 @@ public class MyImportUtils {
             }else {
                 //设计变更
                 if (null!=construction.getDisclose().getInconsistentDescription()){//图纸现场不一致说明
-                    if ("不一致".equals(construction.getDisclose().getLineName())||//线路名称一致性
+                    if ("否".equals(construction.getDisclose().getLineName())||//线路名称一致性
                             "否".equals(construction.getDisclose().getQuantities())||//工程量是否一致
                             !"".equals(construction.getDisclose().getImplementedContent())){//已实施内容描述不为空
                         model.addAttribute("pass_construction2","0");
@@ -347,13 +347,13 @@ public class MyImportUtils {
                 tips += "必要性问题说明不能为空;";
             }
         }
-        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"一致".equals(disclose.getLineName())&&!"不一致".equals(disclose.getLineName()))) {
+        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"是".equals(disclose.getLineName())&&!"否".equals(disclose.getLineName()))) {
             tips += "线路名称、设备、开关、杆号一致性填写有误;";
         }
         if ("".equals(disclose.getQuantities()) || disclose.getQuantities() == null||(!"是".equals(disclose.getQuantities())&&!"否".equals(disclose.getQuantities()))) {
             tips += "工程量是否一致填写有误;";
         }
-        if ("不一致".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())||"不一致".equals(disclose.getRodNumber())) {
+        if ("否".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())) {
             if ("".equals(disclose.getInconsistentDescription()) || disclose.getInconsistentDescription() == null) {
                 tips += "图纸现场不一致说明不能为空;";
             }

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

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
 import java.util.*;
 
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sys.entity.User;
@@ -27,6 +28,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 施工交底Controller
  *
@@ -81,11 +85,27 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 人工审核页面
+     * 项目交底结论信息列表
      * */
+    @RequestMapping(value = "discloseList")
+    public String disclose(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/discloseList";
+    }
+
     /**
-     * 查看，增加，编辑请假申请表单页面
-     */
+     * 项目交底结论信息数据
+     * */
+    @ResponseBody
+    @RequestMapping(value = "data")
+    public Map<String, Object> data(Construction uploadImages, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<Construction> page = constructionService.findDisclosePage(new Page<Construction>(request, response), uploadImages);
+        return getBootstrapData(page);
+    }
+
+    /**
+     * 人工审核页面
+     * */
     @RequestMapping(value = "artificial")
     public String form2(Construction construction, Model model) {
 //        String proId = construction.getAct().getProcDefId();
@@ -338,7 +358,7 @@ public class ConstructionController extends BaseController {
                         vars.put("processer", user.getLoginName());
                         String id = each.getId();
                         construction.setApplyName(constructionUnitRole);
-                        construction.setProjectId(each.getProjectNumber());
+                        construction.setProjectId(id);
                         construction.setProjectName(each.getRequireName());
                         construction.setAcceptDate(new Date());
                         constructionService.newSave(construction);//保存

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

@@ -16,6 +16,8 @@ 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.sys.entity.DictValue;
+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;
@@ -187,7 +189,6 @@ public class UploadController extends BaseController {
 		return "modules/sg/managementcenter/activiti/uploadListForm";
 	}
 
-
 	/**
 	 * 文件管理列表数据
 	 */
@@ -197,6 +198,7 @@ public class UploadController extends BaseController {
 		if (procInsId!=null&&procInsId!="") {
 			uploadImages.setProcInsId(procInsId);
 		}
+		//查询出所有的附件信息
 		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
 		//当判定系统为linux的时候
 		if (Global.SYS_TYPE.equals("2")) {
@@ -212,6 +214,8 @@ public class UploadController extends BaseController {
 				upload.setPath(a);
 			}
 		}
+		List<UploadImages> list = page.getList();
+		//循环list
 		return getBootstrapData(page);
 	}
 

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

@@ -99,7 +99,12 @@ public class PrivilegePreController extends BaseController {
 				privilegePreService.addPersonal(privilegePre);
 			} else {
 				String lpid = listUser.getPid();
-				lpid = lpid + ";" + privilegePre.getPid();
+				String[] split = pid.split(",");
+				String newPid = "";
+				for (int i = 0; i < split.length; i++) {
+					newPid += ";" + split[i];
+				}
+				lpid += newPid;
 				privilegePreService.updatePersonal(lpid, uid);
 			}
 			j.setMsg("取消权限成功");

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

@@ -3,6 +3,8 @@ 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;
@@ -62,6 +64,16 @@ public class Project extends DataEntity<Project> {
     private String textRemark;//备注
     private String powerLine;//停电线路
     private String powerScope;//停电范围
+    private List<String> powerScopeList;//停电范围拆分list
+
+    public List<String> getPowerScopeList() {
+        return powerScopeList;
+    }
+
+    public void setPowerScopeList(List<String> powerScopeList) {
+        this.powerScopeList = powerScopeList;
+    }
+
     private String projectType;//项目类型
     private String powerFlagPackage;//是否为停电打包项目
     private String preliminaryJudgment;//证处初步判断

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

@@ -638,7 +638,8 @@
 
 	<select id="findUser"  resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
 		select
-			demand_unit
+			id
+			,demand_unit
 			,project_manage_role
 			,distribution_engineering
 			,distribution_materials
@@ -661,7 +662,8 @@
 
 	<select id="findWZUser"  resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
 		select
-			demand_unit
+			id
+			,demand_unit
 			,project_manage_role
 			,distribution_engineering
 			,distribution_materials
@@ -684,7 +686,8 @@
 
 	<select id="sgFindUser"  resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
 		select
-			demand_unit
+			id
+			,demand_unit
 			,project_manage_role
 			,distribution_engineering
 			,distribution_materials

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

@@ -306,9 +306,12 @@ public  class ProExcelInfo {
             if (null==project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
                 str+="停电范围不能为空;";
             }else {
-                flag = getJudge(project.getPowerScope(), PRO_POWERSCOPE);
-                if (flag){
-                    str+="停单范围填写有误;";
+                String[] split = project.getPowerScope().split(";");
+                for (int i = 0; i <split.length; i++) {
+                    flag = getJudge(split[i], PRO_POWERSCOPE);
+                    if (flag){
+                        str+="停单范围填写有误;";
+                    }
                 }
             }
             if (null==project.getProjectType()||"".equals(project.getProjectType())){//项目类型

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

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.managementcenter.project.web;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -142,7 +143,7 @@ public class ProjectController extends BaseController {
 		project.setStatus("2");
 		project.setWhetherCloseStatus("0");
 		project.setEarlyMaterial(1);
-		project.setConstructionUnitRole(UserUtils.getUser().getLoginName());
+		project.setConstructionUnitManage(UserUtils.getUser().getLoginName());
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
 		return getBootstrapData(page);
 	}
@@ -191,6 +192,15 @@ public class ProjectController extends BaseController {
 	@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Project project, Model model) {
+		String powerScope = project.getPowerScope();
+		if (null != powerScope) {
+			List<String> newList = new ArrayList<>();
+			String[] split = powerScope.split(";");
+			for (int i = 0; i < split.length; i++) {
+				newList.add(split[i]);
+			}
+			project.setPowerScopeList(newList);
+		}
 		model.addAttribute("project", project);
 		if (null != project.getId()){
 			if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
@@ -226,6 +236,12 @@ public class ProjectController extends BaseController {
 		}
 		List<String> users = projectService.findAllUser();
 		List<Project> arrayLists = new ArrayList<Project>();
+		List<String> powerScopeList = project.getPowerScopeList();
+		String b = "";
+		for (String a : powerScopeList) {
+			b += a + ";";
+		}
+		project.setPowerScope(b);
 		arrayLists.add(project);
 		String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
 		if (!"".equals(judgeValue)){
@@ -233,6 +249,11 @@ public class ProjectController extends BaseController {
 			j.setMsg("失败："+judgeValue+"数据不符合规范！");
 			return j;
 		}
+		project.setStatus("0");
+		project.setPreConstruction(0);
+		project.setAcquisitionStatus("0");
+		project.setConstructionStatus("0");
+		project.setEarlyMaterial(0);
 		projectService.save(project);
 		j.setSuccess(true);
 		j.setMsg("保存成功");

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

@@ -1,9 +1,6 @@
 package com.jeeplus.modules.sg.materialmodule.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
-import io.swagger.models.auth.In;
-import sun.plugin.viewer.context.IExplorerAppletContext;
-
 import java.util.Date;
 
 public class MaterialModule extends ActEntity<MaterialModule> {

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

@@ -34,6 +34,8 @@ public interface PickIngMapper extends BaseMapper<PickIng> {
 
     void updateSelectVersion(String version);
 
+    void delAllTem();
+
     /**
      * 插入领料清单
      * */

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

@@ -118,6 +118,10 @@
 	<update id="updateSelectVersion">
 		UPDATE sys_dict_value set `value` = #{version} where id = '1010101010'
 	</update>
+
+	<delete id="delAllTem">
+		TRUNCATE md_temporary_list
+	</delete>
 	
 	<insert id="processList">
 		insert into md_process_list (

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

@@ -33,11 +33,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class PickIngService extends CrudService<PickIngMapper, PickIng> {
-	@Autowired
-	private PickIngMapper pickIngMapper;
+
 	@Autowired
 	private HttpServletRequest request;
 
+	@Autowired
+	private PickIngMapper pickIngMapper;
 
 	@Override
 	public Page<PickIng> findPage(Page<PickIng> page, PickIng entity) {
@@ -169,6 +170,14 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	}
 
 	/**
+	 * 清空所有临时表的数据
+	 * */
+	@Transactional(readOnly = false)
+	public void delAllTem() {
+		pickIngMapper.delAllTem();
+	}
+
+	/**
 	 * 插入临时领料清单
 	 * */
 	@Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.jeeplus.common.utils.*;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.oa.entity.OaNotifyMaterial;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -68,6 +69,7 @@ public class LoginController extends BaseController{
 
 	@Autowired
 	private ActTaskService actTaskService;
+
 	
 	
 	/**
@@ -382,6 +384,13 @@ public class LoginController extends BaseController{
            actlist.add(act1);
 		}
 		model.addAttribute("actlist",actlist);
+		//根据人员查询通知
+		OaNotify oaNotify = new OaNotify();
+		oaNotify.setSelf(true);
+		oaNotify.setReadFlag("0");
+		Page<OaNotify> oaPage = oaNotifyService.find(new Page<OaNotify>(request, response), oaNotify);
+		List<OaNotify> list1 = oaPage.getList();
+		request.setAttribute("list1", list1);
 		model.addAttribute("actCount",page.getCount());
 		return "modules/sys/login/sysHome";
 		

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -135,6 +135,20 @@ public class UserController extends BaseController {
         return "modules/sys/user/userForm";
     }
 
+    @RequiresPermissions(value = {"sys:user:view", "sys:user:add", "sys:user:edit"}, logical = Logical.OR)
+    @RequestMapping(value = "form1")
+    public String form1(User user, Model model) {
+        if (user.getCompany() == null || user.getCompany().getId() == null) {
+            user.setCompany(UserUtils.getUser().getCompany());
+        }
+        if (user.getOffice() == null || user.getOffice().getId() == null) {
+            user.setOffice(UserUtils.getUser().getOffice());
+        }
+        model.addAttribute("user", user);
+        model.addAttribute("allRoles", systemService.findRole(new Role()));
+        return "modules/sys/user/userForm1";
+    }
+
     @RequiresPermissions(value = {"sys:user:add", "sys:user:edit"}, logical = Logical.OR)
     @ResponseBody
     @RequestMapping(value = "save")
@@ -375,10 +389,9 @@ public class UserController extends BaseController {
     @RequiresPermissions(value = {"sys:user:add", "sys:user:edit"}, logical = Logical.OR)
     @RequestMapping(value = "checkName")
     public String checkName(String name) {
-        System.out.println(UserUtils.getByUserName(name));
         if (name != null ) {
             User byUserName = UserUtils.getByUserName(name);
-            if (null!=byUserName.getId()){
+            if (null==byUserName.getId()){
                 return "true";
             }
         }

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

@@ -79,27 +79,7 @@ $(document).ready(function() {
 		onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-		columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+		columns: [{
 			field: 'path',
 			title: '图片路径',
 			sortable: true,

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

@@ -0,0 +1,375 @@
+<%@ 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}/managementcenter/activiti/data",
+               //默认值为 '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: [{
+                       field: 'projectNumber',
+                       title: '工程定义号',
+                       width:120
+
+                   }
+                   ,{
+                       field: 'projectId',
+                       title: '工程编号',
+                       width:110
+
+                   }
+                   ,{
+                       field: 'projectName',
+                       title: '项目名称',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.requireName',
+                       title: '需求项目名称',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.channel',
+                       title: '施工通道',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.capacity',
+                       title: '设备基础是否可以扩容',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.sceneSize',
+                       title: '现场设备尺寸',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.capacitySize',
+                       title: '最多可扩容尺寸',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.hiddenDanger',
+                       title: '方案安全隐患',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.influenceConstruction',
+                       title: '是否存在低压或通信线等影响施工',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.projectRepetition',
+                       title: '立项重复',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.implemented',
+                       title: '是否已实施',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.transformer',
+                       title: '变压器无负荷',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.explanationOfNecessity',
+                       title: '必要性问题说明',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.lineName',
+                       title: '线路名称一致性',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.quantities',
+                       title: '工程量是否一致',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.rodNumber',
+                       title: '设备、开关、杆号一致性',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.inconsistentDescription',
+                       title: '图纸现场不一致说明',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.administrationType',
+                       title: '政处类型',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.precondition',
+                       title: '前置条件',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.policyHandlingInstructions',
+                       title: '政策处理说明',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.placementMode',
+                       title: 'DTU安放方式核查',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.productionDate',
+                       title: '核查环网柜生产日期',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.IntegrateModule',
+                       title: '二次是否是集成模块',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.needReplace',
+                       title: 'PT是否需要更换',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.overallTransformation',
+                       title: '设备是否有整体改造的必要',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.otherProblem',
+                       title: '其它问题描述',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.implementedContent',
+                       title: '已实施内容描述',
+                       width:110
+                   }
+		     ]
+		
+		});
+		
+		  
+	  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/managementcenter/project/import', 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');
+	  });
+    // $("#export1").click(function(){//导出Excel文件
+    //     jp.downloadFile('${ctx}/sg/managementcenter/project/export1');
+    // });
+
+		    
+	  $("#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 deleteAll(){
+
+		jp.confirm('确认要删除该项目管理表单记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/sg/managementcenter/project/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#projectTable').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  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/form?id=" + id, '800px', '500px');
+  }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+             id = getIdSelections();
+      }
+        jp.openViewDialog('查看项目管理表单', "${ctx}/sg/managementcenter/project/form?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

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

@@ -0,0 +1,57 @@
+<%@ 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="discloseList.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="construction" 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="disclose.requireName" 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>
+
+	<!-- 表格 -->
+	<table id="projectTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    	<shiro:hasPermission name="sg:managementcenter:project:view">
+        <li data-item="view"><a>查看</a></li>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="sg:managementcenter:project:edit">
+        <li data-item="edit"><a>编辑</a></li>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="sg:managementcenter:project:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

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

@@ -82,27 +82,7 @@ $(document).ready(function() {
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,

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

@@ -80,27 +80,7 @@ $(document).ready(function() {
 		onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-		columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+		columns: [{
 			field: 'path',
 			title: '图片路径',
 			sortable: true,

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

@@ -81,27 +81,7 @@ $(document).ready(function() {
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+               columns: [{
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: false,
@@ -121,6 +101,11 @@ $(document).ready(function() {
 		        }
 		       
 		    },{
+				   field: 'imgName',
+				   title: '文件用途',
+				   sortable: true,
+				   sortName: 'imgName',
+			   },{
 				   field: 'uId',
 				   title: '上传人员',
 				   sortable: false,

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

@@ -83,42 +83,49 @@ $(document).ready(function() {
                columns: [
 				   {
 					checkbox: true
-					},
+					}
+					, {
+					   field: 'path',
+					   title: '附件',
+					   sortable: true,
+					   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: 'project.projectName',
+					   title: '项目名称',
+					   sortable: true,
+					   sortName: 'projectName',
+				   },{
+					   field: 'project.projectId',
+					   title: '流程定义号',
+					   sortable: true,
+					   sortName: 'projectId',
+				   },
 				   {
-		        field: 'path',
-		        title: '图片路径',
-		        sortable: true,
-		        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: 'uId',
-				   title: '上传人员',
-				   sortable: true,
-				   sortName: 'uId',
-			   },{
 					   field: 'imgName',
 					   title: '文件用途',
 					   sortable: true,
 					   sortName: 'imgName',
-				   },{
-					   field: 'projectName',
-					   title: '项目名称',
-					   sortable: true,
-					   sortName: 'procInsId',
-				   }
+				   },
+				  {
+				   field: 'uId',
+				   title: '上传人员',
+				   sortable: true,
+				   sortName: 'uId',
+			   }
 				   ]
 		});
 		

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

@@ -1,8 +1,9 @@
+<%@ taglib prefix="for" uri="http://www.springframework.org/tags/form" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>图片管理管理</title>
+	<title>文件管理列表</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
@@ -23,6 +24,21 @@
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
 		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
 		<input type="hidden" id="path" name="path" value="${uploadImages.path}">
+		<div class="col-sm-4">
+			<label class="label-item single-overflow pull-left" title="文件用途：">文件用途：</label>
+			<form:select path="imgName"  class="form-control m-b">
+				<form:option value="" label=""/>
+				<form:options items="${fns:getDictList('uploadFileType')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+			</form:select>
+		</div>
+		<div class="col-sm-4">
+			<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+			<form:input path="project.requireName" cssClass="form-control" htmlEscape="false"/>
+		</div>
+		<div class="col-sm-4">
+			<label class="label-item single-overflow pull-left" title="项目定义号：">项目定义号：</label>
+			<form:input path="project.projectId" cssClass="form-control" htmlEscape="false"/>
+		</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>
@@ -35,12 +51,16 @@
 
 		<!-- 工具栏 -->
 		<div id="toolbar">
+			<shiro:hasPermission name="managementcenter:activiti:uploadEdit">
 				<button id="edit" class="btn btn-success" disabled onclick="edit()">
-					<i class="glyphicon glyphicon-edit"></i> 修改
+						<i class="glyphicon glyphicon-edit"></i> 修改
 				</button>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="managementcenter:activiti:uploadDel">
 				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
 					<i class="glyphicon glyphicon-remove"></i> 删除
 				</button>
+			</shiro:hasPermission>
 		</div>
 	<!-- 表格 -->
 	<table id="testPicTable"   data-toolbar="#toolbar"></table>

src/main/webapp/webpage/modules/sg/managementcenter/privilege/allProcDef.jsp

@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">用户列表</h3>
+		<h3 class="panel-title">权限列表</h3>
 	</div>
 	<div class="panel-body">
 	<div class="row">

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -14,6 +14,8 @@
 	        $('#endDate').datetimepicker({
 				 format: "YYYY-MM-DD HH:mm:ss"
 		    });
+
+
 		});
 		function save() {
             var isValidate = jp.validateForm('#inputForm');//校验表单
@@ -35,6 +37,9 @@
 			}
 
         }
+		function noFue(val){
+			document.getElementById('constructionContractRate').value = val >= 0 ? val : 0;
+		}
 	</script>
 </head>
 <body class="bg-white">
@@ -137,12 +142,18 @@
 							<form:option value="配电工区"/>
 						</form:select>
 					</td>
-					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位角色：</label></td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位储备专职 ：</label></td>
 					<td class="width-35">
 						<form:input path="runUnitRole" htmlEscape="false" class="form-control required"/>
 					</td>
 				</tr>
 				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位运检专职：</label></td>
+					<td class="width-35">
+						<form:input path="runUnitInspectionRole"   htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>经研所角色：</label></td>
 					<td class="width-35">
 						<form:input path="throughResearchRole"   htmlEscape="false" class="form-control required"/>
@@ -155,7 +166,7 @@
 				<tr>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工合同率：</label></td>
 					<td class="width-35">
-						<form:input path="constructionContractRate"  htmlEscape="false" class="form-control required"/>
+						<form:input type="number" onblur="noFue(this.value)" path="constructionContractRate"  htmlEscape="false" class="form-control required"/>
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>施工分包单位：</label></td>
 					<td class="width-35">
@@ -262,14 +273,16 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
-						<form:select  path="powerScope" cssClass="form-control">
+<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
+						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
+<%--						<form:select  path="powerScope" cssClass="form-control">
 							<form:option value="670"/>
 							<form:option value="67001+"/>
 							<form:option value="67002+"/>
 							<form:option value="67002-"/>
 							<form:option value="67003-"/>
-							<form:option value="68101-"/>
-						</form:select>
+								<form:option value="68101-"/>
+						</form:select>--%>
 					</td>
 				</tr>
 				<tr>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm1.jsp

@@ -249,14 +249,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
-						<form:select  path="powerScope" cssClass="form-control">
-							<form:option value="670"/>
-							<form:option value="67001+"/>
-							<form:option value="67002+"/>
-							<form:option value="67002-"/>
-							<form:option value="67003-"/>
-							<form:option value="68101-"/>
-						</form:select>
+						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
+<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
 					</td>
 				</tr>
 				<tr>

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

@@ -41,12 +41,6 @@
 							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/materialModule"></sys:fileUpload>
 						</td>
 					</tr>
-					<tr>
-						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
-						<td class="width-35">
-							<input id="imgName" type="text" class="form-control required">
-						</td>
-					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -41,12 +41,6 @@
 							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/materialModule"></sys:fileUpload>
 						</td>
 					</tr>
-					<tr>
-						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
-						<td class="width-35">
-							<input id="imgName" type="text" class="form-control required">
-						</td>
-					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -41,12 +41,6 @@
 							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/materialModule"></sys:fileUpload>
 						</td>
 					</tr>
-					<tr>
-						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
-						<td class="width-35">
-							<input id="imgName" type="text" class="form-control required">
-						</td>
-					</tr>
 					</tbody>
 				</table>
 			</form:form>

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

@@ -41,12 +41,6 @@
 							<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/materialModule"></sys:fileUpload>
 						</td>
 					</tr>
-					<tr>
-						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>填写信息：</label></td>
-						<td class="width-35">
-							<input id="imgName" type="text" class="form-control required">
-						</td>
-					</tr>
 					</tbody>
 				</table>
 			</form:form>

src/main/webapp/webpage/modules/sys/login/sysHome.jsp

@@ -20,125 +20,9 @@
 <div id="body-container" class="wrapper wrapper-content">
 	<div class="conter-wrapper home-container">
 		<div class="row home-row">
-			<div class="col-md-4 col-lg-3">
-				<div class="home-stats">
-					<a href="#" class="stat hvr-wobble-horizontal">
-						<div class=" stat-icon">
-							<i class="fa fa-cloud-upload fa-4x text-info "></i>
-						</div>
-						<div class=" stat-label">
-							<div class="label-header">
-								88%
-							</div>
-							<div class="progress-sm progress ng-isolate-scope" value="progressValue" type="info">
-								<div class="progress-bar progress-bar-info" role="progressbar"
-									 aria-valuenow="88" aria-valuemin="0" aria-valuemax="100"  style="width: 88%;">
-								</div>
-							</div>
-							<div class="clearfix stat-detail">
-								<div class="label-body">
-									<i class="fa fa-arrow-circle-o-right pull-right text-muted"></i>服务正常运行时间
-								</div>
-							</div>
-						</div>
-					</a>					<a href="#" class="stat hvr-wobble-horizontal">
-					<div class=" stat-icon">
-						<i class="fa fa-heartbeat fa-4x text-success "></i>
-					</div>
-					<div class=" stat-label">
-						<div class="label-header">
-							94%
-						</div>
-						<div class="progress-sm progress ng-isolate-scope" value="progressValue" type="info">
-							<div class="progress-bar progress-bar-success" role="progressbar"
-								 aria-valuenow="94" aria-valuemin="0" aria-valuemax="100"  style="width: 94%;">
-							</div>
-						</div>
-						<div class="clearfix stat-detail">
-							<div class="label-body">
-								<i class="fa fa-arrow-circle-o-right pull-right text-muted"></i>积极反馈
-							</div>
-						</div>
-					</div>
-				</a>					<a href="#" class="stat hvr-wobble-horizontal">
-					<div class=" stat-icon">
-						<i class="fa fa-flag fa-4x text-danger "></i>
-					</div>
-					<div class=" stat-label">
-						<div class="label-header">
-							88%
-						</div>
-						<div class="progress-sm progress ng-isolate-scope" value="progressValue" type="info">
-							<div class="progress-bar progress-bar-danger" role="progressbar"
-								 aria-valuenow="88" aria-valuemin="0" aria-valuemax="100"  style="width: 88%;">
-							</div>
-						</div>
-						<div class="clearfix stat-detail">
-							<div class="label-body">
-								<i class="fa fa-arrow-circle-o-right pull-right text-muted"></i>机器负载
-							</div>
-						</div>
-					</div>
-				</a>
-				</div>
-			</div>
-			<div class="col-md-4 col-lg-6">
-				<div class="home-charts-middle">
-					<div class="chart-container">
-						<div class="chart-comment clearfix">
-							<div class="text-primary pull-left">
-								<span class="comment-header">55%</span><br />
-								<span class="comment-comment">搜素引擎</span>
-							</div>
-							<div class="text-success pull-left m-l">
-								<span class="comment-header">25%</span><br />
-								<span class="comment-comment">自主访问</span>
-							</div>
-							<div class="text-warning pull-left m-l">
-								<span class="comment-header">20%</span><br />
-								<span class="comment-comment">友情链接</span>
-							</div>
-						</div>
-						<div id="lineChart" style="height:250px"></div>
-					</div>
-				</div>
-			</div>
-			<div class="col-md-4 col-lg-3">
-				<div class="home-charts-right">
-					
-					<div class="bottom-right-chart">
-						<div class="chart-container box clearfix">
-							<div class="row">
-								<div class="col-sm-3 text-left">
-									<div class="padder">
-										<span class="heading">本周访问人数 : </span><br />
-										<big class="text-primary">22068</big>
-									</div>
-								</div>
-								<div class="col-sm-6">
-									<div id="pie"  style="height: 298px;padding-top: 8px;max-height: 298px;position: relative;"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
 		<div class="row home-row">
-			<div class="col-lg-8 col-md-6">
-				<div class="map-container box padder">
-					<!-- <div id="world-map" style="width: 100%; height: 320px"></div> -->
-					<div class="top-right-chart row">
-								
-								<div class="col-sm-12">
-									<span class="heading">销售业绩 </span><br />
-									<div id="cbar" style="height: 298px; padding-top:7px;"></div>
-								</div>
-					</div>
-				</div>
-			</div>
 			<div class="col-lg-4 col-md-6">
-				<div class="todo-container panel panel-danger">
+				<div class="todo-container  panel-danger">
 					<div class="panel-heading">
 						<div class="todo-header text-center">
 							<h4><i class="fa fa-tasks"></i>&nbsp;待办任务</h4>
@@ -151,11 +35,6 @@
 									<c:if test="${ not empty actlist}">
 										<c:forEach items="${actlist}" var="actlist" varStatus="index">
 										<li>
-										<%--<label class="checkbox1" for="option1">--%>
-											<%--<input id="option1" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-											<%--<span>${actlist.taskId}</span>--%>
 										   <a href="${ctx}/act/task/form?taskId=${actlist.taskId}&taskName=${actlist.taskName}&taskDefKey=${actlist.taskDefKey}&procInsId=${actlist.procInsId}&procDefId=${actlist.procDefId}&status=${actlist.status}" style="color: white">${actlist.title}</a>
 									    </li>
 										</c:forEach>
@@ -163,48 +42,35 @@
 									<c:if test="${empty actlist}">
 										<span>暂无待办事项</span>
 									</c:if>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option3">--%>
-											<%--<input id="option3" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">9:00~12:00客户需求分析</span>--%>
-									<%--</li>--%>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option4">--%>
-											<%--<input id="option4" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">12:00和客户电话会议</span>--%>
-									<%--</li>--%>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option5">--%>
-											<%--<input id="option5" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">2:00参加技术论坛</span>--%>
-									<%--</li>--%>
-									<%--<li class="">--%>
-										<%--<label class="checkbox1" for="option2">--%>
-											<%--<input id="option2" type="checkbox" class="">--%>
-											<%--<span></span>--%>
-										<%--</label>--%>
-										<%--<span class="done-false">5:00晚会总结进度</span>--%>
-									<%--</li>--%>
 								</ul>
 							</div>
-							<%--<form class="form-horizontal todo-from-bottom">--%>
-								<%--<div class="row">--%>
-									<%--<div class="col-sm-12">--%>
-										<%--<div class="input-group">--%>
-											<%--<input type="text" class="form-control" placeholder="">--%>
-											<%--<span class="input-group-btn">--%>
-										<%--<button class="btn btn-default" type="submit">增加</button>--%>
-									<%--</span>--%>
-										<%--</div>--%>
-									<%--</div>--%>
-								<%--</div>--%>
-							<%--</form>--%>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="col-lg-4 col-md-6">
+				<div class="todo-container  panel-info">
+					<div class="panel-heading">
+						<div class="todo-header text-info">
+							<h4><i class="fa fa-tasks"></i>&nbsp;通知</h4>
+						</div>
+					</div>
+					<div class="panel-body bg-info">
+						<div class="todo-body">
+							<div class="todo-list-wrap">
+								<ul class="todo-list">
+									<c:if test="${ not empty list1}">
+										<c:forEach items="${list1}" var="actlist" varStatus="index">
+											<li>
+												<a href="${ctx}/oa/oaNotify/form?id=${actlist.id}&isSelf=true" style="color: white">${actlist.title}${actlist.type}</a>
+											</li>
+										</c:forEach>
+									</c:if>
+									<c:if test="${empty list1}">
+										<span>暂无通知</span>
+									</c:if>
+								</ul>
+							</div>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -40,7 +40,7 @@
 				<span class="icon-bar"></span>
 			</button>
 
-			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">zjgd</a>
+			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">配网全过程</a>
 		</div>
 	</div>
 	<div class="navbar-container container-fluid">
@@ -52,52 +52,6 @@
 				<li>
 					<a href="${ctx}/home"  class="J_menuItem"><i class="fa fa-home" style="font-size:14px;"></i></a>
 				</li>
-				<li class="hidden-xs">
-					<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a>
-					<ul class="dropdown-menu">
-						<li class="${cookie.tab.value!=false?'active':''}">
-							<a id="showTab" href="#">开启tab</a>
-						</li>
-						<li class="${cookie.tab.value==false?'active':''}">
-							<a id="closeTab" href="#">关闭tab</a>
-						</li>
-					</ul>
-				</li>
-
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-						<i class="fa fa-envelope-o"></i>
-						<span class="label label-info">${noReadCount }</span>
-					</a>
-					<ul class="dropdown-menu animated fadeIn">
-						<li class="messages-top text-center">
-							你有  ${noReadCount} 封未读邮件.
-						</li>
-
-						<c:forEach items="${mailPage.list}" var="mailBox">
-
-							<li class="dropdown-messages">
-								<a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}">
-
-									<div class="message-sender">
-											${mailBox.sender.name }<small class="pull-right">${fns:getTime(mailBox.sendtime)}前</small>
-									</div>
-									<div class="message-header">
-											${mailBox.mail.overview} <small class="pull-right">
-										<fmt:formatDate value="${mailBox.sendtime}" pattern="yyyy-MM-dd HH:mm:ss"/></small>
-									</div>
-
-								</a>
-							</li>
-
-						</c:forEach>
-						<li class=" text-center">
-							<a class="J_menuItem" href="${ctx}/iim/mailBox/list?orderBy=sendtime desc">
-								<font color='gray'> <i class="fa fa-envelope"></i>  查看所有邮件</font>
-							</a>
-						</li>
-					</ul>
-				</li>
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 						<i class="fa fa-bell-o"></i>
@@ -217,10 +171,6 @@
 					</ul>
 				</li>
 
-				<li class="hidden-xs">
-					<a href="#" onClick="toggleFullScreen()" data-toggle="fullscreen"><i class="fa fa-arrows-alt"></i></a>
-				</li>
-
 
 				<li class="dropdown admin-dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
@@ -233,10 +183,6 @@
 						</li>
 						<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
 						</li>
-						<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-						</li>
-						<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-						</li>
 						<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
 						<li><a href="${ctx}/logout">安全退出</a>
 						</li>
@@ -293,10 +239,6 @@
 													</li>
 													<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
 													</li>
-													<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-													</li>
-													<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-													</li>
 													<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
 													</li>
 													<li><a href="${ctx}/logout">安全退出</a>

src/main/webapp/webpage/modules/sys/login/sysIndex.jsp

@@ -24,7 +24,7 @@
 				<span class="icon-bar"></span>
 			</button>
 
-			<a class="navbar-brand J_menuItem"  href="${ctx}/home">zjgd</a>
+			<a class="navbar-brand J_menuItem"  href="${ctx}/home">配网全过程</a>
 		</div>
 		<div class="collapse navbar-collapse">
 			<form class="navbar-form navbar-left" role="search">
@@ -35,39 +35,6 @@
 			</form>
 			<ul class="nav navbar-nav">
 				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"><span class="glyphicon glyphicon-envelope"></span><span class="badge badge-green">${noReadCount}</span></a>
-					
-					 <ul class="dropdown-menu animated fadeIn">
-						<li class="messages-top text-center">
-							你有  ${noReadCount} 封未读邮件.
-						</li>
-                          
-                            	 <c:forEach items="${mailPage.list}" var="mailBox">
-                            	 
-                            	  <li class="dropdown-messages">
-		                            	 <a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}">
-			                                           
-											<div class="message-sender">
-												${mailBox.sender.name }<small class="pull-right">${fns:getTime(mailBox.sendtime)}前</small>
-											</div>
-											<div class="message-header">
-												 ${mailBox.mail.overview} <small class="pull-right">
-	                                            <fmt:formatDate value="${mailBox.sendtime}" pattern="yyyy-MM-dd HH:mm:ss"/></small>
-											</div>
-											
-										</a>
-	                                </li>
-	                               
-                                </c:forEach>
-                                <li class=" text-center">
-                                        <a class="J_menuItem" href="${ctx}/iim/mailBox/list?orderBy=sendtime desc">
-                                           <font color='gray'> <i class="fa fa-envelope"></i>  查看所有邮件</font>
-                                        </a>
-                                </li>
-                            </ul>
-			
-				</li>
-				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button">
 						<span class="glyphicon glyphicon-bell"></span><span class="badge badge-red">${count }</span>
 					</a>
@@ -93,25 +60,7 @@
 					</ul>
 				</li>
 			</ul>
-			<ul class="nav navbar-nav pull-right navbar-right">	
-				<li>
-					<div class="row" style="margin: 10px 10px 0 0;">
-						<div class="col-sm-4">
-							<span  style="margin: 12px 0 0 0;">Tab</span>
-						</div>
-						<div class="col-sm-8">
-							<div class="onoffswitch">
-								<input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="switchTab" ${cookie.tab.value!=false?'checked':''} >
-								<label class="onoffswitch-label" for="switchTab">
-									<span class="onoffswitch-inner"></span>
-									<span class="onoffswitch-switch"></span>
-								</label>
-							</div>
-						</div>
-					</div>
-				
-				</li>
-			
+			<ul class="nav navbar-nav pull-right navbar-right">
 				<li class="dropdown color-picker">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
 						<span><i class="fa fa-circle"></i></span>
@@ -157,12 +106,6 @@
 						</li>
 					</ul>
 				</li>
-				<li>
-					<a href="#"  onClick="toggleFullScreen()">
-						<span>全屏 </span>
-					</a>
-
-				</li>
 			
 				
 				<li class="dropdown admin-dropdown">
@@ -174,10 +117,6 @@
                           </li>
                           <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
                           </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-                          </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-                          </li>
 							<li><a href="javaScript:changeStyle()">切换成横向菜单</a>
 							</li>
                           <li><a href="${ctx}/logout">安全退出</a>
@@ -196,10 +135,6 @@
                     </li>
                     <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
                     </li>
-                    <li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-                    </li>
-                    <li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-                    </li> 
                     <li><a href="${ctx}/logout">安全退出</a>
                     </li>
 				</ul>
@@ -220,10 +155,6 @@
                           </li>
                           <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
                           </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-                          </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-                          </li> 
                           <hr>
 							<li><a href="javaScript:changeStyle()">切换成横向菜单</a>
 							</li>

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -44,16 +44,16 @@
 		<div class="row">
 			<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
 				<img  class="img-circle" src="${ctxStatic}/common/images/flat-avatar.png" class="user-avatar" />
-				<h1>甲供物资领退料信息系统</h1>
+				<h1>配网全过程管理系统</h1>
 				<sys:message content="${message}" showType="1"/>
 				<form id="loginForm" role="form" action="${ctx}/login" method="post">
 					<div class="form-content">
 						<div class="form-group">
-							<input type="text" id="username" name="username" class="form-control input-underline input-lg required"  value="admin" placeholder="用户名">
+							<input type="text" id="username" name="username" class="form-control input-underline input-lg required"  value="" placeholder="用户名">
 						</div>
 
 						<div class="form-group">
-							<input type="password" id="password" name="password" value="admin" class="form-control input-underline input-lg required" placeholder="密码">
+							<input type="password" id="password" name="password" value="" class="form-control input-underline input-lg required" placeholder="密码">
 						</div>
 						<c:if test="${isValidateCodeLogin}">
 						<div class="form-group  text-muted">
@@ -61,61 +61,13 @@
 							<sys:validateCode name="validateCode" inputCssStyle="margin-bottom:5px;" buttonCssStyle="color:white"/>
 						</div>
 						</c:if>
-							<ul class="pull-right btn btn-info btn-circle" style="background-color:white;height:45px;width:46px">	
-								<li class="dropdown color-picker" >
-									<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-										<span><i class="fa fa-circle"></i></span>
-									</a>
-									<ul class="dropdown-menu pull-right animated fadeIn" role="menu">
-										<li class="padder-h-xs">
-											<table class="table color-swatches-table text-center no-m-b">
-												<tr>
-													<td class="text-center colorr">
-														<a href="#" data-theme="blue" class="theme-picker">
-															<i class="fa fa-circle blue-base"></i>
-														</a>
-													</td>
-													<td class="text-center colorr">
-														<a href="#" data-theme="green" class="theme-picker">
-															<i class="fa fa-circle green-base"></i>
-														</a>
-													</td>
-													<td class="text-center colorr">
-														<a href="#" data-theme="red" class="theme-picker">
-															<i class="fa fa-circle red-base"></i>
-														</a>
-													</td>
-												</tr>
-												<tr>
-													<td class="text-center colorr">
-														<a href="#" data-theme="purple" class="theme-picker">
-															<i class="fa fa-circle purple-base"></i>
-														</a>
-													</td>
-													<td class="text-center color">
-														<a href="#" data-theme="midnight-blue" class="theme-picker">
-															<i class="fa fa-circle midnight-blue-base"></i>
-														</a>
-													</td>
-													<td class="text-center colorr">
-														<a href="#" data-theme="lynch" class="theme-picker">
-															<i class="fa fa-circle lynch-base"></i>
-														</a>
-													</td>
-												</tr>
-											</table>
-										</li>
-									</ul>
-								</li>
-						</ul>
-						<label class="inline">
-								<input  type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''} class="ace" />
-								<span class="lbl"> 记住我</span>
-						</label>
 					</div>
+					<label class="inline">
+						<input  type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''} class="ace" />
+						<span class="lbl"> 记住我</span>
+					</label>
+					<div></div>
 					<input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login"  value="登录">
-					&nbsp;
-					<a href="${ctx}/sys/register" class="btn btn-white btn-outline btn-lg btn-rounded progress-login">注册</a>
 				</form>
 			</div>			
 		</div>

src/main/webapp/webpage/modules/sys/login/sysRegister.jsp

@@ -24,7 +24,7 @@
 						},
 						errorLabelContainer: "#messageBox",
 						errorPlacement: function(error, element) {
-							error.appendTo($("#loginError").parent());
+							error.appendTo($("#loginError").parent());配网全过程
 						} 
 					});
 				});

src/main/webapp/webpage/modules/sys/user/userForm.jsp

@@ -69,7 +69,8 @@
 		      <tr>
 		         <td class="active"><label class="pull-right"><font color="red">*</font>姓名:</label></td>
 		         <td>
-					 <form:input path="name" htmlEscape="false" maxlength="50" class="form-control required"/></td>
+					 <form:input path="name" htmlEscape="false" maxlength="50" class="form-control required"/>
+				 </td>
 		         <td class="active"><label class="pull-right"><font color="red">*</font>登录名:</label></td>
 		         <td><input id="oldLoginName" type="hidden" name="oldLoginName" value="${user.loginName}">
 					 <form:input path="loginName" htmlEscape="false" maxlength="50" class="form-control required userName"/></td>

src/main/webapp/webpage/modules/sys/user/userForm1.jsp

@@ -0,0 +1,109 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>用户管理</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+	function save() {
+		var isValidate = jp.validateForm('#inputForm');//校验表单
+		if(!isValidate){
+			return false;
+		}else{
+			jp.loading();
+			jp.post("${ctx}/sys/user/save",$('#inputForm').serialize(),function(data){
+				if(data.success){
+					jp.getParent().refresh();
+					var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+					parent.layer.close(dialogIndex);
+					jp.success(data.msg)
+
+				}else{
+					jp.error(data.msg);
+				}
+			})
+		}
+
+	}
+	</script>
+</head>
+<body class="bg-white">
+	<form:form id="inputForm" modelAttribute="user"  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"><font color="red">*</font>头像：</label></td>
+		         <td class="width-35">
+						<sys:fileUpload path="photo" value="${user.photo}" type="image" uploadPath="/photo" fileNumLimit="1" readonly="false"/></td>
+		         <td  class="width-15 active">	<label class="pull-right"><font color="red">*</font>归属公司:</label></td>
+		         <td class="width-35"><sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"
+						title="公司" url="/sys/office/treeData?type=1" allowClear="true" cssClass="form-control required"/></td>
+		      </tr>
+		      
+		      <tr>
+		         <td class="active"><label class="pull-right"><font color="red">*</font>归属部门:</label></td>
+		         <td><sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
+					 allowClear="true" title="部门" url="/sys/office/treeData?type=2" cssClass="form-control required" notAllowSelectParent="true"/></td>
+		         <td class="active"><label class="pull-right"><font color="red">*</font>工号:</label></td>
+		         <td><form:input path="no" htmlEscape="false" maxlength="50" class="form-control required"/></td>
+		      </tr>
+		      
+		      <tr>
+		         <td class="active"><label class="pull-right"><font color="red">*</font>姓名:</label></td>
+		         <td>
+					 <form:input path="name" readonly="true" htmlEscape="false" maxlength="50" class="form-control required"/>
+				 </td>
+		         <td class="active"><label class="pull-right"><font color="red">*</font>登录名:</label></td>
+		         <td><input id="oldLoginName" type="hidden" name="oldLoginName" value="${user.loginName}">
+					 <form:input path="loginName" readonly="true" htmlEscape="false" maxlength="50" class="form-control required userName"/></td>
+		      </tr>
+		      
+		      
+		      <tr>
+		         <td class="active"><label class="pull-right"><c:if test="${empty user.id}"><font color="red">*</font></c:if>密码:</label></td>
+		         <td><input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="form-control ${empty user.id?'required':''}"/>
+					<c:if test="${not empty user.id}"><span class="help-inline">若不修改密码，请留空。</span></c:if></td>
+		         <td class="active"><label class="pull-right"><c:if test="${empty user.id}"><font color="red">*</font></c:if>确认密码:</label></td>
+		         <td><input id="confirmNewPassword" name="confirmNewPassword" type="password"  class="form-control ${empty user.id?'required':''}" value="" maxlength="50" minlength="3" equalTo="#newPassword"/></td>
+		      </tr>
+		      
+		       <tr>
+		         <td class="active"><label class="pull-right">邮箱:</label></td>
+		         <td><form:input path="email" htmlEscape="false" maxlength="100" class="form-control email"/></td>
+		         <td class="active"><label class="pull-right">电话:</label></td>
+		         <td><form:input path="phone" htmlEscape="false" maxlength="100" class="form-control"/></td>
+		      </tr>
+		      
+		      <tr>
+		         <td class="active"><label class="pull-right">手机:</label></td>
+		         <td><form:input path="mobile" htmlEscape="false" maxlength="100" class="form-control"/></td>
+		         <td class="active"><label class="pull-right">是否允许登录:</label></td>
+		         <td><form:select path="loginFlag"  class="form-control">
+					<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+				</form:select></td>
+		      </tr>
+		      
+		      <tr>
+		         <td class="active"><label class="pull-right"><font color="red">*</font>用户角色:</label></td>
+		         <td>
+		         	<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" cssClass="i-checks required"/>
+		         	<label id="roleIdList-error" class="error" for="roleIdList"></label>
+		         </td>
+		         <td class="active"><label class="pull-right">备注:</label></td>
+		         <td><form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="form-control"/></td>
+		      </tr>
+		      
+		      <c:if test="${not empty user.id}">
+		       <tr>
+		         <td class=""><label class="pull-right">创建时间:</label></td>
+		         <td><span class="lbl"><fmt:formatDate value="${user.createDate}" type="both" dateStyle="full"/></span></td>
+		         <td class=""><label class="pull-right">最后登陆:</label></td>
+		         <td><span class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></span></td>
+		      </tr>
+		     </c:if>
+		      </tbody>
+		      </table>
+	</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/sys/user/userIndex.js

@@ -222,7 +222,7 @@
 			  if(!id){
 				  id = getIdSelections();
 			  }
-			  jp.openSaveDialog('编辑用户', "${ctx}/sys/user/form?id=" + id,'800px', '680px');
+			  jp.openSaveDialog('编辑用户', "${ctx}/sys/user/form1?id=" + id,'800px', '680px');
 			  
 		  }
 		  function refresh() {

src/main/webapp/webpage/modules/sys/user/userInfoEdit.jsp

@@ -12,7 +12,7 @@
 		<div class="control-group">
 			<label class="col-sm-3 control-label">姓名:</label>
 			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="50"  class="form-control  max-width-250 required" />
+				<form:input path="name" readonly="true" htmlEscape="false" maxlength="50"  class="form-control  max-width-250 required" />
 			</div>
 		</div>
 		<div class="control-group">