记录项目经理施工交底操作人员

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

@@ -1217,7 +1217,7 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
-	 * 运行人员设计变更页面
+	 * 配网运行人员设计变更页面
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -1225,11 +1225,13 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		//根据登陆查询所属的角色
 		String flag = act.getFlag();
+		//根据登陆查询所属的角色
 		String s = constructionService.nameFindOffice(design);
 		vars.put("jys", false);
 		vars.put("des", false);
 		vars.put("manager", false);
 		if ("yes".equals(flag)) {
+			//判断角色属于哪里
 			if ("经研所".equals(s)) {
 				vars.put("jys", true);
 			} else if ("设计单位人员".equals(s)) {

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

@@ -782,6 +782,11 @@ 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);

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

@@ -116,6 +116,7 @@ public class DivideController extends BaseController {
 		if("audit".equals(mode)){
 			return "modules/sg/managementcenter/activiti/divideAudit";
 		}else{//add
+			//项目经理组织交底
 			return "modules/sg/managementcenter/activiti/divideForm";
 		}
 //		return "modules/sg/managementcenter/activiti/constructionForm";

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

@@ -91,6 +91,7 @@
 							</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">
@@ -100,6 +101,7 @@
 							</div>
 						</div>
 					</div>
+					</c:if>
 					<c:if test="${not empty uploadImages.id}">
 						<act:flowChart procInsId="${uploadImages.act.procInsId}"/>
 						<act:histoicFlow procInsId="${uploadImages.act.procInsId}" />

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

@@ -16,36 +16,61 @@
 				if (design==""||design==null) {
 					jp.error("请选择用户")
 					return;
-				}else if (fabg=="是")  {
+				}else if (fabg == "是") {
 					if (pic == "" || pic == null) {
 						jp.error("请上传方案图");
 						return;
+					} else {
+						jp.prompt("审核意见", function (message) {
+							jp.post("${ctx}/act/task/operator",
+							{
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
+								"flag":"yes",
+								"design":design,
+								"projectName":"${fns:unescapeHtml(construction.projectName)}",
+								"comment":window.encodeURI(message)
+							},
+							function (data) {
+								if(data.success){
+									jp.success(data.msg);
+									jp.go("${ctx}/act/task/todo")
+								}else {
+									jp.error("请选择与需求提出单位对应的人员")
+								}
+							})
+						});
 					}
+				} else {
+					jp.prompt("审核意见", function (message) {
+						jp.post("${ctx}/act/task/operator",
+								{
+									"taskId":"${construction.act.taskId}",
+									"taskName":"${construction.act.taskName}",
+									"taskDefKey":"${construction.act.taskDefKey}",
+									"procInsId":"${construction.act.procInsId}",
+									"procDefId":"${construction.act.procDefId}",
+									"flag":"yes",
+									"pic":currentFileValues,
+									"design":design,
+									"projectName":"${fns:unescapeHtml(construction.projectName)}",
+									"comment":window.encodeURI(message)
+								},
+								function (data) {
+									if(data.success){
+										jp.success(data.msg);
+										jp.go("${ctx}/act/task/todo")
+									}else {
+										jp.error("请选择与需求提出单位对应的人员")
+									}
+								})
+					});
 				}
 				// alert(design);
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/operator",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"flag":"yes",
-						"pic":currentFileValues,
-						"design":design,
-						"projectName":"${fns:unescapeHtml(construction.projectName)}",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}else {
-							jp.error("请选择与需求提出单位对应的人员")
-						}
-					})
-				});
+
 			});
 			$("#no").click(function () {
 				// alert(design);

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

@@ -126,6 +126,8 @@
 					</div>
 				</div>
 			</form:form>
+
+
 			<div class="row">
 				<div class="col-sm-3"></div>
 				<div class="col-sm-6">