驳回人员根据变更的节点名称变更，上传文件，附加上传文件的用途记录

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

@@ -1111,8 +1111,9 @@ public class ActTaskService extends BaseService {
 			vars.put("design", design);
 		} else {
 			act.setComment("[驳回] " + act.getComment());
-
-			vars.put("design", "运行人员");
+			//查找判定设计变更的操作人
+			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判定设计变更");
+			vars.put("design", manager);
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1246,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();
@@ -1316,8 +1317,8 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			vars.put("design", design);
 		} else {
-
-			vars.put("design","项目");
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:重新设计");
+			vars.put("design",manager2);
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1337,11 +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 {
-			vars.put("design", design);
+		//驳回
+			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:运行人员判断变更后材料");
+			vars.put("design", manager2);
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1424,7 +1428,7 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
-	 * 保存项目关闭 专职审批意见
+	 * 交底:判断项目是否需要关闭
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1440,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);
@@ -1478,8 +1476,9 @@ public class ActTaskService extends BaseService {
 		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
+
 	/**
-	 * 保存项目关闭 运行人员审批意见
+	 * 项目关闭 配网运行人员
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1487,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);
@@ -1523,7 +1529,15 @@ public class ActTaskService extends BaseService {
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
-			vars.put("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());
 		}
 		// 设置意见
@@ -1543,7 +1557,8 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-			vars.put("policy", "政策处理");
+			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
+			vars.put("policy", policy);
 			act.setComment("【需要政策处理】" + act.getComment());
 		} else {
 			act.setComment("【无需政策处理】" + act.getComment());
@@ -1569,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();
@@ -1592,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();
@@ -1616,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();
@@ -1638,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();
@@ -1686,7 +1705,7 @@ public class ActTaskService extends BaseService {
 
 
 	/**
-	 * 政策处理：施工单位人员上传未覆盖盖章
+	 * 行政政处(城区道路)：施工单位人员上传未覆盖盖章
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1700,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);
 		}
@@ -1725,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);
 		}
@@ -1747,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 {
@@ -1776,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);
 		}
@@ -1802,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);
 		}
@@ -1827,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

@@ -486,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);
@@ -530,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);
 			}
@@ -556,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);
 			}
@@ -581,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);
 			}
@@ -606,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;
 			}
 		}
@@ -620,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);
@@ -667,24 +680,24 @@ public class ActTaskController extends BaseController {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("变更后图纸");
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				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);
@@ -774,7 +787,6 @@ public class ActTaskController extends BaseController {
 		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);//设计变更
 		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);//项目关闭
 		String flagDeal =actTaskService.newJudgeDeal(disclose);
-		//前置条件为
 		if (null==disclose.getPrecondition()||"".equals(disclose.getPrecondition())){
 			if (flagItemCLose){
 				if (null==disclose.getExplanationOfNecessity()||disclose.getExplanationOfNecessity().equals("")){
@@ -817,7 +829,7 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 	/*
-		项目关闭：专职
+		交底:判断项目是否需要关闭
 	 */
 	@ResponseBody
 	@RequestMapping(value = "speciallyTask")
@@ -945,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);
 			}
@@ -962,7 +975,7 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 	/*
-		政策处理：施工单位人员上传覆盖盖章
+		政策处理：施工单位人员上传盖章施工方案
 	 */
 	@ResponseBody
 	@RequestMapping(value = "sealTask")
@@ -972,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);
 			}
@@ -1017,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);
 			}
@@ -1044,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);
 			}
@@ -1057,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/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/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/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>