Bläddra i källkod

报账撤销审批

ly 10 månader sedan
förälder
incheckning
54d1acabd3

+ 43 - 0
src/main/java/com/liang/controller/StaReimbursementController.java

@@ -63,6 +63,9 @@ public class StaReimbursementController extends BaseController {
63 63
     private SysUserPostService sysUserPostService;
64 64
 
65 65
 
66
+
67
+
68
+
66 69
     /**
67 70
      * 分页查询
68 71
      *
@@ -406,13 +409,53 @@ public class StaReimbursementController extends BaseController {
406 409
     @ResponseBody
407 410
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
408 411
     public BaseResult doUpdate(StaReimbursement reimbursement) {
412
+        // 获取当前人员账户
413
+        SysUserInfo  sysUserInfo = getSysUserInfo();
409 414
         StaBudgetapproval staBudgetapproval =  staBudgetapprovalService.getBayID(reimbursement.getFysq());
410 415
         staBudgetapproval.setBzje(reimbursement.getBzje());
411 416
         staBudgetapproval.setBhsje(reimbursement.getBhsje());
417
+        // 修改后改变当前审批状态
418
+        // 同步修改审批列表  sta_Reimbursement
419
+        // 获取当前人员登录 id
420
+        // 意见模板 : xx 修改报账金额 原报账金额为xx ,现金额为 xx 税率(原):XX,税率(现):XX,不含税金额(原): XX ,不含税金额(现):税费(原):xx, 税费(现):XX ,状态提交至
421
+        //
412 422
         int nm = staBudgetapprovalService.update(staBudgetapproval);
413 423
         // 这个只修改了 保障表 未同步修改费用申请表
424
+        // prj_ApproveRecord 审批表
425
+
426
+/*        StaReimbursement staReimbursement = staReimbursementService.queryById(reimbursement.getId());
427
+        PrjApproverecord prjApproverecord = new PrjApproverecord();
428
+
429
+        prjApproverecord.setYj(
430
+                sysUserInfo.getName()
431
+                +"修改报账金额,报账金额(现):"
432
+                +reimbursement.getBzje()
433
+                +"报账金额(原):"
434
+                +staReimbursement.getBzje()
435
+                +"税率(现)"
436
+                + reimbursement.getSl()
437
+                +"税率(原)"
438
+                + staReimbursement.getSl()
439
+                + "不含税金额(现)"
440
+                + reimbursement.getBhsje()
441
+                + "不含税金额(原)"
442
+                + staReimbursement.getBhsje()
443
+                + "税费(现):"
444
+                + reimbursement.getSf()
445
+                + "税费(原)"
446
+                + staReimbursement.getSf()
447
+        );
448
+        prjApproverecord.setSpzt("未提交(返回)");
449
+        prjApproverecord.setWc();
450
+        prjApproverecordService.update();
451
+
452
+        reimbursement.setSpzt("未提交(返回)");*/
414 453
         int num = staReimbursementService.update(reimbursement);
454
+
455
+
415 456
         if (num > 0 || nm > 0 ) {
457
+
458
+
416 459
             return BaseResult.success("保存成功!");
417 460
         } else {
418 461
             return BaseResult.failure("保存失败!");

+ 2 - 1
src/main/resources/mapper/StaReimbursementDao.xml

@@ -160,7 +160,8 @@
160 160
             BZJE  = #{bzje},
161 161
             SL    = #{sl},
162 162
             BHSJE = #{bhsje},
163
-            SF    = #{sf}
163
+            SF    = #{sf},
164
+            SPZT = #{spzt}
164 165
         where ID = #{id}
165 166
     </update>
166 167
 

+ 4 - 5
src/main/resources/templates/reimburse/mylist.html

@@ -113,9 +113,9 @@
113 113
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="payRequest">
114 114
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>付款申请
115 115
                 </button>
116
-                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="updateBZJE">
116
+         <!--       <button class="layui-btn layui-btn-sm data-add-btn" lay-event="updateBZJE">
117 117
                     <i class="layui-icon layui-icon-dollar" style="font-size: 10px;"></i>修改报账金额
118
-                </button>
118
+                </button>-->
119 119
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nullify">
120 120
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>作废
121 121
                 </button>
@@ -482,7 +482,6 @@
482 482
                         "rws": data[0].xmid,
483 483
                         "rwsmc": data[0].xmmc
484 484
                     };
485
-
486 485
                     var index = layer.open({
487 486
                         title: '修改报账金额',
488 487
                         type: 2,
@@ -561,9 +560,9 @@
561 560
                     Message.warning("请选择要撤销的报账!", 1500);
562 561
                 } else if (data.length > 1) {
563 562
                     Message.warning("请选择一条记录进行撤销!", 1500);
564
-                } else if (data[0].spzt == "审批结束") {
563
+                } /*else if (data[0].spzt == "审批结束") {
565 564
                     Message.warning("该报账已审批结束!", 1500);
566
-                }
565
+                }*/
567 566
                     //else if (data[0].cjr!= userId) {
568 567
 
569 568
                 //Message.error("您不是改报账的创建人!", 1500);}