审核完成调整列表页

src/main/java/cn/palmte/work/controller/backend/ProjectController.java

@@ -372,9 +372,10 @@ public class ProjectController extends BaseController {
      */
     @RequestMapping("/approve")
     public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords,
-                          @RequestParam("id") int id, @RequestParam String listFrom,
+                          @RequestParam("id") int id, @RequestParam("type") int type,@RequestParam String listFrom,
                           Map<String, Object> model) {
         Project project = projectService.getProject(id);
+        model.put("type",type);
 
         //项目信息
         model.put("adminId", InterfaceUtil.getAdminId());
@@ -445,9 +446,9 @@ public class ProjectController extends BaseController {
      * 审批完成任务
      */
     @ResponseBody
-    @RequestMapping("/completeTask/{projectId}")
+    @RequestMapping("/completeTask/{projectId}/{approvetype}")
-    public ResponseMsg completeTask(@PathVariable int projectId, @RequestBody String json) {
+    public ResponseMsg completeTask(@PathVariable int projectId,@PathVariable int approvetype, @RequestBody String json) {
-        return projectService.completeTask(projectId, json);
+        return projectService.completeTask(projectId, json,approvetype);
     }
 
 

src/main/java/cn/palmte/work/service/ProjectService.java

@@ -205,7 +205,7 @@ public class ProjectService {
     }
 
 
-    public ResponseMsg completeTask(int projectId, String json) {
+    public ResponseMsg completeTask(int projectId, String json,int approvetype) {
         List<ProjectInstanceRelation> relationList = projectInstanceRelationRepository.findByProjectIdOrderByCreateTimeDesc(projectId);
         if (relationList == null || relationList.isEmpty()) {
             return ResponseMsg.buildFailedMsg("审核失败");
@@ -215,7 +215,7 @@ public class ProjectService {
         actTaskDefService.completeTaskByProcInsId(projectInstanceRelation.getProcessInsId(),
                 obj.getIntValue("type"), obj.getString("message"));
 
-        return ResponseMsg.buildSuccessMsg("审核成功");
+        return ResponseMsg.buildSuccessMsg("审核成功",approvetype);
     }
 
 

src/main/resources/templates/admin/project_approve.ftl

@@ -117,6 +117,7 @@
                     <div class="am-tabs-bd">
                         <div <#if check==1>class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in"</#if> id="tab1">
                             <input name="id" id="id" type="hidden" value="${project.id}" />
+                            <input name="type" id="type" type="hidden" value="${type}"/>
                             <input name="projectContributionProfitRateThreshold" id="projectContributionProfitRateThreshold" type="hidden" value="${project.projectContributionProfitRateThreshold}" />
                             <!--验证表单元素（validate) begin-->
 
@@ -2448,6 +2449,7 @@
 
     var completeTask = function (projectId) {
         var message = $("#doc-vld-ta-2").val();
+        var approvetype = $("#type").val();
         if (message == '') {
             alert("请填写审核意见");
             return;
@@ -2459,7 +2461,7 @@
             message: message
         };
         $.ajax({
-            url: '${base}/project/completeTask/' + projectId,
+            url: '${base}/project/completeTask/' + projectId + "/" + approvetype,
             data: JSON.stringify(params),
             dataType: "json",
             contentType: "application/json",
@@ -2468,8 +2470,14 @@
             success: function (data) {
                 if (data.status == 0) {
                     alert(data.msg);
-                    window.location.href = window.location.href;
                     refreshMyApproveMsg();
+                    var urlType = data.data;
+                    if(urlType == 1){
+                        location.href = "${base}/project/list";
+                    }else {
+                        location.href = "${base}/project/listApprove";
+                    }
+
                 } else if (data.status == 1) {
                     alert(data.msg);
                 }

src/main/resources/templates/admin/project_list.ftl

@@ -187,7 +187,7 @@
                         <#list pager.list as list>
                             <tr>
                                 <td>${list.id!}</td>
-                                <td><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&id=${list.id}'">${list.name!}</a></td>
+                                <td><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
                                 <td>${list.typeDesc!}</td>
                                 <td>${list.statusDesc!}</td>
                                 <td>${list.approveStatusDesc!}</td>
@@ -290,7 +290,7 @@
                                             <#if adminId==list.approveId>
                                                 <button type="button"
                                                         class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                                        onclick="location.href='${base}/project/approve?listFrom=list&id=${list.id}'"><span
+                                                        onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'"><span
                                                             class="am-icon-pencil-square-o"></span>审核
                                                 </button>
                                             </#if>

src/main/resources/templates/admin/project_list_approve.ftl

@@ -183,7 +183,7 @@
                         <#list    pager.list as list>
                             <tr>
                                 <td>${list.id!}</td>
-                                <td><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&id=${list.id}'">${list.name!}</a></td>
+                                <td><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
                                 <td>${list.typeDesc!}</td>
                                 <td>${list.statusDesc!}</td>
                                 <td>${list.approveStatusDesc!}</td>
@@ -203,7 +203,7 @@
 
                                             <button type="button"
                                                     class="am-btn am-btn-default am-btn-xs am-text-secondary"
-                                                    onclick="location.href='${base}/project/approve?listFrom=list&id=${list.id}'"><span
+                                                    onclick="location.href='${base}/project/approve?listFrom=list&type=2&id=${list.id}'"><span
                                                         class="am-icon-pencil-square-o"></span>审核
                                             </button>