驳回人员不通过记录表格记录发起人员，通过节点的名称查询人员

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

@@ -12,6 +12,7 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.ProcessPersonnel;
 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;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;
@@ -1240,9 +1241,15 @@ public class ActTaskService extends BaseService {
 			vars.put("design", design);
 		} else {
 			vars.put("manager", true);
-			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
-			String projectManager = loginName.getProjectManager();
-			vars.put("design", projectManager);
+			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!="") {
+				vars.put("design",manager2);
+				System.out.println(manager2);
+			}
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1404,7 +1411,21 @@ public class ActTaskService extends BaseService {
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("yes".equals(act.getFlag())?"operators":"processer",fullName);
+		String flag = act.getFlag();
+		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!="") {
+				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);
 		vars.put("flagYes","yes".equals(act.getFlag())?true:false);
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);

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

@@ -14,12 +14,12 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActModelService;
 
+import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.websocket.service.system.SystemInfoSocketHandler;
+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;
@@ -29,17 +30,14 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionServ
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
-import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
-import groovy.util.IFileNameFinder;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
-import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.RepositoryServiceImpl;
-import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
 import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
 import org.activiti.engine.impl.pvm.PvmActivity;
@@ -108,12 +106,25 @@ public class ActTaskController extends BaseController {
 	@Autowired
 	private ProjectService projectService;
 
+	@Autowired
+	private ActModelService actModelService;
+
 	/**
 	 * 获取待办列表
 	 * @return
 	 */
 	@RequestMapping(value = {"todo", ""})
-	public String todoList(Act act, HttpServletResponse response, Model model) throws Exception {
+	public String todoList(Act act, HttpServletRequest request,HttpServletResponse response, Model model) throws Exception {
+		Page<org.activiti.engine.repository.Model> page2 = actModelService.modelList(
+				new Page<org.activiti.engine.repository.Model>(request, response), "");
+		List<org.activiti.engine.repository.Model> list2 = page2.getList();
+		List a = new ArrayList();
+		a.add("全部流程");
+		for (org.activiti.engine.repository.Model newList : list2) {
+			String name = newList.getName();
+			a.add(name);
+		}
+		model.addAttribute("act", a);
 		return "modules/bpm/task/todo/taskTodoList";
 	}
 
@@ -121,7 +132,6 @@ public class ActTaskController extends BaseController {
 	@RequestMapping(value = "todo/data")
 	public  Map<String, Object> todoListData(Act act, HttpServletRequest request,HttpServletResponse response, Model model) throws Exception {
 		Page<HashMap<String,String>> page = actTaskService.todoList(new  Page<HashMap<String,String>>(request, response),act);
-		Map<String, Object> map = new HashMap<String, Object>();
 		return getBootstrapData(page);
 	}
 	
@@ -722,6 +732,8 @@ 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);
@@ -808,6 +820,7 @@ public class ActTaskController extends BaseController {
 	@RequestMapping(value = "speciallyTask")
 	public AjaxJson speciallyTask(Act act,String fullName,String tuser,Construction construction) {
 		AjaxJson j = new AjaxJson();
+
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);

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

@@ -1,7 +1,9 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.utils;
 
 import com.jeeplus.common.utils.StringUtils;
+import org.activiti.crystalball.simulator.SimulationRunContext;
 import org.activiti.engine.*;
+import org.activiti.engine.history.HistoricActivityInstance;
 import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
 import org.activiti.engine.impl.javax.el.ExpressionFactory;
@@ -19,14 +21,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
-public class myActiviUtils {
+public class MyActiviUtils {
     @Autowired
     private TaskService taskService;
     @Autowired
     private RuntimeService runtimeService;
     /**
      * 获取下一个用户任务信息
-     * @param String taskId     任务Id信息
+     * @param  taskId     任务Id信息
      * @return  下一个用户任务用户组信息
      * @throws Exception
      */
@@ -130,9 +132,9 @@ public class myActiviUtils {
 
     /**
      * 根据key和value判断el表达式是否通过信息
-     * @param String key    el表达式key信息
-     * @param String el     el表达式信息
-     * @param String value  el表达式传入值信息
+     * @param  key    el表达式key信息
+     * @param  el     el表达式信息
+     * @param  value  el表达式传入值信息
      * @return
      */
     public boolean isCondition(String key, String el, String value) {
@@ -143,4 +145,26 @@ public class myActiviUtils {
         return (Boolean) e.getValue(context);
     }
 
+
+    /**
+     * 根据流程定义号、节点名称，查询节点的审批人
+     */
+    public static String findHistoryActivity(String proInsId,String activityName) {
+        String j = "";
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        HistoricActivityInstance hais = processEngine.getHistoryService()
+                .createHistoricActivityInstanceQuery()
+                .processInstanceId(proInsId)
+                .activityName(activityName)
+                .singleResult();
+        if (hais!=null) {
+            System.out.println("活动id：" + hais.getActivityId()
+                    + "   审批人：" + hais.getAssignee()
+                    + "   任务id：" + hais.getTaskId());
+            System.out.println("************************************");
+            j = hais.getAssignee();
+        }
+        return j;
+    }
+
 }

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

@@ -2,62 +2,28 @@
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
-import com.jeeplus.modules.sys.entity.Office;
 
 import java.util.*;
 
-import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.core.persistence.Page;
 
 import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.act.utils.ProcessDefCache;
-import com.jeeplus.modules.sg.audit.information.utils.ImportInformation;
-import com.jeeplus.modules.sg.audit.record.entity.Record;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
-import com.jeeplus.modules.sg.managementcenter.activiti.utils.myActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
-import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.test.activiti.entity.OALeave;
-import com.jeeplus.modules.test.activiti.service.OALeaveService;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataMain1;
-import com.sun.org.apache.xpath.internal.operations.Mod;
-import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.bpmn.model.Process;
-import org.activiti.bpmn.model.UserTask;
 import org.activiti.engine.*;
-import org.activiti.engine.delegate.Expression;
-import org.activiti.engine.history.HistoricTaskInstance;
-import org.activiti.engine.impl.RepositoryServiceImpl;
-import org.activiti.engine.impl.TaskServiceImpl;
-import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
-import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.pvm.PvmActivity;
-import org.activiti.engine.impl.pvm.PvmTransition;
-import org.activiti.engine.impl.pvm.process.ActivityImpl;
-import org.activiti.engine.impl.task.TaskDefinition;
 import org.activiti.engine.repository.ProcessDefinition;
-import org.activiti.engine.task.Task;
-import org.apache.poi.ss.formula.functions.T;
-import org.apache.poi.ss.usermodel.Row;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
 
 /**
  * 施工交底Controller

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

@@ -3,46 +3,24 @@
  */
 package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.act.entity.Act;
-
 import java.net.URLDecoder;
-import java.util.Date;
-import com.jeeplus.modules.sys.entity.User;
 
 import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
-import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
-import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
-import com.jeeplus.modules.sg.managementcenter.activiti.utils.myActiviUtils;
-import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.test.pic.entity.TestPic;
 import org.activiti.engine.*;
-import org.activiti.engine.delegate.Expression;
-import org.activiti.engine.impl.RepositoryServiceImpl;
-import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
-import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.pvm.PvmActivity;
-import org.activiti.engine.impl.pvm.PvmTransition;
-import org.activiti.engine.impl.pvm.process.ActivityImpl;
-import org.activiti.engine.impl.task.TaskDefinition;
 import org.activiti.engine.repository.ProcessDefinition;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.task.Task;
 import org.apache.poi.ss.usermodel.Row;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -51,10 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * 施工交底Controller

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -1,6 +1,7 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
+	var name = $("#empty").val();
 	$('#actTable').bootstrapTable({
 		 
 		  //请求方法
@@ -37,7 +38,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${ctx}/act/task/todo/data",
+               url: "${ctx}/act/task/todo/data?",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         
@@ -50,34 +51,29 @@ $(document).ready(function() {
                },
                //分页方式：client客户端分页，server服务端分页（*）
                sidePagination: "server",
-
 				onShowSearch: function () {
 					$("#search-collapse").slideToggle();
 				},
-               columns: [{
+               columns: [/*{
 		        checkbox: true
 		       
 		    }
 
-			,{
+			,*/{
 		        field: 'vars.title',
 		        title: '实例标题'
 		       
 		    },{
-                       field: 'procDef.name',
-                       title: '流程名称'
-
-                   }
+			   field: 'procDef.name',
+			   title: '流程名称'
+		   }
 			,{
 		        field: 'task.name',
 		        title: '当前环节'
-		       
 		    }
-
 			,{
 		        field: 'vars.userName',
 		        title: '流程发起人'
-		       
 		    }
 			,{
 		        field: 'task.createTime',

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.jsp

@@ -22,10 +22,8 @@
 		<div class="accordion-inner">
 			<form:form id="searchForm" modelAttribute="act" class="form form-horizontal well clearfix">
 			 <div class="col-xs-12 col-sm-6 col-md-4">
-				<label class="label-item single-overflow pull-left" title="流程类型：">流程类型：</label>
-				<form:select path="procDefKey"  class="form-control m-b">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('act_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+				<label class="label-item single-overflow pull-left" title="流程名称：">流程名称：</label>
+				<form:select path="empty"  items="${act}"  class="form-control m-b">
 				</form:select>
 			</div>
 			 <div class="col-xs-12 col-sm-6 col-md-4">

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

@@ -32,11 +32,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"/>
@@ -67,7 +67,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>
@@ -77,7 +77,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>
@@ -87,7 +87,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>
@@ -97,7 +97,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>
@@ -107,7 +107,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>
@@ -117,7 +117,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>
@@ -127,7 +127,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>
@@ -137,7 +137,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>
@@ -147,7 +147,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>
@@ -157,7 +157,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>
@@ -167,7 +167,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='channel'  name="channel" class="form-control required"  value="${construction.disclose.channel}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备基础是否可以扩容：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 设备基础是否可以扩容：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='capacity'  name="capacity" class="form-control required"  value="${construction.disclose.capacity}"/>
 										<%--<select id="capacity"  maxlength="100"  class=" form-control">
@@ -181,7 +181,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='sceneSize'  name="sceneSize" class="form-control required"  value="${construction.disclose.sceneSize}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>最多可扩容尺寸：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 最多可扩容尺寸：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='capacitySize'  name="capacitySize" class="form-control required"  value="${construction.disclose.capacitySize}"/>
 								</td>
@@ -191,7 +191,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='hiddenDanger'  name="hiddenDanger" class="form-control required"  value="${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">
 									<input type='text' readonly="readonly" id='influenceConstruction'  name="influenceConstruction" class="form-control required"  value="${construction.disclose.influenceConstruction}"/>
 								</td>
@@ -201,7 +201,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='projectRepetition'  name="projectRepetition" class="form-control required"  value="${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">
 									<input type='text' readonly="readonly" id='implemented'  name="implemented" class="form-control required"  value="${construction.disclose.implemented}"/>
 								</td>
@@ -217,7 +217,7 @@
 								</td>
 							</tr>
 							<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">
 									<input type='text' readonly="readonly" id='lineName'  name="lineName" class="form-control required"  value="${construction.disclose.lineName}"/>
 								</td>
@@ -228,11 +228,11 @@
 
 							</tr>
 							<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">
 									<input type='text' readonly="readonly" id='rodNumber'  name="rodNumber" class="form-control required"  value="${construction.disclose.rodNumber}"/>
 								</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">
 									<input type='text' readonly="readonly" id='inconsistentDescription'  name="overallTransformation" class="form-control required"  value="${construction.disclose.inconsistentDescription}"/>
 								</td>
@@ -255,7 +255,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='policyHandlingInstructions'  name="needReplace" class="form-control required"  value="${construction.disclose.policyHandlingInstructions}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>DTU安放方式核查：</label></td>
+								<td class="width-15 active"><label class="pull-right"> DTU安放方式核查：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='placementMode'  name="placementMode" class="form-control required"  value="${construction.disclose.placementMode}"/>
 								</td>
@@ -266,7 +266,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='productionDate'  name="productionDate" class="form-control required"  value="${construction.disclose.productionDate}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>二次是否是集成模块：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 二次是否是集成模块：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='IntegrateModule'  name="IntegrateModule" class="form-control required"  value="${construction.disclose.integrateModule}"/>
 								</td>
@@ -277,7 +277,7 @@
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='needReplace'  name="needReplace" class="form-control required"  value="${construction.disclose.needReplace}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备是否有整体改造的必要：</label></td>
+								<td class="width-15 active"><label class="pull-right"> 设备是否有整体改造的必要：</label></td>
 								<td class="width-35">
 									<input type='text' readonly="readonly" id='overallTransformation'  name="overallTransformation" class="form-control required"  value="${construction.disclose.overallTransformation}"/>
 								</td>

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

@@ -91,7 +91,6 @@
 							</tbody>
 						</table>
 					</form:form>
-					<c:if test="${oALeave.act.taskDefKey != '' && !oALeave.act.finishTask && oALeave.act.isNextGatewaty}">
 					<div class="row">
 						<div class="col-sm-3"></div>
 						<div class="col-sm-6">
@@ -101,7 +100,6 @@
 							</div>
 						</div>
 					</div>
-					</c:if>
 					<c:if test="${not empty uploadImages.id}">
 						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
 						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />