流程发起人员通过获取流程id，查询项目，查询流程负责人，发起流程

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Construction.java

@@ -82,6 +82,8 @@ public class Construction extends ActEntity<Construction> {
     private String overallTransformation;
     //
     private Disclose disclose;
+    //记录需求提出单位
+    private String demandUnit;
 
     public Disclose getDisclose() {
         return disclose;
@@ -476,4 +478,12 @@ public class Construction extends ActEntity<Construction> {
     public void setOverallTransformation(String overallTransformation) {
         this.overallTransformation = overallTransformation;
     }
+
+    public String getDemandUnit() {
+        return demandUnit;
+    }
+
+    public void setDemandUnit(String demandUnit) {
+        this.demandUnit = demandUnit;
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -59,6 +59,7 @@
     <select id="get" resultMap="ConstructionResult">
         SELECT
         <include refid="constructionColumns"/>,
+        b.demand_unit AS "demandUnit",
 		b.power_line AS "powerLine",
 		b.power_scope AS "blackoutArea",
 		b.project_type AS "projectType",

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

@@ -67,49 +67,12 @@ public class ConstructionController extends BaseController {
      */
     @RequestMapping(value = "form/{mode}")
     public String form(@PathVariable String mode, Construction construction, Model model) {
-//        String proId = construction.getAct().getProcDefId();
-//        String pInId = construction.getProcInsId();
-//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-//        RepositoryService rs = processEngine.getRepositoryService();
         //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
 //		model.addAttribute("roleCodes");
         if ("add".equals(mode) || "edit".equals(mode)) {
             return "modules/sg/managementcenter/activiti/constructionForm";
         } else {//audit(施工单位，项目经理组织交底)
-           /* List<Task> tasks = taskService.createTaskQuery().processInstanceId(pInId).list();
-            //对流程循环
-            for (Task task : tasks) {
-                //根据流程的定义号获取信息
-                ProcessDefinitionEntity def = (ProcessDefinitionEntity) ((RepositoryServiceImpl) rs).getDeployedProcessDefinition(task.getProcessDefinitionId());
-                //获取流程中所有的节点信息
-                List<ActivityImpl> activitiList = def.getActivities();  //rs是指RepositoryService的实例
-                String excId = task.getExecutionId();
-                ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(excId).singleResult();
-                //获取当前节点id
-                String activitiId = execution.getActivityId();
-                for (ActivityImpl activityImpl : activitiList) {
-                    String id = activityImpl.getId();
-                    if (activitiId.equals(id)) {
-                        System.out.println("当前任务：" + activityImpl.getProperty("name")); //输出某个节点的某种属性
-                        List<PvmTransition> outTransitions = activityImpl.getOutgoingTransitions();//获取从某个节点出来的所有线路
-                        for (PvmTransition tr : outTransitions) {
-                            PvmActivity ac = tr.getDestination();//获取线路的终点节点
-                            List<PvmTransition> outgoingTransitions = ac.getOutgoingTransitions();
-                            for (PvmTransition tr2 : outgoingTransitions) {
-                                PvmActivity ac2 = tr2.getDestination();//获取线路的终点节点
-                                ActivityImpl activityImpl2 = def.findActivity(ac2.getId());
-                                TaskDefinition taskDef = (TaskDefinition) activityImpl2.getProperties().get("taskDefinition");
-                                if (taskDef != null) {
-                                    Set<Expression> roleCodes = taskDef.getCandidateGroupIdExpressions();//候选组
-                                    System.out.println("候选组是" + roleCodes.toString());
-                                }
-                            }
-                        }
-                        break;
-                    }
-                }
-            }*/
             return "modules/sg/managementcenter/activiti/constructionAudit";
         }
 
@@ -133,11 +96,8 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 配网运行人员
+     * 配网运行人员判定设计变更
      * */
-    /**
-     * 查看，增加，编辑请假申请表单页面
-     */
     @RequestMapping(value = "operatorDesignChange")
     public String form3(Construction construction, Model model) {
         //根据流程定义号获取所有的定义流程
@@ -297,9 +257,7 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/documentsForm";
     }
 
-    public void updateStatus(String status, String id) {
 
-    }
 
     /**
      * 保存请假申请
@@ -343,7 +301,7 @@ public class ConstructionController extends BaseController {
         List<Project> listById = projectService.findListById(proListId);
         //循环项目信息
             for (Project each : listById) {
-                //从项目信息种获取施工单位字段
+                //从项目信息种获取交底类型
                 constructionUnit = each.getClarificaitonType();
                 //如果施工单位不为空，系统判读施工单位交底
                 if ("施工单位自行交底".equals(constructionUnit)) {

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

@@ -11,6 +11,7 @@ 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.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
@@ -155,6 +156,17 @@ public class UploadController extends BaseController {
 	}
 
 	/**
+	 * 交底:运行人员审核图纸
+	 * */
+	@RequestMapping(value = "auditDrawings")
+	public String auditDrawings(UploadImages uploadImages, Model model) {
+		//根据流程定义号获取所有的定义流程
+		model.addAttribute("uploadImages", uploadImages);
+		return "modules/sg/managementcenter/activiti/auditDrawings";
+	}
+
+
+	/**
 	 * 查看，增加，编辑图片管理表单页面
 	 */
 	@RequestMapping(value = "imagesForm")

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

@@ -0,0 +1,86 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>运行人员审核图纸</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="economicsDesignChange.js"%>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+			$("#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 (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,
+						"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>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<table id="testPicTable"   data-toolbar="#toolbar"></table>
+				<div class="panel-body">
+					<div class="row">
+						<div class="col-sm-3"></div>
+						<div class="col-sm-6">
+							<div class="form-group text-center">
+								<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
+							</div>
+						</div>
+					</div>
+					<c:if test="${not empty uploadImages.id}">
+						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
+						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -8,6 +8,11 @@
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			var demandUnit = $("#demandUnit").val();
+			if (demandUnit=="经研所") {
+				$("#demandUnit1").css("display", "none");
+				$("#demandUnit2").css("display", "none");
+			}
 			$("#agree").click(function () {
 				var design = $("#tuserName").val();
 				var fabg = $("#fabg").val();
@@ -110,22 +115,12 @@
 				<div class="panel-body">
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 					<form:hidden path="id"/>
+					<input type="hidden" id="demandUnit" value="${construction.demandUnit}">
 <%--						<input id="procInsId" type="text" value="${fns:unescapeHtml(construction.procInsId)}">
 						<input id="projectName" type="text" value="${fns:unescapeHtml(construction.projectName)}">
 						<input type="text" value="${fns:unescapeHtml(construction.id)}">--%>
 						<table class="table table-bordered">
 							<tbody>
-<%--							<tr>
-								<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"> 审核人：</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">
@@ -141,26 +136,8 @@
 								<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"><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"/>
-<%--									<select id="design"  class=" form-control">
-										<option>经研所</option>
-										<option>设计单位人员</option>
-									</select>--%>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否方案变更：</label></td>
-								<td class="width-35">
-									<select id="fabg"  class=" form-control">
-										<option>是</option>
-										<option>否</option>
-									</select>
-								</td>
-								<td class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
-								<td class="width-35">
+								<td id="demandUnit1" class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
+								<td id="demandUnit2" class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
 							</tr>