修改

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;
@@ -455,6 +457,8 @@ public class ActTaskController extends BaseController {
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传新图纸");
                 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");
@@ -563,6 +567,8 @@ public class ActTaskController extends BaseController {
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setImgName("上传借款单据");
                 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.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.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.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");
@@ -691,7 +703,9 @@ public class ActTaskController extends BaseController {
                 uploadImages.setPath(pic);
                 uploadImages.setProcInsId(act.getProcInsId());
                 uploadImages.setuId(UserUtils.getUser().getName());
-                uploadImages.setImgName("新方案图纸");
+                uploadImages.setImgName("1");
+                Project user = MyActiviUtils.findUser(act.getProcInsId());
+                uploadImages.setProjectId(user.getId());
                 uploadImagesService.save(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.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.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.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.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.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");
@@ -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.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.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.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.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.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.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.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.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/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/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/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/web/ConstructionController.java

@@ -338,7 +338,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/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/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/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/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/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">

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">

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

@@ -44,7 +44,7 @@
 		<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">
@@ -62,6 +62,10 @@
 						</div>
 						</c:if>
 					</div>
+					<label class="inline">
+						<input  type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''} class="ace" />
+						<span class="lbl"> 记住我</span>
+					</label>
 					<input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login"  value="登录">
 				</form>
 			</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">