施工交底流程，添加添加工程量后经理判断是否需要关闭当前政策处理流程节点，人员信息变更，添加条件判断

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

@@ -3580,8 +3580,13 @@ public class ActTaskService extends BaseService {
     public void ruralOffice(Act act) {
         Map<String, Object> vars = Maps.newHashMap();
         String flag = act.getFlag();
+        vars.put("pass", "yes".equals(flag) ? true : false);
         Project user = MyActiviUtils.findUser(act.getProcInsId());
-        vars.put("design", UserUtils.getByUserName(user.getAssignment().getDistributionPolicy()).getLoginName());
+        if ("yes".equals(flag)) {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getDistributionPolicy()).getLoginName());
+        } else {
+            vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
+        }
         // 设置意见
         act.preUpdate();
         // 提交流程任务
@@ -3630,8 +3635,8 @@ public class ActTaskService extends BaseService {
         Map<String, Object> vars = Maps.newHashMap();
         Project user = MyActiviUtils.findUser(act.getProcInsId());
         String flag = act.getFlag();
-        vars.put("pass", "yes".equals(flag) ? true : false);
-        if ("yes".equals(flag)) {
+        vars.put("pass", "pass".equals(flag) ? true : false);
+        if ("pass".equals(flag)) {
             vars.put("design", UserUtils.getByUserName(user.getAssignment().getOwnerManager()).getLoginName());
         }
         if ("no".equals(flag)) {

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

@@ -581,7 +581,9 @@ public class ActTaskController extends BaseController {
     public AjaxJson ruralOffice(Act act, Construction construction) {
         AjaxJson j = new AjaxJson();
         try {
-            constructionService.updateIfSelf(construction);
+            if ("yes".equals(act.getFlag())) {
+                constructionService.updateIfSelf(construction);
+            }
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");
             act.setComment(comment);
             actTaskService.ruralOffice(act);
@@ -614,7 +616,7 @@ public class ActTaskController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "needAdministrativeOffice")
-    public AjaxJson needAdministrativeOffice(Act act) {
+    public AjaxJson needAdministrativeOfficeneedAdministrativeOffice(Act act) {
         AjaxJson j = new AjaxJson();
         try {
             String comment = URLDecoder.decode(act.getComment(), "UTF-8");

src/main/java/com/jeeplus/modules/sg/progress/entity/PlanningStatistics.java

@@ -4,6 +4,9 @@ import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.List;
 
+/**
+ *
+ * */
 public class PlanningStatistics extends DataEntity<PlanningStatistics> {
     //年份
     private String projectYear;

src/main/java/com/jeeplus/modules/sg/progress/entity/ShowStatistics.java

@@ -2,6 +2,9 @@ package com.jeeplus.modules.sg.progress.entity;
 
 import java.util.List;
 
+/**
+ *
+ * */
 public class ShowStatistics {
     private String projectYear;
     private List<PlanningStatistics> planningStatistics;

src/main/java/com/jeeplus/modules/sg/progress/entity/YearProgress.java

@@ -9,9 +9,7 @@ import com.jeeplus.core.persistence.DataEntity;
 import com.jeeplus.modules.test.treetable.dialog.entity.CarKind1;
 
 /**
- * 车辆Entity
- * @author lgf
- * @version 2018-06-12
+ * 项目进度统计-实体类
  */
 public class YearProgress extends DataEntity<YearProgress> {
 

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

@@ -16,7 +16,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "flag": "pass",
+                            "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
@@ -552,9 +552,9 @@
                         <div class="col-sm-6">
                             <div class="form-group text-center">
                                 <input id="yes" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="需要发起"/>
+                                       value="需要发起政策处理"/>
                                 <input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="驳回"/>
+                                       value="结束政策处理"/>
                                 <%--									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
                             </div>
                         </div>

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

@@ -16,7 +16,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "flag": "pass",
+                            "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
                         function (data) {
@@ -552,9 +552,9 @@
                         <div class="col-sm-6">
                             <div class="form-group text-center">
                                 <input id="yes" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="需要发起"/>
+                                       value="需要发起政策处理"/>
                                 <input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="驳回"/>
+                                       value="结束政策处理"/>
                                 <%--									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
                             </div>
                         </div>

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

@@ -552,9 +552,9 @@
                         <div class="col-sm-6">
                             <div class="form-group text-center">
                                 <input id="yes" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="需要发起"/>
+                                       value="需要发起政策处理"/>
                                 <input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit"
-                                       value="驳回"/>
+                                       value="结束政策处理"/>
                                 <%--									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;--%>
                             </div>
                         </div>

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

@@ -30,6 +30,28 @@
 					)
 				})
 			});
+
+			$("#no").click(function () {
+				jp.prompt("审核通过", function (message) {
+					jp.post("${ctx}/act/task/ruralOffice",
+							{
+								"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")
+								}
+							}
+					)
+				})
+			});
 		})
 	</script>
 </head>
@@ -535,7 +557,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-danger" type="submit" value="驳回" />&nbsp;--%>
+									<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="结束农村政处" />&nbsp;
 								</div>
 							</div>
 						</div>