测试施工交底，修改经研所指向人员

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

@@ -1110,7 +1110,7 @@ public class ActTaskService extends BaseService {
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
 			act.setComment("[同意] " + act.getComment());
-			vars.put("design", user.getConstructionUnitRole());
+			vars.put("design", user.getRunUnitRole());
 		} else {
 			act.setComment("[驳回] " + act.getComment());
 			vars.put("design", user.getRunUnitRole());
@@ -2347,11 +2347,11 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
-		String constructionUnitRole = user.getConstructionUnitRole();
+		String designUnitRole = user.getDesignUnitRole();
 		if ("yes".equals(flag)) {
-			vars.put("design",constructionUnitRole);
+			vars.put("design",designUnitRole);
 		} else {
-			vars.put("design", user.getDesignUnitRole());
+			vars.put("design", user.getThroughResearchRole());
 		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

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

@@ -426,9 +426,16 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "economics")
-	public AjaxJson economics(Act act) {
+	public AjaxJson economics(Act act,String pic,UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传新图纸");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.economics(act);
@@ -629,7 +636,7 @@ public class ActTaskController extends BaseController {
 	public AjaxJson operator(Act act, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
-			if (pic!=null&&pic!="") {
+			if (pic!=null&&!"".equals(pic)) {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
 				uploadImages.setuId(UserUtils.getUser().getLoginName());

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

@@ -498,7 +498,9 @@
 	</select>
 
 	<select id="findUser"  resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
-		select project_manage_role
+		select
+			demand_unit
+			,project_manage_role
 			,distribution_engineering
 			,distribution_materials
 			,distribution_system

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

@@ -63,6 +63,7 @@
 						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
 					</h3>
 				</div>
+				<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
 				<table id="testPicTable"   data-toolbar="#toolbar"></table>
 				<div class="panel-body">
 					<div class="row">
@@ -70,7 +71,7 @@
 						<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;
-								<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
+								<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 							</div>
 						</div>
 					</div>

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

@@ -10,24 +10,30 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
+				var currentFileValues = $("input[name='pic']").val();
+				if (currentFileValues == "") {
+					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}",
-							"flag":"yes",
-							"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}",
+									"pic":currentFileValues,
+									"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) {
@@ -88,29 +94,11 @@
 								<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">选择用户：</label></td>
-								<td class="width-35">
-									<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>--%>
-								</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>--%>
+							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
 								<td class="width-35">

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

@@ -9,34 +9,40 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			var demandUnit = $("#demandUnit").val();
+			var flag = false;
 			if (demandUnit=="经研所") {
 				$("#demandUnit1").css("display", "none");
 				$("#demandUnit2").css("display", "none");
+				flag = true;
 			}
 			$("#agree").click(function () {
-				var pic = $("#pic").val();
-				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":pic,
-						"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("请选择与需求提出单位对应的人员")
-						}
-					})
-				});
+				var currentFileValues = $("input[name='pic']").val();
+				if (flag==false&&currentFileValues=="") {
+					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,
+									"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);