Home Explore Help
Register Sign In
ly
/
KYGK
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

年度预算调整

ly 4 months ago
parent
82aa7eb8e6
commit
33cbe163f7
4 changed files with 12 additions and 6 deletions
Unified View Show Diff Stats
  1. 7 1
      src/main/resources/mapper/PrjAnnualbudgetDao.xml
  2. 1 1
      src/main/resources/templates/annualbudget/list.html
  3. 2 2
      src/main/resources/templates/annualbudget/mylist.html
  4. 2 2
      src/main/resources/templates/home/welcome-1.html

+ 7 - 1
src/main/resources/mapper/PrjAnnualbudgetDao.xml
View File 

@@ -387,7 +387,13 @@
387 
         0.00
 387 
         0.00
388 
         ) AS BZZE,
 388 
         ) AS BZZE,
389 
         COALESCE (-- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
 389 
         COALESCE (-- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
390 
-        ( SELECT SUM ( sb.SQJE ) FROM sta_BudgetApproval sb WHERE sb.NYS = a.ID AND sb.SPZT != '作废' ),
390 
+        ( SELECT SUM(
391 
+            CASE
392 
+         WHEN sb.SFBZ = 0 THEN sb.SQJE
393 
+         WHEN sb.SFBZ = 1 THEN sb.BZJE
394 
+         END
395 
+            )
396 
+          FROM sta_BudgetApproval sb WHERE sb.NYS = a.ID AND sb.SPZT != '作废' ),
391 
         0.00
 397 
         0.00
392 
         ) AS SQJE,
 398 
         ) AS SQJE,
393 
          COALESCE (
 399 
          COALESCE (

+ 1 - 1
src/main/resources/templates/annualbudget/list.html
View File 

@@ -264,7 +264,7 @@
264 
                     {field: 'czje', width: '7%', title: '年预算（元）',align: 'right'},
 264 
                     {field: 'czje', width: '7%', title: '年预算（元）',align: 'right'},
265 
                     {field: 'sqje', width: '7%', title: '已申请（元）',align: 'right'},
 265 
                     {field: 'sqje', width: '7%', title: '已申请（元）',align: 'right'},
266 
                     {field: 'bzze', width: '7%', title: '已报账（元）',align: 'right'},
 266 
                     {field: 'bzze', width: '7%', title: '已报账（元）',align: 'right'},
267 
-                    {field: 'yfze', width: '7%', title: '已付总额(元)', align: 'right'},
267 
+                    /*{field: 'yfze', width: '7%', title: '已付总额(元)', align: 'right'},*/
268 
                     {templet: function (row) {
 268 
                     {templet: function (row) {
269 
                             const czjeValue = Number(row.czje); // 将获取到的值转换为数值类型
 269 
                             const czjeValue = Number(row.czje); // 将获取到的值转换为数值类型
270 
                             const bzzeValue = Number(row.sqje);
 270 
                             const bzzeValue = Number(row.sqje);

+ 2 - 2
src/main/resources/templates/annualbudget/mylist.html
View File 

@@ -1,4 +1,4 @@
1 
-<!DOCTYPE html>
1 
+    <!DOCTYPE html>
2 
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 2 
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
3 
 <head>
 3 
 <head>
4 
     <meta charset="UTF-8">
 4 
     <meta charset="UTF-8">
 
@@ -179,7 +179,7 @@
179 
                     {field: 'czje', width: '7%',title: '年预算（元）',align: 'right'},
 179 
                     {field: 'czje', width: '7%',title: '年预算（元）',align: 'right'},
180 
                     {field: 'sqje', width: '7%',title: '已申请（元）',align: 'right'},
 180 
                     {field: 'sqje', width: '7%',title: '已申请（元）',align: 'right'},
181 
                     {field: 'bzze', width: '7%',title: '已报账（元）',align: 'right'},
 181 
                     {field: 'bzze', width: '7%',title: '已报账（元）',align: 'right'},
182 
-                    {field: 'yfze', width: '7%', title: '已付总额(元)', align: 'right'},
182 
+                    /*{field: 'yfze', width: '7%', title: '已付总额(元)', align: 'right'},*/
183 
                     {templet: function (row) {
 183 
                     {templet: function (row) {
184 
                             const czjeValue = Number(row.czje); // 将获取到的值转换为数值类型
 184 
                             const czjeValue = Number(row.czje); // 将获取到的值转换为数值类型
185 
                             const bzzeValue = Number(row.bzze);
 185 
                             const bzzeValue = Number(row.bzze);

+ 2 - 2
src/main/resources/templates/home/welcome-1.html
View File 

@@ -364,13 +364,13 @@
364 
                 [
 364 
                 [
365 
                     {type: "radio", fixed: 'left',title: '😊'},
 365 
                     {type: "radio", fixed: 'left',title: '😊'},
366 
                     {type: 'numbers', align: 'center',title: '序号'},
 366 
                     {type: 'numbers', align: 'center',title: '序号'},
367 
-                    {field: 'spzt', width: '18%', title: '审批状态'},
367 
+                    {field: 'spzt', width: '15%', title: '审批状态'},
368 
                     {field: 'xmlxmc', width: '10%', title: '类型'},
 368 
                     {field: 'xmlxmc', width: '10%', title: '类型'},
369 
                     {field: 'xm', width: '35%', title: '项目/申请'},
 369 
                     {field: 'xm', width: '35%', title: '项目/申请'},
370 
                     {field: 'erpbh',width: '10%',title: 'ERP编号'},
 370 
                     {field: 'erpbh',width: '10%',title: 'ERP编号'},
371 
                     // {field: 'zt', width: '12%',title: '状态', sort: true},
 371 
                     // {field: 'zt', width: '12%',title: '状态', sort: true},
372 
                     {field: 'tjrxm', width: '8%', title: '提交人', align: 'center'},
 372 
                     {field: 'tjrxm', width: '8%', title: '提交人', align: 'center'},
373 
-                    {field: 'tjsj', width: '20%', title: '提交时间', align: 'center'}
373 
+                    {field: 'tjsj', width: '20%', title: '提交时间', align: 'center'},
374 
                 ]
 374 
                 ]
375 
             ],
 375 
             ],
376 
             sortName: 'xm',
 376 
             sortName: 'xm',