浏览代码

除项目总预算汇总外,申请、报账、付款额汇总

ly 4 月之前
父节点
当前提交
39abcd30cf

+ 15 - 0
src/main/java/com/liang/entity/PrjProject.java

@@ -212,5 +212,20 @@ public class PrjProject implements Serializable {
212 212
      * 项目总额
213 213
      */
214 214
     private Double xmze;
215
+
216
+    /**
217
+     * 报账总额
218
+     */
219
+    private Double bzze;
220
+
221
+    /**
222
+     * 费用申请总额
223
+     */
224
+    private  Double sqze;
225
+
226
+    /**
227
+     * 已付总额
228
+     */
229
+    private  Double yfze;
215 230
 }
216 231
 

+ 45 - 8
src/main/resources/mapper/PrjProjectDao.xml

@@ -42,6 +42,9 @@
42 42
         <result property="nys" column="NYS" jdbcType="INTEGER"/>
43 43
         <result property="sfxg" column="SFXG" jdbcType="INTEGER"/>
44 44
         <result property="xmze" column="XMZE" jdbcType="DOUBLE"/>
45
+        <result property="sqze" column="SQZE" jdbcType="DOUBLE"/>
46
+        <result property="bzze" column="BZZE" jdbcType="DOUBLE"/>
47
+        <result property="yfze" column="YFZE" jdbcType="DOUBLE"/>
45 48
     </resultMap>
46 49
 
47 50
     <resultMap type="com.liang.entity.FeeManagemant" id="FeeManagementMap">
@@ -466,14 +469,48 @@
466 469
 
467 470
     <!--项目列表-->
468 471
     <select id="getProjectList" resultMap="PrjProjectMap" parameterType="map">
469
-        select p.*, t.XMLXMC, u.name as CJRXM, k.MC as KYBGMC, b.YSJE
470
-        from prj_Project p
471
-        left join base_ProjectType t on t.XMLX = p.XMLX
472
-        left join sys_user_info u on u.user_id = p.CJR
473
-        LEFT join sys_dept_info d on d.dept_id = u.dept_id
474
-        left join sta_FeasibilityReport k on k.ID = p.BM
475
-        left join prj_Budget b on b.XM = p.ID and b.FJ = ''
476
-        where p.XMMB != 1
472
+        SELECT
473
+        p.*,
474
+        t.XMLXMC,
475
+        u.name AS CJRXM,
476
+        k.MC AS KYBGMC,
477
+        b.YSJE,
478
+        COALESCE (
479
+        (
480
+        SELECT SUM
481
+        ( CASE WHEN sb.SFBZ = 0 THEN sb.SQJE WHEN sb.SFBZ = 1 THEN sb.BZJE END )
482
+        FROM
483
+        sta_BudgetApproval sb
484
+        WHERE
485
+        sb.XMID = p.ID
486
+        AND sb.SPZT = '审批结束'
487
+        ),
488
+        0.00
489
+        ) AS SQZE,
490
+        COALESCE ( ( SELECT SUM ( sb.BZJE ) FROM sta_BudgetApproval sb WHERE sb.XMID = p.ID AND sb.SPZT = '审批结束' ), 0.00 ) AS BZZE,
491
+        COALESCE (
492
+        (
493
+        SELECT SUM
494
+        ( sp.BCFKJE )
495
+        FROM
496
+        sta_PayApproval sp
497
+        LEFT JOIN sta_BudgetApproval sb ON sp.FYSQ = sb.ID
498
+        WHERE
499
+        sb.XMID = p.ID
500
+        AND sp.SPZT = '审批结束'
501
+        ) * 10000,
502
+        0.00
503
+        ) AS YFZE
504
+        FROM
505
+        prj_Project p
506
+        LEFT JOIN base_ProjectType t ON t.XMLX = p.XMLX
507
+        LEFT JOIN sys_user_info u ON u.user_id = p.CJR
508
+        LEFT JOIN sys_dept_info d ON d.dept_id = u.dept_id
509
+        LEFT JOIN sta_FeasibilityReport k ON k.ID = p.BM
510
+        LEFT JOIN prj_Budget b ON b.XM = p.ID
511
+        AND b.FJ = ''
512
+        WHERE
513
+        p.XMMB != 1
477 514
         <if test="userId != null and userId != ''">
478 515
            and p.CJR = #{userId}
479 516
         </if>

+ 4 - 4
src/main/resources/templates/payapply/update_approve.html

@@ -25,13 +25,13 @@
25 25
             <div class="layui-tab-item" style="min-height: 550px">
26 26
                 <form class="layui-form" action="" lay-filter="formDemo" style="transform: none">
27 27
                     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
28
-                        <div class="layui-form-item layui-inline" style="width: 100%">
28
+                       <!-- <div class="layui-form-item layui-inline" style="width: 100%">
29 29
                             <label class="layui-form-label" style="width: 10%">费用申请</label>
30 30
                             <div class="layui-input-inline" style="width: 80%">
31 31
                                 <input type="text" id="fysqmc" name="fysqmc" class="layui-input" th:value="${payapproval.fysqmc}"
32 32
                                        readonly>
33 33
                             </div>
34
-                        </div>
34
+                        </div>-->
35 35
                         <div class="layui-form-item layui-inline" style="width: 100%">
36 36
                             <label class="layui-form-label" style="width: 10%">任务书</label>
37 37
                             <div class="layui-input-inline" style="width: 80%">
@@ -275,7 +275,7 @@
275 275
             data: dataHtwj,
276 276
             cols: [
277 277
                 [
278
-                    {type: 'numbers', align: 'center',width: '7%'},
278
+                    {type: 'numbers', align: 'center',width: '7%',title: '序号'},
279 279
                     {field: 'wjm', title: '文件名', width: '60%'},
280 280
                     {field: 'scrq', title: '上传日期', width: '15%', align: 'center'},
281 281
                     {field: 'sm', title: '说明',width: '20%'}
@@ -346,7 +346,7 @@
346 346
             data: dataYszl,
347 347
             cols: [
348 348
                 [
349
-                    {type: 'numbers', align: 'center',width: '7%'},
349
+                    {type: 'numbers', align: 'center',width: '7%',title: '序号'},
350 350
                     {field: 'wjm', title: '文件名', width: '60%'},
351 351
                     {field: 'scrq', title: '上传日期', width: '15%', align: 'center'},
352 352
                     {field: 'sm', title: '说明',width: '20%'}

+ 3 - 0
src/main/resources/templates/prjproject/list.html

@@ -206,6 +206,9 @@
206 206
                     {field: 'zwmc', width: '26%', title: '中文名称'},
207 207
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
208 208
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
209
+                    {field: 'sqze',width: '10%',title: '申请总额(元)',align: 'right'},
210
+                    {field: 'bzze', width: '10%', title: '报账总额(元)',align: 'right'},
211
+                    {field: 'yfze',width: '10%',title: '已付总额(元)',align: 'right'},
209 212
                     {field: 'xmlxmc', width: '15%', title: '项目类型'},
210 213
                     {field: 'qs', width: '8%', title: '起始', align: 'center'},
211 214
                     {field: 'wc', width: '8%', title: '完成', align: 'center'},