流程发起后，下个流程接收人，从项目信息表种获取

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

@@ -13,6 +13,7 @@ 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.utils.MyActiviUtils;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;
@@ -1139,7 +1140,8 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
-		vars.put("processer","项目经理");
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		vars.put("processer",user.getProjectManageRole());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -1153,7 +1155,7 @@ public class ActTaskService extends BaseService {
 		* pass1 = 设计变更
 		* pass2 = 项目关闭
 		* pass3 = 政策处理（城区道路）
-		* pass4 = 完成施工交底
+		* pass4 = 驳回施工单位
 		* pass5 = 政策处理（农场/民事）
 		* */
 		boolean pass1 = false;
@@ -1200,19 +1202,23 @@ public class ActTaskService extends BaseService {
 		} else {
 			if (pass1 == true) {
 				vars.put("pass1", true);
-				vars.put("design", "运行人员");
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("design", user.getRunUnitRole());
 			}
 			if (pass2 == true) {
 				vars.put("pass2", true);
-				vars.put("itemClose", "专职");
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("itemClose", user.getDistributionEngineering());
 			}
 			if (pass3 == true) {
 				vars.put("pass3", true);
-				vars.put("coveredPerson", "施工单位");
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("coveredPerson", user.getConstructionUnitRole());
 			}
 			if (pass5 == true) {
 				vars.put("pass5", true);
-				vars.put("policy", "政策处理");
+				Project user = MyActiviUtils.findUser(act.getProcInsId());
+				vars.put("policy", user.getDistributionPolicy());
 			}
 			vars.put("pass", true);
 			act.setComment("[存在问题]" + act.getComment());
@@ -1444,7 +1450,8 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-			vars.put("operators", fullName);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("operators", user.getRunUnitRole());
 		} else {
 			//驳回到项目经理人工判断问题
 			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
@@ -1494,7 +1501,8 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		if ("yes".equals(flag)) {
-			vars.put("systemfulltime", fullTime);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("systemfulltime", user.getDistributionSystem());
 		} else {
 			String itemClose = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断项目是否需要关闭");
 			vars.put("itemClose",itemClose );
@@ -1517,17 +1525,18 @@ public class ActTaskService extends BaseService {
 		vars.put("pass3", false);
 		vars.put("reject", false);
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("pass3".equals(flag)) {
 			vars.put("pass3", true);
 			vars.put("policy", UserUtils.getUser().getLoginName());
 			act.setComment("[通过]"+act.getComment());
 		} else if ("pass1".equals(flag)) {
 			vars.put("pass1", true);
-			vars.put("design", "运行人员");
+			vars.put("design", user.getRunUnitRole());
 			act.setComment("[设计变更]"+act.getComment());
 		} else if ("pass2".equals(flag)) {
 			vars.put("pass2", true);
-			vars.put("itemClose", "专职");
+			vars.put("itemClose", user.getDistributionEngineering());
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
@@ -1535,10 +1544,8 @@ public class ActTaskService extends BaseService {
 			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());
 		}
@@ -1717,7 +1724,8 @@ public class ActTaskService extends BaseService {
 		vars.put("sealYes", false);
 		vars.put("sealNo", false);
 		if ("yes".equals(flag)) {
-			vars.put("sealPerson",fullName);
+			Project user = MyActiviUtils.findUser(act.getProcInsId());
+			vars.put("sealPerson",user.getDistributionPolicy());
 			act.setComment("[没有问题]"+act.getComment());
 			vars.put("sealYes", true);
 		} else {
@@ -1725,10 +1733,8 @@ public class ActTaskService extends BaseService {
 			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);
@@ -1782,7 +1788,7 @@ public class ActTaskService extends BaseService {
 			act.setComment("[重新发起]"+act.getComment());
 			vars.put("phaseYes", true);
 		} else {
-			act.setComment("[驳回]" + act.getComment());
+			act.setComment("[无需发起，结束流程]" + act.getComment());
 			vars.put("phaseNo", true);
 		}
 		// 设置意见

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

@@ -461,11 +461,6 @@ public class ActTaskController extends BaseController {
 	public AjaxJson policiesChange(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
-			ProcessPersonnel processPersonnel = new ProcessPersonnel();
-			processPersonnel.setProcInsId(act.getProcInsId());
-			//设置
-			processPersonnel.setRuralCivil(UserUtils.getUser().getLoginName());
-			processPersonnelService.newUpdate(processPersonnel);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.policiesChange(act);

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

@@ -6,6 +6,8 @@ import com.jeeplus.modules.sg.audit.information.service.InformationService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.FindTask;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.MyNeedList;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
+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 freemarker.template.Configuration;
 import org.activiti.crystalball.simulator.SimulationRunContext;
@@ -42,6 +44,9 @@ public class MyActiviUtils {
     private RuntimeService runtimeService;
     @Autowired
     private static ConstructionService constructionService = SpringContextHolder.getBean(ConstructionService.class);
+    @Autowired
+    private static ProjectService projectService = SpringContextHolder.getBean(ProjectService.class);
+
     /**
      * 获取下一个用户任务信息
      * @param  taskId     任务Id信息
@@ -208,4 +213,11 @@ public class MyActiviUtils {
         }
         return findTaskList;
     }
+    /**
+     * 根据项目名称查询人员
+     * */
+    public static Project findUser(String procInsId){
+        Project user = projectService.findUser(procInsId);
+        return user;
+    }
 }

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

@@ -23,6 +23,7 @@ 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.sg.managementcenter.activiti.utils.MyImportUtils;
+import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import org.activiti.engine.*;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -304,12 +305,13 @@ public class DivideController extends BaseController {
                 for (Disclose d : taskList) {
                     Map<String, Object> vars = Maps.newHashMap();
                     String precondition = d.getPrecondition();
+                    Project user = MyActiviUtils.findUser(d.getProcInsId());
                     if (precondition != null && !"".equals(precondition)) {
                         vars.put("pass4", true);
-                        vars.put("processer", "项目经理");
+                        vars.put("processer", user.getProjectManageRole());
                     } else {
                         vars.put("pass4", true);
-                        vars.put("processer", "项目经理");
+                        vars.put("processer", user.getProjectManageRole());
                     }
                     actTaskService.complete(d.getTaskId(), d.getProcInsId(), "系统判断成功，请自行查看", vars);
                 }

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

@@ -32,4 +32,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     int insertList(@Param("list") List<Project> list);
 
     List<Project> findListProject(List<Project> projects);
+
+    Project findUser(String procInsId);
 }

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

@@ -491,4 +491,21 @@
 		</if>
 	</select>
 
+	<select id="findUser"  resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
+		select project_manage_role
+			,distribution_engineering
+			,distribution_materials
+			,distribution_system
+			,distribution_policy
+			,management_leader
+			,run_unit
+			,run_unit_role
+			,through_research_role
+			,construction_unit
+			,construction_unit_role
+			,design_unit
+			,design_unit_role
+		FROM xm_project_details
+		WHERE require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id=#{procInsId});
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -123,4 +123,8 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 	public List<Project> getListProject(List<Project> projects){
 		return  projectMapper.findListProject(projects);
 	}
+
+	public Project findUser(String procInsId) {
+		return projectMapper.findUser(procInsId);
+	}
 }

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

@@ -106,17 +106,6 @@
 <%--						<input type="text" value="${construction.disclose.channel}">--%>
 						<table class="table table-bordered">
 							<tbody>
-<%--							<tr>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.userName)}
-								</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"/>
-								</td>
-							</tr>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
 								<td class="width-35">