Sfoglia il codice sorgente

审批列表-看到了其他任务的审批记录

lgl 11 mesi fa
parent
commit
03ca9142c5

+ 4 - 2
src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -492,8 +492,9 @@ public class PrjApproverecordController extends BaseController {
492 492
     }
493 493
 
494 494
     @ResponseBody
495
-    @RequestMapping(value = "/spList/{xmid}", method = RequestMethod.POST)
496
-    public BaseResult spList(@PathVariable String xmid,
495
+    @RequestMapping(value = "/spList/{xmid}/{tableName}", method = RequestMethod.POST)
496
+    public BaseResult spList(@PathVariable("xmid") String xmid,
497
+                             @PathVariable("tableName") String tableName,
497 498
                              @RequestParam("page") Integer pageNum,
498 499
                              @RequestParam("limit") Integer pageSize,
499 500
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
@@ -504,6 +505,7 @@ public class PrjApproverecordController extends BaseController {
504 505
         paraMap.put("sortName", sortName);
505 506
         paraMap.put("sortOrder", sortOrder);
506 507
         paraMap.put("xmid", xmid.toString());
508
+        paraMap.put("tableName", tableName.toString());
507 509
         List<PrjApproverecord> list = prjApproverecordService.getApproveByXmId2(paraMap);
508 510
 
509 511
         //判断备用金是否关联项目

+ 1 - 1
src/main/resources/mapper/PrjApproverecordDao.xml

@@ -509,7 +509,7 @@
509 509
         from prj_ApproveRecord a
510 510
         left join sys_user_info u1 on a.TJR = u1.user_id
511 511
         left join sys_user_info u2 on a.SHR = u2.user_id
512
-        where a.XMID = #{xmid}
512
+        where a.XMID = #{xmid} and a.TABLENAME = #{tableName}
513 513
         <if test="spzt != null and spzt != ''">
514 514
             and a.ZT = #{spzt}
515 515
         </if>

+ 1 - 1
src/main/resources/templates/annualbudget/list_approve.html

@@ -47,7 +47,7 @@
47 47
 
48 48
         var currTable = table.render({
49 49
             elem: '#currentTableId',
50
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
50
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/prj_AnnualBudget',
51 51
             method: 'post',
52 52
             // toolbar: '#toolbarDemo',
53 53
             // defaultToolbar: ['filter', 'exports', 'print'],

+ 1 - 1
src/main/resources/templates/payapply/list_approve.html

@@ -47,7 +47,7 @@
47 47
 
48 48
         var currTable = table.render({
49 49
             elem: '#currentTableId',
50
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
50
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_PayApproval',
51 51
             method: 'post',
52 52
             toolbar: '#toolbarDemo',
53 53
             defaultToolbar: ['filter', 'exports', 'print'],

+ 1 - 1
src/main/resources/templates/prjproject/list_approve.html

@@ -47,7 +47,7 @@
47 47
 
48 48
         var currTable = table.render({
49 49
             elem: '#currentTableId',
50
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
50
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/prj_Project',
51 51
             method: 'post',
52 52
             // toolbar: '#toolbarDemo',
53 53
             // defaultToolbar: ['filter', 'exports', 'print'],

+ 1 - 1
src/main/resources/templates/reimburse/list_approve.html

@@ -47,7 +47,7 @@
47 47
 
48 48
         var currTable = table.render({
49 49
             elem: '#currentTableId',
50
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
50
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_Reimbursement',
51 51
             method: 'post',
52 52
             // toolbar: '#toolbarDemo',
53 53
             // defaultToolbar: ['filter', 'exports', 'print'],

+ 1 - 1
src/main/resources/templates/reportinfo/list_approve.html

@@ -47,7 +47,7 @@
47 47
 
48 48
         var currTable = table.render({
49 49
             elem: '#currentTableId',
50
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
50
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_FeasibilityReport',
51 51
             method: 'post',
52 52
             // toolbar: '#toolbarDemo',
53 53
             // defaultToolbar: ['filter', 'exports', 'print'],

+ 1 - 1
src/main/resources/templates/stabudgetapproval/list_approve.html

@@ -60,7 +60,7 @@
60 60
 
61 61
         var currTable = table.render({
62 62
             elem: '#currentTableId',
63
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
63
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_BudgetApproval',
64 64
             method: 'post',
65 65
             // toolbar: '#toolbarDemo',
66 66
             // defaultToolbar: ['filter', 'exports', 'print'],

+ 1 - 1
src/main/resources/templates/stabudgetapproval/list_approve1.html

@@ -47,7 +47,7 @@
47 47
 
48 48
         var currTable = table.render({
49 49
             elem: '#currentTableId',
50
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
50
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_BudgetApproval',
51 51
             method: 'post',
52 52
             // toolbar: '#toolbarDemo',
53 53
             // defaultToolbar: ['filter', 'exports', 'print'],