Merge remote-tracking branch 'origin/master'

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

@@ -1111,9 +1111,9 @@ public class ActTaskService extends BaseService {
 			vars.put("design", design);
 		} else {
 			act.setComment("[驳回] " + act.getComment());
-			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
-			String theDesigner = loginName.getOperatingPersonnel();
-			vars.put("design", theDesigner);
+			//查找判定设计变更的操作人
+			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判定设计变更");
+			vars.put("design", manager);
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1162,7 +1162,10 @@ public class ActTaskService extends BaseService {
 		boolean pass4 = false;
 		boolean pass5 = false;
 		Map<String, Object> vars = Maps.newHashMap();
+		//pass对应进入问题模块，pass4对应没有问题完成施工交底
+		vars.put("pass", false);
 		vars.put("pass4", false);
+
 		vars.put("pass1", false);
 		vars.put("pass2", false);
 		vars.put("pass3", false);
@@ -1180,6 +1183,8 @@ public class ActTaskService extends BaseService {
 				pass4 = true;
 			} else if ("pass5".equals(a)) {
 				pass5 = true;
+			} else if ("pass6".equals(a)) {
+				pass5 = true;
 			}
 		}
 		if (pass4 == true) {
@@ -1201,12 +1206,13 @@ public class ActTaskService extends BaseService {
 			}
 			if (pass3 == true) {
 				vars.put("pass3", true);
-				vars.put("policy", "施工单位");
+				vars.put("coveredPerson", "施工单位");
 			}
 			if (pass5 == true) {
 				vars.put("pass5", true);
 				vars.put("policy", "政策处理");
 			}
+			vars.put("pass", true);
 			act.setComment("[存在问题]" + act.getComment());
 			act.preUpdate();
 			// 对不同环节的业务逻辑进行操作
@@ -1241,15 +1247,15 @@ public class ActTaskService extends BaseService {
 			vars.put("design", design);
 		} else {
 			vars.put("manager", true);
-			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "项目经理组织交底");
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "项目经理人工判断问题");
-			if (manager!=null&&manager!="") {
-				vars.put("design",manager);
-				System.out.println(manager);
-			} else if (manager2!=null&&manager2!="") {
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
+			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
+			 if (manager2!=null&&manager2!="") {
 				vars.put("design",manager2);
 				System.out.println(manager2);
-			}
+			}else if (manager!=null&&manager!="") {
+				 vars.put("design",manager);
+				 System.out.println(manager);
+			 }
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1311,9 +1317,8 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			vars.put("design", design);
 		} else {
-			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
-			design = loginName.getTheDesigner();
-			vars.put("design","项目");
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:重新设计");
+			vars.put("design",manager2);
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1333,13 +1338,14 @@ public class ActTaskService extends BaseService {
 	public void managerUpload(Act act,String design) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		//完成施工交底
 		if ("yes".equals(flag)) {
 			vars.put("status", 1);
 			vars.put("procInsId", act.getProcInsId());
 		} else {
-			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
-			design = loginName.getOperatingPersonnel();
-			vars.put("design", design);
+		//驳回
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:运行人员判断变更后材料");
+			vars.put("design", manager2);
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1365,33 +1371,56 @@ public class ActTaskService extends BaseService {
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
+		/**
+		 * problem pass pass4 是互斥网关，同时只能执行一条线路
+		 * */
+		//代表进入问题模块
+		vars.put("problem", false);
+		//没有问题
 		vars.put("pass", false);
+		//项目经理人工判断问题
+		vars.put("pass4", false);
+
+		/**
+		 * pass1 pass2 pass3 pass5 分别对应了问题模块不同的问题类型
+		 * pass2不可以与其它三个同时发起
+		 * pass3 pass5 只可同时发起一种
+		 * */
+		//设计变更
 		vars.put("pass1", false);
+		//项目关闭
 		vars.put("pass2", false);
+		//行政政处（城区道路）
 		vars.put("pass3", false);
-		vars.put("pass4", false);
+		//1·农村政处2·民事政处/行政政处（公路/水利）
 		vars.put("pass5", false);
+		//获取前置条件不为空就进入项目经理人工判断问题类型
         if (null!=disclose.getPrecondition()&&!"".equals(disclose.getPrecondition())){
 			vars.put("pass4", true);
         }else {
+        	//如果符合项目关闭，步入项目关闭，其它问题类型不触发
 			if (flagItemCLose){
 				vars.put("itemClose","专职");
 				vars.put("pass2",true);
+				vars.put("problem", true);
 			}else {
-				if (flagDesign){
-					vars.put("design","运行人员");
-					vars.put("pass1", true);
-				}
-				if ("民事农村".equals(flagDeal)){
-					vars.put("policy","政策处理");
-					vars.put("pass5",true);
-				}
-				if ("行政".equals(flagDeal)) {
-					vars.put("coveredPerson","施工单位");
-					vars.put("pass3",true);
-				}
-				if (!flagDesign&&!flagItemCLose&&"init".equals(flagDeal)){
+				//当不符合设计变更，项目关闭，政处处理时，判定项目没有问题，完成施工交底
+				if (!flagDesign&&"init".equals(flagDeal)){
 					vars.put("pass",true);
+				}else {
+					//判断是否符合设计变更条件，符合
+					if (flagDesign){
+						vars.put("design","运行人员");
+						vars.put("pass1", true);
+					}
+					//查看政处类型步入不同的问题模块
+					if ("民事农村".equals(flagDeal)){
+						vars.put("policy","政策处理");
+						vars.put("pass5",true);
+					}else if ("行政".equals(flagDeal)) {
+						vars.put("coveredPerson","施工单位");
+						vars.put("pass3",true);
+					}
 				}
 			}
         }
@@ -1399,7 +1428,7 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
-	 * 保存项目关闭 专职审批意见
+	 * 交底:判断项目是否需要关闭
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1415,15 +1444,9 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			vars.put("operators", fullName);
 		} else {
-			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "项目经理组织交底");
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "项目经理人工判断问题");
-			if (manager!=null&&manager!="") {
-				vars.put("processer",manager);
-				System.out.println(manager);
-			} else if (manager2!=null&&manager2!="") {
+			//驳回到项目经理人工判断问题
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
 				vars.put("processer",manager2);
-				System.out.println(manager2);
-			}
 		}
 //		vars.put("yes".equals(act.getFlag())?"operators":"processer",fullName);
 		vars.put("flagNo","yes".equals(act.getFlag())?false:true);
@@ -1453,8 +1476,9 @@ public class ActTaskService extends BaseService {
 		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
+
 	/**
-	 * 保存项目关闭 运行人员审批意见
+	 * 项目关闭 配网运行人员
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1462,11 +1486,18 @@ public class ActTaskService extends BaseService {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[没有问题] ":"[驳回] ")+act.getComment());
 		act.preUpdate();
+		String flag = act.getFlag();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?fullTime:fullTime);
+		if ("yes".equals(flag)) {
+			vars.put("systemfulltime", fullTime);
+		} else {
+			String itemClose = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断项目是否需要关闭");
+			vars.put("itemClose",itemClose );
+		}
+//		vars.put("yes".equals(act.getFlag())?"systemfulltime":"itemClose","yes".equals(act.getFlag())?fullTime:fullTime);
 		vars.put("systemNo","yes".equals(act.getFlag())?false:true);
 		vars.put("systemYes","yes".equals(act.getFlag())?true:false);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
@@ -1498,9 +1529,15 @@ public class ActTaskService extends BaseService {
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
-			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
-			String policy = loginName.getProjectManager();
-			vars.put("policy", policy);
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
+			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
+			if (manager2!=null&&manager2!="") {
+				vars.put("policy",manager2);
+				System.out.println(manager2);
+			}else if (manager!=null&&manager!="") {
+				vars.put("policy",manager);
+				System.out.println(manager);
+			}
 			act.setComment("[驳回]"+act.getComment());
 		}
 		// 设置意见
@@ -1520,8 +1557,7 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
-			String policy = loginName.getRuralCivil();
+			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
 			vars.put("policy", policy);
 			act.setComment("【需要政策处理】" + act.getComment());
 		} else {
@@ -1548,7 +1584,8 @@ public class ActTaskService extends BaseService {
 			vars.put("policy", UserUtils.getUser().getLoginName());
 			act.setComment("【未签字版清单】" + act.getComment());
 		} else {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
+			vars.put("policy", policy);
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1571,7 +1608,8 @@ public class ActTaskService extends BaseService {
 			vars.put("policy", UserUtils.getUser().getLoginName());
 			act.setComment("【签字版清单】" + act.getComment());
 		} else {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
+			vars.put("policy", policy);
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1595,7 +1633,8 @@ public class ActTaskService extends BaseService {
 			vars.put("policy", UserUtils.getUser().getLoginName());
 			act.setComment("【签字版合同】" + act.getComment());
 		} else {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
+			vars.put("policy", policy);
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1617,7 +1656,8 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			act.setComment("【完成政策处理】" + act.getComment());
 		} else {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
+			vars.put("policy", policy);
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1665,7 +1705,7 @@ public class ActTaskService extends BaseService {
 
 
 	/**
-	 * 政策处理：施工单位人员上传未覆盖盖章
+	 * 行政政处(城区道路)：施工单位人员上传未覆盖盖章
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1679,7 +1719,15 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("sealYes", true);
 		} else {
-			vars.put("phasePerson",fullName);
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
+			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
+			if (manager2!=null&&manager2!="") {
+				vars.put("phasePerson",manager2);
+				System.out.println(manager2);
+			}else if (manager!=null&&manager!="") {
+				vars.put("phasePerson",manager);
+				System.out.println(manager);
+			}
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("sealNo", true);
 		}
@@ -1704,7 +1752,8 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("receiptYes", true);
 		} else {
-			vars.put("coveredPerson","施工单位");
+			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
+			vars.put("coveredPerson",coveredPerson);
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("receiptNo", true);
 		}
@@ -1726,7 +1775,8 @@ public class ActTaskService extends BaseService {
 		vars.put("phaseYes", false);
 		vars.put("phaseNo", false);
 		if ("yes".equals(flag)) {
-			vars.put("coveredPerson",fullName);
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
+			vars.put("coveredPerson",manager2);
 			act.setComment("[重新发起]"+act.getComment());
 			vars.put("phaseYes", true);
 		} else {
@@ -1755,7 +1805,8 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("singleYes", true);
 		} else {
-			vars.put("coveredPerson","施工单位");
+			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
+			vars.put("coveredPerson",coveredPerson);
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("singleNo", true);
 		}
@@ -1781,7 +1832,8 @@ public class ActTaskService extends BaseService {
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("policyYes", true);
 		} else {
-			vars.put("coveredPerson","施工单位");
+			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
+			vars.put("coveredPerson",coveredPerson);
 			act.setComment("[驳回]" + act.getComment());
 			vars.put("singleNo", true);
 		}
@@ -1806,7 +1858,8 @@ public class ActTaskService extends BaseService {
             act.setComment("[没有问题]"+act.getComment());
             vars.put("finishYes", true);
         } else {
-            vars.put("coveredPerson","施工单位");
+			String coveredPerson = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:上传未盖章施工方案(行政政处(城区道路))");
+			vars.put("coveredPerson",coveredPerson);
             act.setComment("[驳回]" + act.getComment());
             vars.put("finishNo", true);
         }

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

@@ -22,10 +22,7 @@ import com.jeeplus.modules.act.service.ActModelService;
 import com.jeeplus.modules.oa.entity.OaNotify;
 import com.jeeplus.modules.oa.entity.OaNotifyRecord;
 import com.jeeplus.modules.oa.service.OaNotifyService;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.ProcessPersonnel;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.*;
 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.ProcessPersonnelService;
@@ -489,9 +486,16 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "loanUploadList")
-	public AjaxJson loanUploadList(Act act) {
+	public AjaxJson loanUploadList(Act act, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传借款单据");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.loanUploadList(act);
@@ -533,6 +537,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传未签字版政策处理清单");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -559,6 +564,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传签字版政策处理清单");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -584,6 +590,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传签字版合同");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -609,12 +616,18 @@ public class ActTaskController extends BaseController {
 		String procInsId = act.getProcInsId();
 		//根据流程id获取项目需求提出单位
 		String demandUnit = constructionService.demandUnit(procInsId);
-		//根据登陆名查询用户角色
+		//根据选择的用户询用户角色
 		String nameFindOffice = constructionService.nameFindOffice(design);
-		if ("经研所需求".equals(demandUnit)) {
+		if (demandUnit.indexOf("经研所")>0) {
 			if (!"经研所".equals(nameFindOffice)) {
 				j.setSuccess(false);
-				j.setMsg("请选择对应的人员");
+				j.setMsg("此项目的需求方是经研所，请选择对应的人员");
+				return j;
+			}
+		} else {
+			if ("经研所".equals(nameFindOffice)) {
+				j.setSuccess(false);
+				j.setMsg("此项目需求单位不是经研所，请选择对应的人员");
 				return j;
 			}
 		}
@@ -623,12 +636,9 @@ public class ActTaskController extends BaseController {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImages.setImgName("新方案图纸");
 				uploadImagesService.save(uploadImages);
 			}
-			ProcessPersonnel processPersonnel = new ProcessPersonnel();
-			processPersonnel.setProcInsId(act.getProcInsId());
-			processPersonnel.setOperatingPersonnel(UserUtils.getUser().getLoginName());
-			processPersonnelService.newUpdate(processPersonnel);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.operator(act,design);
@@ -664,18 +674,30 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "designUpload")
-	public AjaxJson designUpload(Act act, String design, String pic, UploadImages uploadImages) {
+	public AjaxJson designUpload(Act act, String design, String pic, String pic1,String pic2,UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("变更后图纸");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
-				uploadImagesService.save(uploadImages);
+				uploadImagesService.insert(uploadImages);
+			}
+			if (pic1!=null&&pic1!="") {
+				uploadImages.setPath(pic1);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("预算书");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.insert(uploadImages);
+			}
+			if (pic2!=null&&pic2!="") {
+				uploadImages.setPath(pic2);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("物资清册");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.insert(uploadImages);
 			}
-			ProcessPersonnel processPersonnel = new ProcessPersonnel();
-			processPersonnel.setProcInsId(act.getProcInsId());
-			processPersonnel.setTheDesigner(UserUtils.getUser().getLoginName());
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.designUpload(act,design);
@@ -732,8 +754,6 @@ public class ActTaskController extends BaseController {
 	@RequestMapping(value = "audit2")
 	public AjaxJson auditTask2(Act act) {
 		AjaxJson j = new AjaxJson();
-			String historyActivity = MyActiviUtils.findHistoryActivity(act.getProcInsId(),"施工单位组织交底");
-			System.out.println(historyActivity);
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
@@ -754,6 +774,7 @@ public class ActTaskController extends BaseController {
 	public AjaxJson auditTask3(Act act) {
 		AjaxJson j = new AjaxJson();
 		String s = "";
+//		MyNeedList 项目经理组织交底 = MyActiviUtils.findActivity("项目经理组织交底");
 		boolean flag = false;
 		Disclose dc = new Disclose();
 		dc.setProcInsId(act.getProcInsId());
@@ -786,12 +807,11 @@ public class ActTaskController extends BaseController {
 					flag = true;
 				}
 			}
-/*			if (flagDeal){
-				if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
-					s+=" 政策处理说明不能为空!";
-					flag=true;
-				}
-			}*/
+			if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
+				s+=" 政策处理说明不能为空!";
+				flag=true;
+			}
+
 			if (flag){
 				j.setSuccess(false);
 				j.setMsg(s);
@@ -799,11 +819,6 @@ public class ActTaskController extends BaseController {
 			}
 		}
 		try {
-			//记录当前操作的项目经理为
-			ProcessPersonnel processPersonnel = new ProcessPersonnel();
-			processPersonnel.setProcInsId(act.getProcInsId());
-			processPersonnel.setOperatingPersonnel(UserUtils.getUser().getLoginName());
-			processPersonnelService.newUpdate(processPersonnel);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.auditSave3(act,disclose,flagDesign,flagItemCLose,flagDeal);
@@ -814,7 +829,7 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 	/*
-		项目关闭：专职
+		交底:判断项目是否需要关闭
 	 */
 	@ResponseBody
 	@RequestMapping(value = "speciallyTask")
@@ -834,7 +849,8 @@ public class ActTaskController extends BaseController {
 			j.setMsg("驳回成功");
 		}
 		return j;
-	}/*
+	}
+	/*
 		项目关闭：项目经理
 	 */
 	@ResponseBody
@@ -941,6 +957,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传未盖章施工方案");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -958,7 +975,7 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 	/*
-		政策处理：施工单位人员上传覆盖盖章
+		政策处理：施工单位人员上传盖章施工方案
 	 */
 	@ResponseBody
 	@RequestMapping(value = "sealTask")
@@ -968,6 +985,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传盖章施工方案");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -1013,6 +1031,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传收据");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -1040,6 +1059,7 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传缴费单");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}
@@ -1053,16 +1073,17 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 	/*
-		政策处理：配网政策处理专职 :上传借款
+		政策处理：配网政策处理专职 :上传借款单据
 	 */
 	@ResponseBody
 	@RequestMapping(value = "policyPay1Task")
 	public AjaxJson policyPay1Task(Act act,String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
-			if (pic!=null&&pic!="") {
+			if (pic!=null&& !pic.equals("")) {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传借款单据");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(uploadImages);
 			}

src/main/java/com/jeeplus/modules/sg/audit/information/service/InformationService.java

@@ -105,8 +105,8 @@ public class InformationService extends CrudService<InformationMapper, Informati
 	public Page<Information> findPage(Page<Information> page, Information entity) {
 		Page<Information> page1 = super.findPage(page, entity);
 		List<Information> list = page1.getList();
-		String find = informationMapper.findOverTime("overTime");
-		int overTime = Integer.parseInt(find);
+/*		String find = informationMapper.findOverTime("overTime");
+		int overTime = Integer.parseInt(find);*/
 		Calendar cal = Calendar.getInstance();
 
 		long between_days = 0;
@@ -135,7 +135,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 								long secondDate = cal.getTimeInMillis();
 								between_days = (secondDate - appDay) / (1000 * 3600 * 24);
 								in.setFinishDate(String.valueOf(between_days) + "天");
-								if (between_days > overTime) {
+								if (between_days > 14) {
 									in.setOverdue("是");
 								} else {
 									in.setOverdue("否");
@@ -145,7 +145,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 								long firstDate = cal.getTimeInMillis();
 								between_days = (firstDate - appDay) / (1000 * 3600 * 24);
 								in.setFinishDate(String.valueOf(between_days) + "天");
-								if (between_days > overTime) {
+								if (between_days > 14) {
 									in.setOverdue("是");
 								} else {
 									in.setOverdue("否");

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

@@ -23,6 +23,9 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class UploadImagesService extends CrudService<UploadImagesMapper, UploadImages> {
 
+	@Autowired
+	private UploadImagesMapper uploadImagesMapper;
+
 	@Override
 	public UploadImages get(String id) {
 		return super.get(id);
@@ -48,4 +51,10 @@ public class UploadImagesService extends CrudService<UploadImagesMapper, UploadI
 	public void save(UploadImages entity) {
 		super.save(entity);
 	}
+
+	@Transactional(readOnly = false)
+	public void insert(UploadImages entity) {
+		entity.preInsert();
+		uploadImagesMapper.insert(entity);
+	}
 }

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

@@ -1,9 +1,13 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import freemarker.template.Configuration;
 import org.activiti.crystalball.simulator.SimulationRunContext;
 import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
 import org.activiti.engine.impl.javax.el.ExpressionFactory;
@@ -17,8 +21,15 @@ import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.impl.task.TaskDefinition;
 import org.activiti.engine.runtime.Execution;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
+import org.activiti.engine.task.Task;
+import org.activiti.engine.task.TaskQuery;
+import org.ehcache.core.spi.service.ExecutionService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class MyActiviUtils {
@@ -167,4 +178,21 @@ public class MyActiviUtils {
         return j;
     }
 
+    /**
+     * 根据流程实例定义号节点名称登陆人查询节点
+     */
+    public static MyNeedList findActivity(String activityName) {
+        List<String> proInsIdList = new ArrayList<>();
+        List<String> taskIsList = new ArrayList<>();
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        List<Task> list = processEngine.getTaskService().createTaskQuery().taskName(activityName).list();
+        MyNeedList myNeedList = new MyNeedList();
+        for (Task a :list) {
+            proInsIdList.add(a.getProcessInstanceId());
+            taskIsList.add(a.getId());
+        }
+        myNeedList.setProInsIdList(proInsIdList);
+        myNeedList.setTaskIsList(taskIsList);
+        return myNeedList;
+    }
 }

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

@@ -146,7 +146,7 @@ public class ConstructionController extends BaseController {
     }
 
     /*
-              项目关闭，配网工程专职判定
+              交底:判断项目是否需要关闭
            */
     @RequestMapping(value = "speciallyForm")
     public String speciallyForm(Construction construction, Model model) {

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

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
+import java.io.IOException;
 import java.net.URLDecoder;
 
 import com.google.common.collect.Maps;
@@ -20,6 +21,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import org.activiti.engine.*;
 import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Row;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,6 +35,7 @@ import java.util.Map;
 
 /**
  * 施工交底Controller
+ *
  * @author
  * @version 2019-11-08
  */
@@ -41,32 +44,32 @@ import java.util.Map;
 
 public class DivideController extends BaseController {
 
-	@Autowired
-	private ConstructionService constructionService;
-	@Autowired
-	private ActProcessService actProcessService;
-	@Autowired
-	private ActTaskService actTaskService;
-	@Autowired
-	private DiscloseService discloseService;
-	@Autowired
-	private UploadImagesService uploadImagesService;
-	@Autowired
-	private TaskService taskService;
-	@Autowired
-	private RuntimeService runtimeService;
-	@ModelAttribute
-	public Construction get(@RequestParam(required=false) String id) {
-		Construction entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = constructionService.get(id);
-		}
-		if (entity == null){
-			entity = new Construction();
-		}
-		return entity;
-	}
-
+    @Autowired
+    private ConstructionService constructionService;
+    @Autowired
+    private ActProcessService actProcessService;
+    @Autowired
+    private ActTaskService actTaskService;
+    @Autowired
+    private DiscloseService discloseService;
+    @Autowired
+    private UploadImagesService uploadImagesService;
+    @Autowired
+    private TaskService taskService;
+    @Autowired
+    private RuntimeService runtimeService;
+
+    @ModelAttribute
+    public Construction get(@RequestParam(required = false) String id) {
+        Construction entity = null;
+        if (StringUtils.isNotBlank(id)) {
+            entity = constructionService.get(id);
+        }
+        if (entity == null) {
+            entity = new Construction();
+        }
+        return entity;
+    }
 
 
 //	/**
@@ -79,136 +82,154 @@ public class DivideController extends BaseController {
 //	}*/
 
 
-	
-
-	/**
-	 * 查看，增加，编辑请假申请表单页面
-	 */
-	@RequestMapping(value = "form/{mode}")
-	public String form(@PathVariable String mode, Construction construction, Model model) {
+    /**
+     * 查看，增加，编辑请假申请表单页面
+     */
+    @RequestMapping(value = "form/{mode}")
+    public String form(@PathVariable String mode, Construction construction, Model model) {
 
-		model.addAttribute("construction", construction);
-		if("audit".equals(mode)){
-			return "modules/sg/managementcenter/activiti/divideAudit";
-		}else{//add
-			//项目经理组织交底
-			return "modules/sg/managementcenter/activiti/divideForm";
-		}
+        model.addAttribute("construction", construction);
+        if ("audit".equals(mode)) {
+            return "modules/sg/managementcenter/activiti/divideAudit";
+        } else {//add
+            //项目经理组织交底
+            return "modules/sg/managementcenter/activiti/divideForm";
+        }
 //		return "modules/sg/managementcenter/activiti/constructionForm";
-	}
-
-	/**
-	 * 保存请假申请
-	 */
-	@ResponseBody
-	@RequestMapping(value = "save")
-	public AjaxJson save(Disclose disclose, Model model) throws Exception{
-		AjaxJson j = new AjaxJson();
-		/**
-		 * 后台hibernate-validation插件校验
-		 */
-		String errMsg = beanValidator(disclose);
-		if (StringUtils.isNotBlank(errMsg)){
-			j.setSuccess(false);
-			j.setMsg(errMsg);
-			return j;
-		}
-
-
-		/**
-		 * 流程审批
-		 */
-		if (StringUtils.isBlank(disclose.getId())){
-			//新增或编辑表单保存
-			discloseService.save(disclose);//保存
-			// 启动流程
-			ProcessDefinition p = actProcessService.getProcessDefinition(disclose.getAct().getProcDefId());
-			String title = disclose.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
-			actTaskService.startProcess(p.getKey(),  "xm_construction_clarificaiton", disclose.getId(), title);
-			j.setMsg("发起流程审批成功!");
-			j.getBody().put("targetUrl",  "/act/task/process/");
-		}else{
-			//新增或编辑表单保存
-			discloseService.save(disclose);//保存
-			disclose.getAct().setComment(("yes".equals(disclose.getAct().getFlag())?"[重新申请] ":"[销毁申请] "));
-			// 完成流程任务
-			Map<String, Object> vars = Maps.newHashMap();
-			vars.put("reapply", "yes".equals(disclose.getAct().getFlag())? true : false);
-			actTaskService.complete(disclose.getAct().getTaskId(), disclose.getAct().getProcInsId(), disclose.getAct().getComment(), disclose.getContent(), vars);
-			j.setMsg("提交成功！");
-			j.getBody().put("targetUrl",  "/act/task/todo/");
-		}
-		return j;
-	}
-
-
-	/**
-	 * 导入交底结论
-	 */
+    }
+
+    /**
+     * 保存请假申请
+     */
+    @ResponseBody
+    @RequestMapping(value = "save")
+    public AjaxJson save(Disclose disclose, Model model) throws Exception {
+        AjaxJson j = new AjaxJson();
+        /**
+         * 后台hibernate-validation插件校验
+         */
+        String errMsg = beanValidator(disclose);
+        if (StringUtils.isNotBlank(errMsg)) {
+            j.setSuccess(false);
+            j.setMsg(errMsg);
+            return j;
+        }
+
+
+        /**
+         * 流程审批
+         */
+        if (StringUtils.isBlank(disclose.getId())) {
+            //新增或编辑表单保存
+            discloseService.save(disclose);//保存
+            // 启动流程
+            ProcessDefinition p = actProcessService.getProcessDefinition(disclose.getAct().getProcDefId());
+            String title = disclose.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+            actTaskService.startProcess(p.getKey(), "xm_construction_clarificaiton", disclose.getId(), title);
+            j.setMsg("发起流程审批成功!");
+            j.getBody().put("targetUrl", "/act/task/process/");
+        } else {
+            //新增或编辑表单保存
+            discloseService.save(disclose);//保存
+            disclose.getAct().setComment(("yes".equals(disclose.getAct().getFlag()) ? "[重新申请] " : "[销毁申请] "));
+            // 完成流程任务
+            Map<String, Object> vars = Maps.newHashMap();
+            vars.put("reapply", "yes".equals(disclose.getAct().getFlag()) ? true : false);
+            actTaskService.complete(disclose.getAct().getTaskId(), disclose.getAct().getProcInsId(), disclose.getAct().getComment(), disclose.getContent(), vars);
+            j.setMsg("提交成功！");
+            j.getBody().put("targetUrl", "/act/task/todo/");
+        }
+        return j;
+    }
+
+
+    /**
+     * 旧）导入交底结论，正在使用
+     * */
+    @ResponseBody
+    @RequestMapping(value = "importConclusion")
+    public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId,String projectName) {
+        AjaxJson j = new AjaxJson();
+        try {
+            int successNum = 0;
+            int failureNum = 0;
+            StringBuilder failureMsg = new StringBuilder();
+            ImportExcel ei = new ImportExcel(file, 1, 0);
+            int lastDataRowNum = ei.getLastDataRowNum();
+            Disclose disclose = new Disclose();
+            for (int i = 1; i < lastDataRowNum; i++) {
+                Row row = ei.getRow(i);
+                disclose.setProcInsId(procInsId);
+                projectName = URLDecoder.decode(projectName, "UTF-8");
+                String requireName = ei.getCellValue(row, 1).toString();
+                if (projectName.equals(requireName)) {
+                    disclose.setRequireName(requireName);
+                    disclose.setConId(requireName);
+                    disclose.setProjectNumber(ei.getCellValue(row, 2).toString());
+                    disclose.setProjectName(ei.getCellValue(row, 3).toString());
+                    disclose.setProjectId(ei.getCellValue(row, 4).toString());
+                    disclose.setChannel(ei.getCellValue(row, 5).toString());
+                    disclose.setCapacity(ei.getCellValue(row, 6).toString());
+                    disclose.setSceneSize(ei.getCellValue(row, 7).toString());
+                    disclose.setCapacitySize(ei.getCellValue(row, 8).toString());
+                    disclose.setHiddenDanger(ei.getCellValue(row, 9).toString());
+                    disclose.setInfluenceConstruction(ei.getCellValue(row, 10).toString());
+                    disclose.setProjectRepetition(ei.getCellValue(row, 11).toString());
+                    disclose.setImplemented(ei.getCellValue(row, 12).toString());
+                    disclose.setTransformer(ei.getCellValue(row, 13).toString());
+                    disclose.setExplanationOfNecessity(ei.getCellValue(row, 14).toString());
+                    disclose.setLineName(ei.getCellValue(row, 15).toString());
+                    disclose.setQuantities(ei.getCellValue(row, 16).toString());
+                    disclose.setRodNumber(ei.getCellValue(row, 17).toString());
+                    disclose.setInconsistentDescription(ei.getCellValue(row, 18).toString());
+                    disclose.setAdministrationType(ei.getCellValue(row, 19).toString());
+                    disclose.setPrecondition(ei.getCellValue(row, 20).toString());
+                    disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 21).toString());
+                    disclose.setPlacementMode(ei.getCellValue(row, 22).toString());
+                    disclose.setProductionDate(ei.getCellValue(row, 23).toString());
+                    disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
+                    disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
+                    disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
+                }
+            }
+            try {
+                discloseService.newInsert(disclose);
+                successNum++;
+            } catch (Exception ex) {
+                failureNum++;
+                ex.printStackTrace();
+            }
+            if (failureNum > 0) {
+                failureMsg.insert(0, "，失败 " + failureNum + " 记录。");
+            }
+            j.setMsg("已成功导入 " + successNum + " 记录" + failureMsg);
+        } catch (Exception e) {
+            e.printStackTrace();
+            j.setSuccess(false);
+            j.setMsg("导入失败！失败信息：" + e.getMessage());
+        }
+        return j;
+    }
+
+
+
+    /**
+     * 新导入交底结论（未使用）
+     */
 //    @RequiresPermissions("modules:sg:information:information:import")
-	@ResponseBody
-	@RequestMapping(value = "importConclusion")
-	public AjaxJson importConclusion(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId,String projectName) {
-		AjaxJson j = new AjaxJson();
-		try {
-			int successNum = 0;
-			int failureNum = 0;
-			StringBuilder failureMsg = new StringBuilder();
-			ImportExcel ei = new ImportExcel(file, 1, 0);
-			int lastDataRowNum = ei.getLastDataRowNum();
-			Disclose disclose = new Disclose();
-			for (int i = 1; i < lastDataRowNum; i++) {
-				Row row = ei.getRow(i);
-				disclose.setProcInsId(procInsId);
-				projectName = URLDecoder.decode(projectName, "UTF-8");
-				String requireName = ei.getCellValue(row, 1).toString();
-				if (projectName.equals(requireName)) {
-					disclose.setRequireName(requireName);
-					disclose.setConId(requireName);
-					disclose.setProjectNumber(ei.getCellValue(row, 2).toString());
-					disclose.setProjectName(ei.getCellValue(row, 3).toString());
-					disclose.setProjectId(ei.getCellValue(row, 4).toString());
-					disclose.setChannel(ei.getCellValue(row, 5).toString());
-					disclose.setCapacity(ei.getCellValue(row, 6).toString());
-					disclose.setSceneSize(ei.getCellValue(row, 7).toString());
-					disclose.setCapacitySize(ei.getCellValue(row, 8).toString());
-					disclose.setHiddenDanger(ei.getCellValue(row, 9).toString());
-					disclose.setInfluenceConstruction(ei.getCellValue(row, 10).toString());
-					disclose.setProjectRepetition(ei.getCellValue(row, 11).toString());
-					disclose.setImplemented(ei.getCellValue(row, 12).toString());
-					disclose.setTransformer(ei.getCellValue(row, 13).toString());
-					disclose.setExplanationOfNecessity(ei.getCellValue(row, 14).toString());
-					disclose.setLineName(ei.getCellValue(row, 15).toString());
-					disclose.setQuantities(ei.getCellValue(row, 16).toString());
-					disclose.setRodNumber(ei.getCellValue(row, 17).toString());
-					disclose.setInconsistentDescription(ei.getCellValue(row, 18).toString());
-					disclose.setAdministrationType(ei.getCellValue(row, 19).toString());
-					disclose.setPrecondition(ei.getCellValue(row, 20).toString());
-					disclose.setPolicyHandlingInstructions(ei.getCellValue(row, 21).toString());
-					disclose.setPlacementMode(ei.getCellValue(row, 22).toString());
-					disclose.setProductionDate(ei.getCellValue(row, 23).toString());
-					disclose.setIntegrateModule(ei.getCellValue(row, 24).toString());
-					disclose.setNeedReplace(ei.getCellValue(row, 25).toString());
-					disclose.setOverallTransformation(ei.getCellValue(row, 26).toString());
-				}
-			}
-			try {
-				discloseService.newInsert(disclose);
-				successNum++;
-			} catch (Exception ex) {
-				failureNum++;
-				ex.printStackTrace();
-			}
-			if (failureNum > 0) {
-				failureMsg.insert(0, "，失败 " + failureNum + " 记录。");
-			}
-			j.setMsg("已成功导入 " + successNum + " 记录" + failureMsg);
-		} catch (Exception e) {
-			e.printStackTrace();
-			j.setSuccess(false);
-			j.setMsg("导入失败！失败信息：" + e.getMessage());
-		}
-		return j;
-	}
+    @ResponseBody
+    @RequestMapping(value = "importConclusion1")
+    public AjaxJson importConclusion1(@RequestParam("file") MultipartFile file, HttpServletResponse response, HttpServletRequest request, String procInsId, String projectName) {
+        AjaxJson j = new AjaxJson();
+        ImportExcel ei = null;
+        try {
+            ei = new ImportExcel(file, 1, 0);
+            int lastDataRowNum = ei.getLastDataRowNum();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return j;
+    }
 
 }

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

@@ -12,20 +12,28 @@
 				var cValue ="";//定义一个数组
 				var flag1 = false;//代表是否选择了设计变更/行政政处/农村民事政处的状态，false为未选择，true为选择
 				var flag2 = false;//代表是否选择了项目关闭的状态，false为未选择，true为选择
-				var flag3 = false;//代表是否选择了政策处理(行政政处)
-				var flag4 = false;//代表是否选择了政策处理(农村/民事)
+				var flag3 = false;//代表是否选择了政策处理 行政政处（城区道路）
+				var flag5 = false;//代表是否选择了农村政处
+				var flag6 = false;//代表是否选择了民事政处/行政政处（公路/水利）
 				var nValue = $('input[name="favorite"]:checked');
 				$('input[name="favorite"]:checked').each(function(){//遍历每一个名字为interest的复选框，其中选中的执行函数
+					//判断选取的值如果时pass2，flag2为true，代表选择了项目关闭，选取的值不为pass2，flag1为true代表其它类型被选择
 					if ("pass2" == $(this).val()) {
 						flag2 = true;
-					} else {
+					}else {
 						flag1 = true;
 					}
+					//判断值为pass3，代表选择了政策处理 行政政处（城区道路）
 					if ("pass3"==$(this).val()) {
 						flag3 = true;
 					}
+					//判断值为pass5，代表选择了农村政处
 					if ("pass5"==$(this).val()) {
-						flag4 = true;
+						flag5 = true;
+					}
+					//判断值为pass6，民事政处/行政政处（公路/水利）
+					if ("pass6"==$(this).val()) {
+						flag6 = true;
 					}
 					cValue=cValue+";"+($(this).val());//将选中的值添加到数组chk_value中
 				});
@@ -34,11 +42,9 @@
 					jp.error("请选择问题类型");
 				} else if(flag1==true&&flag2==true){
 					jp.error("项目关闭与其它类型问题不可同时发起");
-				}else if (flag3==true&&flag4==true){
+				}else if ((flag3==true&&flag5==true)||(flag3==true&&flag6==true)||(flag5==true&&flag6==true)){
 					jp.error("政处类型只能选择一种");
 				}else {
-/*					console.log("cValue="+cValue);
-					console.log("nValue="+nValue.size());*/
 					jp.prompt(" 审批意见", function (message) {
 						jp.post("${ctx}/act/task/artificialTask",
 						{
@@ -59,7 +65,6 @@
 						})
 					});
 				}
-				// console.log($('input[name="favorite"]:checked').val());
 			});
 			$("#no").click(function () {
 				jp.prompt("没有问题，完成交底", function (message) {
@@ -119,8 +124,9 @@
 								<td class="width-35">
 									<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
 									<input type="checkbox" name="favorite" value="pass2"> 项目关闭 &nbsp;
-									<input type="checkbox" name="favorite" value="pass3"> 政策处理(行政政处)
-									<input type="checkbox" name="favorite" value="pass5"> 政策处理(农村/民事) &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"> 行政政处（城区道路）
+									<input type="checkbox" name="favorite" value="pass5"> 农村政处
+									<input type="checkbox" name="favorite" value="pass6"> 民事政处/行政政处（公路/水利）
 								</td>
 							</tr>
 							<tr>

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

@@ -14,32 +14,41 @@
 			$("#agree").click(function () {
 				var design = $("#tuserName").val();
 				var currentFileValues = $("input[name='pic']").val();
+				var currentFileValues1 = $("input[name='pic1']").val();
+				var currentFileValues2 = $("input[name='pic2']").val();
 				if (design == "" || design == null) {
 					jp.error("请选择用户");
-				} else if (currentFileValues==""||currentFileValues==null) {
-					jp.error("请上传文件");
-				}
+				}else if (currentFileValues==""||currentFileValues==null) {
+					jp.error("请上传变更后图纸");
+				}else if (currentFileValues1==""||currentFileValues1==null) {
+					jp.error("请上传预算书");
+				}else if (currentFileValues2 == "" || currentFileValues2 == null) {
+					jp.error("请上传物资清册");
+				} else {
 				// alert(design);
 				jp.prompt("审核意见", function (message) {
 					jp.post("${ctx}/act/task/designUpload",
-							{
-								"taskId":"${uploadImages.act.taskId}",
-								"taskName":"${uploadImages.act.taskName}",
-								"taskDefKey":"${uploadImages.act.taskDefKey}",
-								"procInsId":"${uploadImages.act.procInsId}",
-								"procDefId":"${uploadImages.act.procDefId}",
-								"flag":"yes",
-								"pic":currentFileValues,
-								"design":design,
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
+					{
+						"taskId":"${uploadImages.act.taskId}",
+						"taskName":"${uploadImages.act.taskName}",
+						"taskDefKey":"${uploadImages.act.taskDefKey}",
+						"procInsId":"${uploadImages.act.procInsId}",
+						"procDefId":"${uploadImages.act.procDefId}",
+						"flag":"yes",
+						"pic":currentFileValues,
+						"pic1":currentFileValues1,
+						"pic2": currentFileValues2,
+						"design":design,
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}
+					})
 				});
+				}
 			});
 		});
 	</script>
@@ -77,11 +86,21 @@
 								<td class="width-35">
 									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
 								</td>--%>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>上传变更后图纸：</label></td>
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
 							</tr>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>预算书：</label></td>
+								<td class="width-35">
+									<sys:fileUpload  path="pic1" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>物资清册：</label></td>
+								<td class="width-35">
+									<sys:fileUpload  path="pic2" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
+								</td>
+							</tr>
 							</tbody>
 						</table>
 						<div class="form-group">

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

@@ -16,27 +16,6 @@
 
 
         $("#agree").click(function () {
-            /*	var conId = $("#id").val();
-                var channel = $("#channel").val();
-                var capacity = $("#capacity").val();
-                var sceneSize = $("#sceneSize").val();
-                var capacitySize = $("#capacitySize").val();
-                var hiddenDanger = $("#hiddenDanger").val();
-                var influenceConstruction = $("#influenceConstruction").val();
-                var projectRepetition = $("#projectRepetition").val();
-                var implemented = $("#implemented").val();
-                var transformer = $("#transformer").val();
-                var lineName = $("#lineName").val();
-                var quantities = $("#quantities").val();
-                var rodNumber = $("#rodNumber").val();
-                var administrationType = $("#administrationType").val();
-                var politicalProblem = $("#politicalProblem").val();
-                var precondition = $("#precondition").val();
-                var placementMode = $("#placementMode").val();
-                var productionDate = $("#productionDate").val();
-                var IntegrateModule = $("#IntegrateModule").val();
-                var needReplace = $("#needReplace").val();
-                var overallTransformation = $("#overallTransformation").val();*/
             jp.prompt("备注说明", function (message) {
                 jp.post("${ctx}/act/task/audit3",
                     {
@@ -47,27 +26,6 @@
                         "procDefId": "${construction.act.procDefId}",
                         "flag": "yes",
                         "comment": window.encodeURI(message)
-                        /*"conId":conId,
-                        "channel":channel,
-                        "capacity":capacity,
-                        "sceneSize":sceneSize,
-                        "capacitySize":capacitySize,
-                        "hiddenDanger":hiddenDanger,
-                        "influenceConstruction":influenceConstruction,
-                        "projectRepetition":projectRepetition,
-                        "implemented":implemented,
-                        "transformer":transformer,
-                        "lineName":lineName,
-                        "quantities":quantities,
-                        "rodNumber":rodNumber,
-                        "administrationType":administrationType,
-                        "politicalProblem":politicalProblem,
-                        "precondition":precondition,
-                        "placementMode":placementMode,
-                        "productionDate":productionDate,
-                        "IntegrateModule":IntegrateModule,
-                        "needReplace":needReplace,
-                        "overallTransformation":overallTransformation*/
                     },
                     function (data) {
                         if (data.success) {

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

@@ -121,6 +121,11 @@ $(document).ready(function() {
 		        }
 		       
 		    },{
+				   field: 'imgName',
+				   title: '上传用途',
+				   sortable: true,
+				   sortName: 'imgName',
+			   },{
 				   field: 'uId',
 				   title: '上传人员',
 				   sortable: true,

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

@@ -105,7 +105,7 @@
 									</select>--%>
 								</td>
 							</tr>
-							<tr>
+				<%--			<tr>
 								<td class="width-15 active"><label class="pull-right">是否方案变更：</label></td>
 								<td class="width-35">
 									<select id="fabg"  class=" form-control">
@@ -117,7 +117,7 @@
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
-							</tr>
+							</tr>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
 								<td class="width-35">

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

@@ -116,11 +116,11 @@
 						<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-15 active"><label class="pull-right"> 申请人：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.userName)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审核人：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 审核人：</label></td>
 								<td class="width-35">
 									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
@@ -141,7 +141,7 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>选择用户：</label></td>
 								<td class="width-35">
 									<sys:userselect roleName="经研所;设计单位人员"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
@@ -169,7 +169,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerLine)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 停电范围（中间统一用中文分号）：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.blackoutArea)}
 								</td>
@@ -179,7 +179,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.projectType)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 政处初步判断：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.preliminaryJudgment)}
 								</td>
@@ -189,7 +189,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.civilEngineering)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 钢管杆基础类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.baseType)}
 								</td>
@@ -199,7 +199,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.planApproval)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 设备改造类型：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationType)}
 								</td>
@@ -209,7 +209,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.transformationEquipment)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否含新设备命名：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.newNamed)}
 								</td>
@@ -219,7 +219,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.putInto)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否含非涉电电气施工：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.electricalConstruction)}
 								</td>
@@ -229,7 +229,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.theAssignment)}
 							</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否含自动化：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.automation)}
 								</td>
@@ -239,7 +239,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.remote)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 通信方式：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.communicationMode)}
 								</td>
@@ -249,7 +249,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.inSitu)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 环网柜DTU户外或户内：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.networkCabinet)}
 								</td>
@@ -259,7 +259,7 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.station)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否为停电打包项目：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.powerFailure)}
 								</td>
@@ -269,7 +269,7 @@
 								<td class="width-35">
 										${construction.disclose.channel}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 设备基础是否可以扩容：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacity}
 										<%--<select id="capacity"  maxlength="100"  class=" form-control">
@@ -283,7 +283,7 @@
 								<td class="width-35">
 										${construction.disclose.sceneSize}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 最多可扩容尺寸：</label></td>
 								<td class="width-35">
 										${construction.disclose.capacitySize}
 								</td>
@@ -293,7 +293,7 @@
 								<td class="width-35">
 										${construction.disclose.hiddenDanger}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在低压或通信线等影响施工：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否存在低压或通信线等影响施工：</label></td>
 								<td class="width-35">
 										${construction.disclose.influenceConstruction}
 								</td>
@@ -303,7 +303,7 @@
 								<td class="width-35">
 										${construction.disclose.projectRepetition}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否已实施：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否已实施：</label></td>
 								<td class="width-35">
 										${construction.disclose.implemented}
 								</td>
@@ -313,7 +313,7 @@
 								<td class="width-35">
 										${construction.disclose.transformer}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>线路名称一致性：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 线路名称一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.lineName}
 								</td>
@@ -323,7 +323,7 @@
 								<td class="width-35">
 										${construction.disclose.quantities}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备、开关、杆号一致性：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 设备、开关、杆号一致性：</label></td>
 								<td class="width-35">
 										${construction.disclose.rodNumber}
 								</td>
@@ -333,7 +333,7 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 是否存在严重政处问题（预判）：</label></td>
 								<td class="width-35">
 								</td>
 							</tr>
@@ -342,7 +342,7 @@
 								<td class="width-35">
 										${construction.disclose.precondition}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
 								<td class="width-35">
 										${construction.disclose.placementMode}
 								</td>
@@ -352,7 +352,7 @@
 								<td class="width-35">
 										${construction.disclose.productionDate}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 二次是否是集成模块：</label></td>
 								<td class="width-35">
 										${construction.disclose.integrateModule}
 								</td>
@@ -362,7 +362,7 @@
 								<td class="width-35">
 										${construction.disclose.needReplace}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 										${construction.disclose.overallTransformation}
 								</td>