Merge remote-tracking branch 'origin/master'

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

@@ -8,8 +8,10 @@ import java.util.*;
 
 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.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 org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;
@@ -96,6 +98,8 @@ public class ActTaskService extends BaseService {
 	private ConstructionService constructionService;
 	@Autowired
 	private DiscloseService discloseService;
+	@Autowired
+	private ProcessPersonnelService processPersonnelService;
 	/**
 	 * 获取待办任务列表
 	 * @return
@@ -1094,19 +1098,21 @@ public class ActTaskService extends BaseService {
 
 
 	/**
-	 * 保存审核意见
+	 * 经研所保存审核意见
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void economics(Act act) {
+	public void economics(Act act,String design) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
 			act.setComment("[同意] " + act.getComment());
-			vars.put("design", "设计单位人员");
+			vars.put("design", design);
 		} else {
 			act.setComment("[驳回] " + act.getComment());
-			vars.put("design", "运行人员");
+			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
+			String theDesigner = loginName.getOperatingPersonnel();
+			vars.put("design", theDesigner);
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1232,7 +1238,9 @@ public class ActTaskService extends BaseService {
 			vars.put("design", design);
 		} else {
 			vars.put("manager", true);
-			vars.put("design", "项目经理");
+			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
+			String projectManager = loginName.getProjectManager();
+			vars.put("design", projectManager);
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1294,7 +1302,9 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			vars.put("design", design);
 		} else {
-			vars.put("design", "设计单位人员");
+			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
+			design = loginName.getTheDesigner();
+			vars.put("design",design);
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1317,7 +1327,9 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 
 		} else {
-			vars.put("design", "运行人员");
+			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
+			design = loginName.getOperatingPersonnel();
+			vars.put("design", design);
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1456,7 +1468,9 @@ public class ActTaskService extends BaseService {
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
-			vars.put("policy", "项目经理");
+			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
+			String policy = loginName.getProjectManager();
+			vars.put("policy", policy);
 			act.setComment("[驳回]"+act.getComment());
 		}
 		// 设置意见
@@ -1476,7 +1490,9 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-			vars.put("policy", "政策处理");
+			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
+			String policy = loginName.getRuralCivil();
+			vars.put("policy", policy);
 			act.setComment("【需要政策处理】" + act.getComment());
 		} else {
 			act.setComment("【无需政策处理】" + act.getComment());

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

@@ -23,9 +23,11 @@ import com.jeeplus.modules.oa.entity.OaNotifyRecord;
 import com.jeeplus.modules.oa.service.OaNotifyService;
 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.ProcessPersonnel;
 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.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
@@ -97,6 +99,9 @@ public class ActTaskController extends BaseController {
 
 	@Autowired
 	private OaNotifyService oaNotifyService;
+	@Autowired
+	private ProcessPersonnelService processPersonnelService;
+
 	/**
 	 * 获取待办列表
 	 * @return
@@ -397,17 +402,17 @@ public class ActTaskController extends BaseController {
 
 
 	/**
-	 * 审批
+	 * 经研所审批
 	 * @param act
 	 */
 	@ResponseBody
 	@RequestMapping(value = "economics")
-	public AjaxJson economics(Act act) {
+	public AjaxJson economics(Act act,String design) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.economics(act);
+			actTaskService.economics(act,design);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -424,6 +429,10 @@ public class ActTaskController extends BaseController {
 	public AjaxJson artificialTask(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
+			ProcessPersonnel processPersonnel = new ProcessPersonnel();
+			processPersonnel.setProcInsId(act.getProcInsId());
+			processPersonnel.setProjectManager(UserUtils.getUser().getLoginName());
+			processPersonnelService.save(processPersonnel);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.artificialTask(act);
@@ -443,6 +452,11 @@ 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);
@@ -568,7 +582,7 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
-	 * 运行人员设计变更页面
+	 * 配网运行人员判定设计变更
 	 * @param act
 	 */
 	@ResponseBody
@@ -582,6 +596,10 @@ public class ActTaskController extends BaseController {
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				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);
@@ -626,6 +644,9 @@ public class ActTaskController extends BaseController {
 				uploadImages.setuId(UserUtils.getUser().getLoginName());
 				uploadImagesService.save(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);

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

@@ -0,0 +1,71 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+/**
+ * 记录不同流程的提交人，用于驳回指向人员
+ */
+public class ProcessPersonnel extends ActEntity<ProcessPersonnel> {
+    private static final long serialVersionUID = 1L;
+
+    //项目经理发起人（人工判定/系统判定导入文件）
+    private String projectManager;
+    //配网运行人员
+    private String operatingPersonnel;
+    //设计单位人员
+    private String theDesigner;
+    //配网工程专职
+    private String fullStaff;
+    //行政处理人员
+    private String administrative;
+    //新政（农村/民事）处理人员
+    private String ruralCivil;
+
+    public String getProjectManager() {
+        return projectManager;
+    }
+
+    public void setProjectManager(String projectManager) {
+        this.projectManager = projectManager;
+    }
+
+    public String getOperatingPersonnel() {
+        return operatingPersonnel;
+    }
+
+    public void setOperatingPersonnel(String operatingPersonnel) {
+        this.operatingPersonnel = operatingPersonnel;
+    }
+
+    public String getTheDesigner() {
+        return theDesigner;
+    }
+
+    public void setTheDesigner(String theDesigner) {
+        this.theDesigner = theDesigner;
+    }
+
+    public String getFullStaff() {
+        return fullStaff;
+    }
+
+    public void setFullStaff(String fullStaff) {
+        this.fullStaff = fullStaff;
+    }
+
+    public String getAdministrative() {
+        return administrative;
+    }
+
+    public void setAdministrative(String administrative) {
+        this.administrative = administrative;
+    }
+
+    public String getRuralCivil() {
+        return ruralCivil;
+    }
+
+    public void setRuralCivil(String ruralCivil) {
+        this.ruralCivil = ruralCivil;
+    }
+}

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

@@ -22,6 +22,9 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     User queryPerson(String loginName);
 
+    /**
+     * 根据登陆名查询角色
+     * */
     String nameFindOffice(String loginName);
 
     void newSave(Construction construction);

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

@@ -0,0 +1,22 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.ProcessPersonnel;
+
+/**
+ * 施工交底MAPPER接口
+ * @author
+ * @version 2019-11-08
+ */
+
+@MyBatisMapper
+public interface ProcessPersonnelMapper extends BaseMapper<ProcessPersonnel> {
+    ProcessPersonnel findLoginName(String procInsId);
+
+    void newUpdate(ProcessPersonnel processPersonnel);
+}

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

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.ProcessPersonnelMapper">
+
+	<select id="get" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement" >
+		SELECT *
+		FROM xm_process_personnel a
+		WHERE a.uId = #{uId}
+	</select>
+	
+	<select id="findList" resultType="PersonnelManagement" >
+		SELECT *
+		FROM xm_process_personnel a
+		<where>
+			<if test="dataScope != null and dataScope != ''">
+				${dataScope}
+			</if>
+			<if test="uId != null and uId != ''">
+				AND a.uId = #{uId}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="PersonnelManagement" >
+		SELECT *
+		FROM xm_process_personnel a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_process_personnel(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			proc_ins_id,
+			projectManager,
+			operatingPersonnel,
+			theDesigner,
+			fullStaff,
+			administrative,
+			ruralCivil
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{procInsId},
+			#{projectManager},
+			#{operatingPersonnel},
+			#{theDesigner},
+			#{fullStaff},
+			#{administrative},
+			#{ruralCivil}
+		)
+	</insert>
+
+	<update id="update">
+		UPDATE xm_process_personnel
+		<set>
+		<if test="updateBy.id!=null and updateBy.id!=''">
+			update_by = #{updateBy.id},
+		</if>
+		<if test="updateDate!=null and updateDate=''">
+			update_date = #{updateDate},
+		</if>
+		<if test="remarks!=null and remarks!=''">
+			remarks = #{remarks},
+		</if>
+		<if test="projectManager!=null and projectManager!=''">
+			projectManager = #{projectManager},
+		</if>
+		<if test="operatingPersonnel!=null and operatingPersonnel!=''">
+			operatingPersonnel = #{operatingPersonnel},
+		</if>
+		<if test="theDesigner!=null and theDesigner!=''">
+			theDesigner = #{theDesigner},
+		</if>
+		<if test="fullStaff!=null and fullStaff!=''">
+			fullStaff = #{fullStaff},
+		</if>
+		<if test="administrative!=null and administrative!=''">
+			administrative = #{administrative},
+		</if>
+		<if test="ruralCivil!=null and ruralCivil!=''">
+			ruralCivil = #{ruralCivil}
+		</if>
+		</set>
+		WHERE proc_ins_id=#{procInsId}
+	</update>
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_process_personnel
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_process_personnel SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+
+	<select id="findLoginName" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.ProcessPersonnel">
+		select * from xm_process_personnel where proc_ins_id  =#{procInsId};
+	</select>
+
+	<update id="newUpdate">
+		UPDATE xm_process_personnel
+		<set>
+			<if test="projectManager!=null and projectManager!=''">
+				projectManager = #{projectManager},
+			</if>
+			<if test="operatingPersonnel!=null and operatingPersonnel!=''">
+				operatingPersonnel = #{operatingPersonnel},
+			</if>
+			<if test="theDesigner!=null and theDesigner!=''">
+				theDesigner = #{theDesigner},
+			</if>
+			<if test="fullStaff!=null and fullStaff!=''">
+				fullStaff = #{fullStaff},
+			</if>
+			<if test="administrative!=null and administrative!=''">
+				administrative = #{administrative},
+			</if>
+			<if test="ruralCivil!=null and ruralCivil!=''">
+				ruralCivil = #{ruralCivil}
+			</if>
+		</set>
+		WHERE proc_ins_id=#{procInsId}
+	</update>
+
+	
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ProcessPersonnelService.java

@@ -0,0 +1,64 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.service;
+
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.ProcessPersonnel;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.PersonnelManagementMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.ProcessPersonnelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 施工交底Service
+ * @author
+ * @version 2019-11-08
+ */
+@Service
+@Transactional(readOnly = true)
+public class ProcessPersonnelService extends CrudService<ProcessPersonnelMapper, ProcessPersonnel> {
+
+	@Autowired
+	private ProcessPersonnelMapper processPersonnelMapper;
+
+	@Override
+	public ProcessPersonnel get(String id) {
+		return super.get(id);
+	}
+
+	@Override
+	public List<ProcessPersonnel> findList(ProcessPersonnel entity) {
+		return super.findList(entity);
+	}
+
+	@Override
+	public List<ProcessPersonnel> findListBy(List<ProcessPersonnel> entity) {
+		return super.findListBy(entity);
+	}
+
+	@Override
+	@Transactional(readOnly = false)
+	public void save(ProcessPersonnel entity) {
+		super.save(entity);
+	}
+
+	@Override
+	public void delete(ProcessPersonnel entity) {
+		super.delete(entity);
+	}
+
+	@Transactional(readOnly = false)
+	public ProcessPersonnel findLoginName(String procInsId) {
+		return processPersonnelMapper.findLoginName(procInsId);
+	}
+
+	@Transactional(readOnly = false)
+	public void newUpdate(ProcessPersonnel processPersonnel) {
+		processPersonnelMapper.newUpdate(processPersonnel);
+	}
+}

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

@@ -205,6 +205,28 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/memberForm";
     }
 
+/**
+ * 政策处理
+ * */
+    @RequestMapping(value = "policiesChange")
+    public String policiesChange(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/policiesChange";
+    }
+
+
+
+    /**
+     * 政策处理项目经理判断是否需要继续
+     * */
+    @RequestMapping(value = "managerPolicesChange")
+    public String managerPolicesChange(Construction construction, Model model) {
+        //根据流程定义号获取所有的定义流程
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/managerPolicesChange";
+    }
+
     /*
        项目关闭，配网系统专职
     */
@@ -304,9 +326,13 @@ public class ConstructionController extends BaseController {
                         projectService.updateStatus(newProject);
                         String procDefKey = construction.getAct().getProcDefKey();
                         // 启动流程
-                        ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
-                        String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-                        actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
+                        try {
+                            ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
+                            String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
+                            actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     } else {
                         //没有此用户
                         info += ("项目："+each.getRequireName()+"没有此施工单位人员，请核实。");

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

@@ -10,44 +10,50 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-				jp.prompt("审核", function (message) {
-					jp.post("${ctx}/act/task/economics",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"flag":"yes",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
+				var design = $("#tuserName").val();
+				if (design == "" || design == null) {
+					jp.error("请选择用户");
+				} else {
+					jp.prompt("审核", function (message) {
+						jp.post("${ctx}/act/task/economics",
+						{
+							"taskId":"${construction.act.taskId}",
+							"taskName":"${construction.act.taskName}",
+							"taskDefKey":"${construction.act.taskDefKey}",
+							"procInsId":"${construction.act.procInsId}",
+							"procDefId":"${construction.act.procDefId}",
+							"design":design,
+							"flag":"yes",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
+					});
+				}
 			});
 
 			$("#no").click(function () {
 				jp.prompt("驳回", function (message) {
 					jp.post("${ctx}/act/task/economics",
-							{
-								"taskId":"${construction.act.taskId}",
-								"taskName":"${construction.act.taskName}",
-								"taskDefKey":"${construction.act.taskDefKey}",
-								"procInsId":"${construction.act.procInsId}",
-								"procDefId":"${construction.act.procDefId}",
-								"flag":"no",
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
+						{
+							"taskId":"${construction.act.taskId}",
+							"taskName":"${construction.act.taskName}",
+							"taskDefKey":"${construction.act.taskDefKey}",
+							"procInsId":"${construction.act.procInsId}",
+							"procDefId":"${construction.act.procDefId}",
+							"flag":"no",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
 				});
 			});
 		})
@@ -91,12 +97,12 @@
 								</td>
 								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
 								<td class="width-35">
-<%--									<sys:userselect  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">
+									<sys:userselect  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+												roleName="设计单位人员"	cssClass="form-control required"/>
+<%--									<select id="design"  class=" form-control">
 										<option>经研所</option>
 										<option>设计单位人员</option>
-									</select>
+									</select>--%>
 								</td>
 							</tr>
 							<tr>

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

@@ -25,7 +25,6 @@
 							"procDefId":"${uploadImages.act.procDefId}",
 							"flag":"yes",
 							"pic":currentFileValues,
-							"design":design,
 							"comment":window.encodeURI(message)
 						},
 						function (data) {

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

@@ -8,9 +8,7 @@
 	<%@include file="/webpage/include/summernote.jsp" %>
 	<%@include file="economicsDesignChange.js"%>
 	<script type="text/javascript">
-
 		$(document).ready(function() {
-
 			$("#agree").click(function () {
 				var currentFileValues = $("input[name='pic']").val();
 				if (currentFileValues==""||currentFileValues==null) {
@@ -41,21 +39,21 @@
 			$("#no").click(function () {
 				jp.prompt("驳回意见", function (message) {
 					jp.post("${ctx}/act/task/notSignUpload",
-							{
-								"taskId":"${uploadImages.act.taskId}",
-								"taskName":"${uploadImages.act.taskName}",
-								"taskDefKey":"${uploadImages.act.taskDefKey}",
-								"procInsId":"${uploadImages.act.procInsId}",
-								"procDefId":"${uploadImages.act.procDefId}",
-								"flag":"no",
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}
-							})
+						{
+							"taskId":"${uploadImages.act.taskId}",
+							"taskName":"${uploadImages.act.taskName}",
+							"taskDefKey":"${uploadImages.act.taskDefKey}",
+							"procInsId":"${uploadImages.act.procInsId}",
+							"procDefId":"${uploadImages.act.procDefId}",
+							"flag":"no",
+							"comment":window.encodeURI(message)
+						},
+						function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								jp.go("${ctx}/act/task/todo")
+							}
+						})
 				});
 			});
 		});

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

@@ -38,32 +38,6 @@
 				})
 			}
 		}
-		/*function save() {
-            var isValidate = jp.validateForm('#inputForm');//校验表单
-			// var currentFileValues = $("input[name='pic']").val();
-            if(!isValidate){
-                return false;
-			}else{
-                jp.loading();
-                jp.post("${ctx}/managementcenter/upload/save",
-				{
-					"path": currentFileValues,
-					"procInsId":${uploadImages.procInsId},
-					"uId":${uploadImages.uId},
-					"id":${uploadImages.id}
-				},
-				function(data){
-                    if(data.success){
-                        jp.getParent().refresh();
-                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                        parent.layer.close(dialogIndex);
-                        jp.success(data.msg)
-                    }else{
-                        jp.error(data.msg);
-                    }
-                })
-			}
-        }*/
 	</script>
 </head>
 <body class="bg-white">