Merge remote-tracking branch 'origin/master'

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

@@ -1378,7 +1378,7 @@ public class ActTaskService extends BaseService {
 					vars.put("pass5",true);
 				}
 				if ("行政".equals(flagDeal)) {
-					vars.put("coveredPerson","政策处理");
+					vars.put("coveredPerson","施工单位");
 					vars.put("pass3",true);
 				}
 				if (!flagDesign&&!flagItemCLose&&"空".equals(flagDeal)){
@@ -1674,8 +1674,8 @@ public class ActTaskService extends BaseService {
 	public void seal(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
-		vars.put("sealYes", false);
-		vars.put("sealNo", false);
+		vars.put("receiptYes", false);
+		vars.put("receiptNo", false);
 		if ("yes".equals(flag)) {
 			vars.put("receiptPerson",UserUtils.getUser().getLoginName());
 			act.setComment("[没有问题]"+act.getComment());
@@ -1718,15 +1718,15 @@ public class ActTaskService extends BaseService {
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 	/**
-	 * 政策处理：配网政策处理专职 : 上传收据
+	 * 政策处理：配网政策处理专职 : 收据
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
 	public void  receiptTask(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
-		vars.put("sealYes", false);
-		vars.put("sealNo", false);
+		vars.put("singleYes", false);
+		vars.put("singleNo", false);
 		if ("yes".equals(flag)) {
 			vars.put("singlePerson",UserUtils.getUser().getLoginName());
 			act.setComment("[没有问题]"+act.getComment());
@@ -1751,8 +1751,8 @@ public class ActTaskService extends BaseService {
 	public void  singleTask(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
-		vars.put("sealYes", false);
-		vars.put("sealNo", false);
+		vars.put("policyYes", false);
+		vars.put("singleNo", false);
 		if ("yes".equals(flag)) {
 			vars.put("policyPay",UserUtils.getUser().getLoginName());
 			act.setComment("[没有问题]"+act.getComment());
@@ -1769,6 +1769,31 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
+    /**
+     * 政策处理：配网政策处理专职 : 上传借款
+     * @param act
+     */
+    @Transactional(readOnly = false)
+    public void  policy1Pay(Act act) {
+        Map<String, Object> vars = Maps.newHashMap();
+        String flag = act.getFlag();
+        vars.put("finishYes", false);
+        vars.put("finishNo", false);
+        if ("yes".equals(flag)) {
+            act.setComment("[没有问题]"+act.getComment());
+            vars.put("finishYes", true);
+        } else {
+            vars.put("coveredPerson","施工单位");
+            act.setComment("[驳回]" + act.getComment());
+            vars.put("finishNo", true);
+        }
+        // 设置意见
+        act.preUpdate();
+        // 对不同环节的业务逻辑进行操作
+        String taskDefKey = act.getTaskDefKey();
+        // 提交流程任务
+        complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+    }
 	/**
 	 * 保存审核意见
 	 *

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

@@ -1024,6 +1024,29 @@ public class ActTaskController extends BaseController {
 		j.setMsg("审批成功");
 		return j;
 	}
+	/*
+		政策处理：配网政策处理专职 :上传借款
+	 */
+	@ResponseBody
+	@RequestMapping(value = "policyPay1Task")
+	public AjaxJson policyPay1Task(Act act,String pic, UploadImages uploadImages) {
+		AjaxJson j = new AjaxJson();
+		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.policy1Pay(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 	/**
 	 * 施工交底审批
 	 * @param act*/

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

@@ -19,10 +19,14 @@ public class EndTaskListen implements Serializable, ExecutionListener {
 
     @Override
     public void notify(DelegateExecution delegateExecution) throws Exception {
-        System.out.println("status");
-        System.out.println("procinsId");
-        String processInstanceId = delegateExecution.getProcessInstanceId();
-        System.out.println(processInstanceId);
-        projectService.updateStatusBy("2", processInstanceId);
+        try {
+            System.out.println("status");
+            System.out.println("procinsId");
+            String processInstanceId = delegateExecution.getProcessInstanceId();
+            System.out.println(processInstanceId);
+            projectService.updateStatusBy("2", processInstanceId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

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

@@ -6,7 +6,6 @@ package com.jeeplus.modules.sg.managementcenter.project.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +22,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
     /**
      * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
      * */
-    void updateStatusBy(@Param("status")String status,@Param("procInsId")String procInsId);
+    void updateStatusBy(String status,String procInsId);
 
     public List<Project> findListById(String[] proListId);
 }

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

@@ -11,10 +11,10 @@
 			$("#agree").click(function () {
 			    var fullName = $("#loginName").val();
                 var pic = $("#pic").val();
-                if (fullName=""||fullName==null) {
-                    jp.error("请选择用户");
-                    return;
-				}
+                // if (fullName=""||fullName==null) {
+                //     jp.error("请选择用户");
+                //     return;
+				// }
 				if (pic==""||pic==null){
 				    jp.error("请上传未盖章施工方案");
 				    return;

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>上传单据</title>
+	<title>上传借款单据</title>
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
@@ -16,7 +16,7 @@
 				}
                 var currentFileValues = $("input[name='pic']").val();
                 jp.prompt("审核通过", function (message) {
-                    jp.post("${ctx}/act/task/receiptTask",
+                    jp.post("${ctx}/act/task/policyPay1Task",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
@@ -36,14 +36,22 @@
                 })
 			});
 			$("#no").click(function () {
-				jp.prompt("驳回", function (message) {
-					jp.post("${ctx}/act/task/receiptTask",
+                $("#agree").click(function () {
+                    var pic = $("#pic").val();
+                    if (pic==""||pic==null){
+                        jp.error("请上传收据");
+                        return;
+                    }
+                    var currentFileValues = $("input[name='pic']").val();
+				jp.prompt("结束", function (message) {
+					jp.post("${ctx}/act/task/policyPay1Task",
 							{
 								"taskId": "${construction.act.taskId}",
 								"taskName": "${construction.act.taskName}",
 								"taskDefKey": "${construction.act.taskDefKey}",
 								"procInsId": "${construction.act.procInsId}",
 								"procDefId": "${construction.act.procDefId}",
+                                "pic":currentFileValues,
 								"flag": "no",
 								"comment": window.encodeURI(message)
 							},
@@ -88,7 +96,7 @@
 								<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-15 active"><label class="pull-right">上传借款单据：</label></td>
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
@@ -262,10 +270,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -366,10 +374,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -409,7 +417,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-danger btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="结束" />
 								</div>
 							</div>
 						</div>

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

@@ -412,7 +412,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="重新发起" />
-									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="结束" />
 								</div>
 							</div>
 						</div>

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

@@ -16,7 +16,7 @@
 				}
                 var currentFileValues = $("input[name='pic']").val();
                 jp.prompt("审核通过", function (message) {
-                    jp.post("${ctx}/act/task/receiptTask",
+                    jp.post("${ctx}/act/task/singleTask",
                         {
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
@@ -38,7 +38,7 @@
 
 			$("#no").click(function () {
 				jp.prompt("驳回", function (message) {
-					jp.post("${ctx}/act/task/receiptTask",
+					jp.post("${ctx}/act/task/singleTask",
 							{
 								"taskId": "${construction.act.taskId}",
 								"taskName": "${construction.act.taskName}",
@@ -263,10 +263,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -367,10 +367,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

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

@@ -99,12 +99,12 @@
 								<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">
-									<%--<input id="loginName" value="${construction.tuser.loginName}">--%>
-									<sys:userselect roleName="配网运行人员" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-													loginName="loginName" loginValue="运行人员" cssClass="form-control required"/>
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right">选择用户：</label></td>--%>
+								<%--<td class="width-35">--%>
+									<%--&lt;%&ndash;<input id="loginName" value="${construction.tuser.loginName}">&ndash;%&gt;--%>
+									<%--<sys:userselect roleName="配网运行人员" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"--%>
+													<%--loginName="loginName" loginValue="运行人员" cssClass="form-control required"/>--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>