添加报账时添加保存限制，禁止报账总金额大于该科目本年度项目组预算填报金额

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1941,8 +1941,6 @@ public class StaBudgetapprovalController extends BaseController {
     public StaBudgetapproval getKmFyInfo(@PathVariable Integer nys, @PathVariable Integer fylb,
                                          @RequestParam(required = false,defaultValue = "",value = "fylbmc")String fymc) {
         Map<String, String> paraMap = new HashMap<>();
-        paraMap.put("fylb1", fylb.toString());
-        paraMap.put("nys1", nys.toString());
         paraMap.put("fylb", fylb.toString());
         paraMap.put("nys", nys.toString());
         StaBudgetapproval kmFyInfo = staBudgetapprovalService.getKmFyInfo(paraMap);

src/main/java/com/liang/controller/StaReimbursementController.java

@@ -852,19 +852,19 @@ public class StaReimbursementController extends BaseController {
     }
 
     /**
-     * 获取该年度项目总预算和已报账金额
+     * 获取该年度项目总预算和已报账金额,该科目细目组预算，科目已申请报账金额
      *
      * @param fysq
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/getZbjje/{fysq}", method = RequestMethod.POST)
-    public BaseResult getZbjje(@PathVariable Integer fysq) {
+    @RequestMapping(value = "/getZbjje/{fysq}/{fylb}", method = RequestMethod.POST)
+    public BaseResult getZbjje(@PathVariable Integer fysq,@PathVariable Integer fylb) {
     // 获取该报账的年度预算id
         StaBudgetapproval sb = staBudgetapprovalService.queryById(fysq);
         Integer nys = sb.getNys();
 //        通过年度预算id获取该年度已报账金额和项目总预算
-        StaBudgetapproval staBudgetapproval =staBudgetapprovalService.getZbjje(nys);
+        StaBudgetapproval staBudgetapproval =staBudgetapprovalService.getZbjje(nys,fylb);
         return BaseResult.success(staBudgetapproval);
     }
 }

src/main/java/com/liang/dao/StaBudgetapprovalDao.java

@@ -242,7 +242,7 @@ public interface StaBudgetapprovalDao {
 
     StaBudgetapproval getId(Integer id);
 
-    StaBudgetapproval getZbzje(@Param("nys") Integer nys);
+    StaBudgetapproval getZbzje(@Param("nys") Integer nys,@Param("fylb") Integer fylb);
 
 
     StaBudgetapproval getSqjes(Integer nys);

src/main/java/com/liang/entity/StaBudgetapproval.java

@@ -203,6 +203,14 @@ public class StaBudgetapproval implements Serializable {
      * 项目总报账金额
      */
     private Double zbzje;
+    /**
+     * 科目项目组预算
+     */
+    private Double kmzys;
+    /**
+     * 科目已报账金额
+     */
+    private Double kmybzje;
     /**
      * 是否退回
      */

src/main/java/com/liang/service/StaBudgetapprovalService.java

@@ -211,7 +211,7 @@ public interface StaBudgetapprovalService {
 
     StaBudgetapproval getId(Integer id);
 
-    StaBudgetapproval getZbjje(Integer nys);
+    StaBudgetapproval getZbjje(Integer nys,Integer fylb);
 
 
     StaBudgetapproval getSqjes(Integer nys);

src/main/java/com/liang/service/impl/StaBudgetapprovalServiceImpl.java

@@ -245,8 +245,8 @@ public class StaBudgetapprovalServiceImpl implements StaBudgetapprovalService {
     }
 
     @Override
-    public StaBudgetapproval getZbjje(Integer nys) {
-        return staBudgetapprovalDao.getZbzje(nys);
+    public StaBudgetapproval getZbjje(Integer nys,Integer fylb) {
+        return staBudgetapprovalDao.getZbzje(nys,fylb);
     }
 
     @Override

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -1036,15 +1036,15 @@
     <!--项目分项费用信息-->
     <select id="getKmFyInfo" resultMap="StaBudgetapprovalMap" parameterType="map">
         select b.NYS, b.FYLB,
-               ISNULL((select SUM(SQJE) from sta_BudgetApproval where  NYS = #{nys1} and FYLB = #{fylb1} and SPZT != '作废' and SFBYJ = 0),0) as SQJE,
+               ISNULL((select SUM(SQJE) from sta_BudgetApproval where  NYS = #{nys} and FYLB = #{fylb} and SPZT != '作废' and SFBYJ = 0),0) as SQJE,
                (select
                     SUM(sr.bzje)
                 from
                     sta_Reimbursement sr
                     left join  sta_BudgetApproval sb on sr.fysq = sb.id
                 where
-                sb.NYS = #{nys1}
-                and sb.FYLB = #{fylb1}
+                sb.NYS = #{nys}
+                and sb.FYLB = #{fylb}
                 and sb.SPZT != '作废'
                 and sb.SFBYJ = 0
                 and sr.spzt = '审批结束') as BZJE,
@@ -1057,8 +1057,8 @@
                 sta_BudgetApproval sb
                 left join sta_Reimbursement sr on sr.fysq = sb.id and sr.SPZT = '审批结束'
               where
-                sb.NYS = #{nys1}
-                and sb.fylb = #{fylb1}
+                sb.NYS = #{nys}
+                and sb.fylb = #{fylb}
                 and sb.spzt != '作废'
                 and sb.SFBYJ = 0
               ) xmndjfysq
@@ -1147,7 +1147,19 @@
     <select id="getZbzje" resultType="com.liang.entity.StaBudgetapproval">
         SELECT
             (SELECT XMZYS * 10000 FROM prj_AnnualBudgetDetail WHERE FJ = '' AND NYS = #{nys}) AS XMZYS,
-            (SELECT SUM(BZJE) FROM sta_BudgetApproval WHERE NYS = #{nys} ) AS ZBZJE;
+            (SELECT XMZ * 10000 FROM prj_AnnualBudgetDetail WHERE ID = #{fylb} AND NYS = #{nys}) AS KMZYS,
+            (SELECT SUM(BZJE) FROM sta_BudgetApproval WHERE NYS = #{nys} and SPZT = '审批结束' ) AS ZBZJE,
+            (select
+                 SUM(sr.bzje)
+             from
+                 sta_Reimbursement sr
+                     left join  sta_BudgetApproval sb on sr.fysq = sb.id
+             where
+                 sb.NYS = #{nys}
+               and sb.FYLB = #{fylb}
+               and sb.SPZT != '作废'
+                and sb.SFBYJ = 0
+                and sr.spzt != '作废') as KMYBZJE
     </select>
 
 <!--    <select id="getxmndjfysq" resultMap="StaBudgetapprovalMap">

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -331,8 +331,9 @@ where
             COALESCE(SUM(b.BCFKJE), 0) AS FKJE,
             COALESCE(a.BZJE, 0) / 10000 AS BZJE
         FROM sta_Reimbursement a
-        left  JOIN sta_PayApproval b ON a.FYSQ = b.FYSQ
-        WHERE a.FYSQ = #{fysq} and b.SPZT != '作废'
+                 left  JOIN sta_PayApproval b ON a.FYSQ = b.FYSQ AND b.SPZT != '作废'
+        WHERE a.FYSQ = #{fysq}
+          and a.spzt != '作废'
         GROUP BY a.BZJE
 
     </select>

src/main/resources/templates/reimburse/add.html

@@ -162,10 +162,14 @@
         var fysq = $("#fysq").val();
         var sqje = $("#sqje").val();
         var xmmc = [[${budgetapproval.xmmc}]];
+        var fylb = [[${budgetapproval.fylb}]];
         xmmc = xmmc.replace(/[\/\\]/g, '_');
         var htId ;
-        var xmzys;
-        var zbzje;
+
+        var xmzys;//项目总预算
+        var zbzje;//项目总报账额
+        var kmzys;//科目项目组预算
+        var kmybzje;//科目已报账金额
         var bzId = -1;
 
         setTimeout(function() {
@@ -518,8 +522,8 @@
             ],
             autoSort: false,
             limits: [10, 15, 20, 25, 50, 100],
-            limit: 10,
-            page: true,
+            limit: -1,
+            page: false,
             skin: 'grid',
             done: function (res, curr, count) { // done为数据渲染完的回调
             }
@@ -595,10 +599,12 @@
             });
         });
         AjaxUtil.post({
-            url: AjaxUtil.ctx + 'staReimbursement/getZbjje/'+fysq,
+            url: AjaxUtil.ctx + 'staReimbursement/getZbjje/'+fysq+'/'+fylb,
             success:function (data){
                 xmzys = data.data.xmzys;
                 zbzje = data.data.zbzje;
+                kmzys =data.data.kmzys;
+                kmybzje =data.data.kmybzje;
 
             }
         })
@@ -607,10 +613,23 @@
         form.on('submit(saveBtn)', function (data) {
             var sqje = parseFloat($("#sqje").val());
             var bzje = parseFloat($("#bzje").val());
+            console.log(kmzys)
+            console.log(kmybzje)
+            //校验报账金额是否大于科目项目组预算
+            if (kmzys == null  && kmzys ==''){
+                alert('该报账此费用类别没有项目组预算，请在年度预算中修改项目组预算!!')
+                return false;
+            }else if (bzje > kmzys){
+                alert('报账金额大于该科目项目组预算，请查看年度预算中该科目项目组预算后重新填写!!!')
+                return false;
+            }else if (bzje + kmybzje >kmzys){
+                alert('该科目已申请报账加上当前报账金额，已超过该科目项目组预算!!')
+                return false;
+            }
             // 获取该项目的总报账金额
             if (xmzys !== null && zbzje !== null) {
                 if (zbzje + bzje > xmzys) {
-                    alert("该项目已申请报账加上当前报账金额,超过该项目总预算!!")
+                    alert("该项目已申请报账加上当前报账金额,已超过该项目总预算!!")
                     return false;
                 }
             }
@@ -729,87 +748,6 @@
                     }
                 });
             }
-            // var index = layer.load(0, {shade: 0.1});
-            // layer.confirm('保存后合同基础信息将不能修改，你确定要继续吗？', {
-            //     btn: ['确定', '取消']
-            // }, function(){
-            //     // 确定的回调
-            //     AjaxUtil.post({
-            //         url: url,
-            //         data: data.field,
-            //         success: function (res) {
-            //             var project = {
-            //                 "id": htId,
-            //                 "spzt": '锁定中'
-            //             }
-            //             AjaxUtil.post({
-            //                 url: AjaxUtil.ctx +"prjContract/updateSpzt",
-            //                 contentType: "application/json",
-            //                 data: JSON.stringify(project),
-            //                 success:function () {
-            //                     console.log(htId+'状态修改成功为'+'锁定中')
-            //                 }
-            //             })
-            //             if (res.code === 0) {
-            //                 Message.success(1500, res.message, function () {
-            //                     parent.setUpdateFlag();
-            //                     if (bzId == -1) {
-            //                         bzId = res.data.id;
-            //                         $("#id").val(bzId);
-            //                     }
-            //                     //差旅费
-            //                     var travleExpenses = [];
-            //                     for (const item of dataExpense) {
-            //                         var expense = {
-            //                             "zb": fysq,
-            //                             "xh": item.xh,
-            //                             "ccr": item.ccr,
-            //                             "ccsy": item.ccsy,
-            //                             "ccdd": item.ccdd,
-            //                             "qsrq": item.qsrq,
-            //                             "jtf": item.jtf,
-            //                             "zsf": item.zsf,
-            //                             "cb": item.cb,
-            //                             "jsrq": item.jsrq,
-            //                             "ccts": item.ccts,
-            //                             "zj": item.zj,
-            //                             "rpj": item.rpj,
-            //                             "ccsy": item.ccsy
-            //                         };
-            //                         travleExpenses.push(expense);
-            //                     }
-            //                     //保存差旅费
-            //                     AjaxUtil.post({
-            //                         url: AjaxUtil.ctx + "staActualexpenses/batchInsert/" + fysq,
-            //                         contentType: "application/json",
-            //                         data: JSON.stringify(travleExpenses),
-            //                         success: function (res) {
-            //                             if (res.code === 0) {
-            //                                 // Message.success(1500, res.message, function () {
-            //                                 //
-            //                                 // });
-            //                             } else {
-            //                                 // Message.error(res.message, 1000);
-            //                             }
-            //                         },
-            //                         error: function (error) {
-            //                         }
-            //                     });
-            //
-            //                     var iframeIndex = parent.layer.getFrameIndex(window.name);
-            //                     parent.layer.close(iframeIndex);
-            //                 });
-            //             } else {
-            //                 Message.error(res.message, 1000);
-            //             }
-            //         },
-            //         error: function (error) {
-            //             Message.error(error.message, 1000)
-            //         }
-            //     });
-            // }, function(){
-            //     // layer.close(index);
-            // });
         });
 
         // 监听取消按钮

src/main/resources/templates/reimburse/update.html

@@ -143,6 +143,25 @@
             layer = layui.layer,
             upload = layui.upload;
         var fysq = $("#fysq").val();
+        var fylb = [[${reimbursement.fylb}]]
+
+        var xmzys;//项目总预算
+        var zbzje;//项目总报账额
+        var kmzys;//科目项目组预算
+        var kmybzje;//科目已报账金额
+
+
+        AjaxUtil.post({
+            url: AjaxUtil.ctx + 'staReimbursement/getZbjje/'+fysq+'/'+fylb,
+            success:function (data){
+                console.log(data.data)
+                xmzys = data.data.xmzys;
+                zbzje = data.data.zbzje;
+                kmzys =data.data.kmzys;
+                kmybzje =data.data.kmybzje;
+
+            }
+        })
 
         // //下拉框回显
         // function set_select(id, value) {
@@ -207,9 +226,6 @@
                 bzje = 0;
             } else {
                 var sqje = parseFloat($("#sqje").val());
-                // if(bzje > sqje)
-                //     Message.error("报账金额与申请金额不符!", 1500);
-                // else {
                 var sl = parseInt($("#sl").val(), 10);
                 var bhsje = (bzje * 100) / (100 + sl);
                 $("#bhsje").val(bhsje.toFixed(2));
@@ -251,8 +267,8 @@
             ],
             autoSort: false,
             limits: [10, 15, 20, 25, 50, 100],
-            limit: 10,
-            page: true,
+            limit: -1,
+            page: false,
             skin: 'grid',
             initSort: {
                 field: 'xh', //排序字段
@@ -528,11 +544,30 @@
         form.on('submit(saveBtn)', function (data) {
             var sqje = parseFloat($("#sqje").val());
             var bzje = parseFloat($("#bzje").val());
-            // if(bzje != sqje) {
-            //     Message.error("报账金额与申请金额不符!", 1500);
-            //     return false;
-            // }
-            //报销凭证
+            var oldbzje = [[${reimbursement.bzje}]]
+            console.log('xmzys='+xmzys)
+            console.log('zbzje='+zbzje)
+            console.log('kmzys='+kmzys)
+            console.log('kmybzje='+kmybzje)
+            console.log('oldbzje='+oldbzje)
+            console.log('bzje='+bzje)
+            if (kmzys == null  && kmzys ==''){
+                alert('该报账此费用类别没有项目组预算，请在年度预算中修改项目组预算!!')
+                return false;
+            }else if (bzje > kmzys){
+                alert('报账金额大于该科目项目组预算，请查看年度预算中该科目项目组预算后重新填写!!!')
+                return false;
+            }else if (bzje + kmybzje -oldbzje >kmzys){
+                alert('该科目已申请报账加上当前报账金额，已超过该科目项目组预算!!')
+                return false;
+            }
+            // 获取该项目的总报账金额
+            if (xmzys !== null && zbzje !== null) {
+                if (zbzje + bzje - oldbzje > xmzys) {
+                    alert("该项目已申请报账加上当前报账金额,已超过该项目总预算!!")
+                    return false;
+                }
+            }
 
             var dataWB = [];
             for (const item of dataBxpz) {