错误数据添加背景颜色，添加保存限制禁止付款金额大于已报账金额，sql优化

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

@@ -222,14 +222,6 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
     @Override
     public List<PrjAnnualbudgetdetail> getBz(Map map) {
         List<PrjAnnualbudgetdetail> bz = this.prjAnnualbudgetdetailDao.getBz(map);
-
-        for (int i = 0; i < bz.size(); i++) {
-            PrjAnnualbudgetdetail detail = bz.get(i);
-            if (detail != null && detail.getYfze() > detail.getBzze()) {
-                bz.remove(i);
-                i--;
-            }
-        }
         return bz;
 
     }

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -721,32 +721,21 @@
     </select>
     <select id="getBz" resultType="com.liang.entity.PrjAnnualbudgetdetail">
         SELECT
-        SUM(inner_result.BZZE) AS BZZE,
-        MAX(inner_result.YFZE) AS YFZE,
-        inner_result.XMMC,
-        inner_result.FYMC
+        SUM(budget.BZZE) * 0.0001 AS BZZE,
+        SUM(payment.YFZE) AS YFZE,
+        budget.XMMC,
+        budget.FYMC
         FROM (
         SELECT
-        COALESCE((SUM(b_sub.BZZE)), 0.00) * 0.0001 AS BZZE,
-        c_sub.YFZE,
-        b_sub.XMMC,
-        b_sub.ID,
-        b_sub.FYMC
-        FROM
-        (
-        SELECT
-        COALESCE(SUM(r.BZJE), 0.00) AS BZZE,
-        b.XMMC,
         b.ID,
-        a.FYMC
-        FROM
-        sta_BudgetApproval b
-        LEFT JOIN sta_Reimbursement r on r.FYSQ = b.ID
+        b.XMMC,
+        a.FYMC,
+        COALESCE(SUM(r.BZJE), 0.00) AS BZZE
+        FROM sta_BudgetApproval b
+        LEFT JOIN sta_Reimbursement r ON r.FYSQ = b.ID AND r.SPZT = '审批结束'
         LEFT JOIN prj_AnnualBudgetDetail a ON a.ID = b.FYLB
-        WHERE
-        b.SFBZ = 1
+        WHERE b.SFBZ = 1
         AND b.SPZT = '审批结束'
-        AND r.SPZT = '审批结束'
         AND b.BH != ''
         <if test="nys != null and nys !=''">
             AND b.NYS = #{nys}
@@ -755,37 +744,20 @@
             AND b.XMID = #{xmid}
         </if>
         <if test="fymc != null and fymc != ''">
-            AND a.FYMC like '%'+#{fymc}+'%'
+            AND a.FYMC LIKE '%'+#{fymc}+'%'
         </if>
-        GROUP BY
-        b.XMMC,
-        a.FYMC,
-        b.ID
-        ) b_sub
-        LEFT JOIN
-        (
+        GROUP BY b.ID, b.XMMC, a.FYMC
+        ) budget
+        LEFT JOIN (
         SELECT
-        c.FYSQ,
-        COALESCE(SUM(c.BCFKJE), 0.00) AS YFZE
-        FROM
-        sta_PayApproval c
-        WHERE
-        c.SPZT != '作废'
-        GROUP BY
-        c.FYSQ
-        ) c_sub ON b_sub.ID = c_sub.FYSQ
-        GROUP BY
-        c_sub.YFZE,
-        b_sub.XMMC,
-        b_sub.ID,
-        b_sub.FYMC
-        ) inner_result
-        GROUP BY
-        inner_result.XMMC,
-        inner_result.FYMC
-        ORDER BY
-        inner_result.FYMC,
-        inner_result.XMMC;
+        FYSQ,
+        COALESCE(SUM(BCFKJE), 0.00) AS YFZE
+        FROM sta_PayApproval
+        WHERE SPZT = '审批结束'
+        GROUP BY FYSQ
+        ) payment ON budget.ID = payment.FYSQ
+        GROUP BY budget.XMMC, budget.FYMC
+        ORDER BY budget.FYMC, budget.XMMC;
     </select>
     <select id="getWw" resultType="java.math.BigDecimal">
         SELECT

src/main/resources/templates/payapply/adds.html

@@ -154,6 +154,8 @@
         var xmApproval = parent.getXmApproval();
         let htList = ' ';
         var ysId = 1;
+        var bzze = 0.0;
+        var yf‘ze = 0.0;
         $("#fysq").val(xmApproval.fysq);
         $("#fysqmc").val(xmApproval.fysqmc);
         $("#rws").val(xmApproval.rws);
@@ -379,22 +381,52 @@
                                             {type: "radio", fixed: 'left',title: '😊'},
                                             {type: 'numbers', align: 'center',title: '序号'},
                                             {field: 'fymc', width: '25%', title: '费用名称'},
-                                            {title: '报账总金额(万元)',align: 'right',width: '20%',templet:function (row) {
-                                                if (row.bzze == ' '){
-                                                    return 0.00;
-                                                }else if (row.bzze == null){
-                                                    return 0.00;
-                                                }else {
-                                                    return  parseFloat(row.bzze).toFixed(2).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-                                                }
-                                                }},
-                                            {title: '已付总额(万元)',width: '20%',align: 'right',templet:function (row) {
-                                                if (row.yfze == null || row.yfze == ' '){
-                                                    return 0.00;
+                                            {
+                                                title: '报账总金额(万元)',
+                                                align: 'right',
+                                                width: '20%',
+                                                templet: function(row) {
+                                                    // 检查空值
+                                                    if (row.bzze == ' ' || row.bzze == null) {
+                                                        return '<div style="display:block;">0.00</div>';
+                                                    }
+
+                                                    // 格式化数值
+                                                    const formattedValue = parseFloat(row.bzze).toFixed(2).toLocaleString(undefined, {
+                                                        minimumFractionDigits: 2,
+                                                        maximumFractionDigits: 2
+                                                    });
+
+                                                    // 检查是否 yfze ≥ bzze
+                                                    const shouldHighlight = parseFloat(row.yfze || 0) > parseFloat(row.bzze || 0);
+                                                    const bgStyle = shouldHighlight ? 'background-color: #ffdddd;' : '';
+
+                                                    return `<div style="${bgStyle}">${formattedValue}</div>`;
                                                 }
-                                                return row.yfze.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+                                            },
+                                            {
+                                                title: '已付总额(万元)',
+                                                width: '20%',
+                                                align: 'right',
+                                                templet: function(row) {
+                                                    // 检查空值
+                                                    if (row.yfze == null || row.yfze == ' ') {
+                                                        return '<div style="display:block;">0.00</div>';
+                                                    }
+
+                                                    // 格式化数值
+                                                    const formattedValue = row.yfze.toLocaleString(undefined, {
+                                                        minimumFractionDigits: 2,
+                                                        maximumFractionDigits: 2
+                                                    });
 
-                                                }},
+                                                    // 检查是否 yfze ≥ bzze
+                                                    const shouldHighlight = parseFloat(row.yfze || 0) > parseFloat(row.bzze || 0);
+                                                    const bgStyle = shouldHighlight ? 'background-color: #ffdddd;' : '';
+
+                                                    return `<div style="${bgStyle}">${formattedValue}</div>`;
+                                                }
+                                            },
                                             {title: '可申请额度(万元)',align: 'right',width: '20%',templet:function (row) {
                                                     const bzze = parseFloat(row.bzze);
                                                     const yfze = parseFloat(row.yfze);
@@ -417,6 +449,12 @@
                                     ]
                                 },
                                 done: function (elem, data) {
+                                    const selectedRow = data.data[0]; // 如果是单选模式，data.data[0] 就是选中的行
+
+                                    // 获取报账总额和已付总额
+                                     bzze = selectedRow.bzze || 0; // 已报账总额
+                                     yfze = selectedRow.yfze || 0; // 已付款总额
+
                                     var NEWJSON = [];
                                     var NEWJSON1 = [];
                                     var NEWJSON2 = [];
@@ -457,6 +495,10 @@
                 e.delegateTarget.value = "";
             }else if (bcfkje > 1000){
                 layer.msg('本次付款金额单位为万元，请确认当前数据无误。',{icon:2});
+            }else if (bcfkje + yfze > bzze){
+                console.log('bcfkje:' + bcfkje + 'yfze:' + yfze + 'bzze:' + bzze)
+                layer.msg('本次付款金额和已付款金额之和不能大于已报账总额，请重新输入！',{icon:2});
+                e.delegateTarget.value = "";
             }
         });
         //合同文件