新建付款申请增加 申请金额、报账金额、已付款金额列表

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

@@ -105,5 +105,7 @@ public class StaReimbursement implements Serializable {
 
     private String sqr;
 
+    private Double yfje;
+
 }
 

src/main/resources/mapper/StaReimbursementDao.xml

@@ -28,6 +28,7 @@
         <result property="fysqmc" column="SQMC" jdbcType="VARCHAR"/>
         <result property="xmlx" column="XMLX" jdbcType="VARCHAR"/>
         <result property="sfbyjs" column="SFBYJS" jdbcType="VARCHAR"/>
+        <result property="yfje" column="YFJE" jdbcType="DOUBLE"/>
     </resultMap>
 
     <!--id查询单个-->
@@ -202,9 +203,9 @@
         u.name AS BZRXM,
         d.DEPT_NAME AS SSBMMC,
         t.XMLXMC AS XMLX,
+        COALESCE((select SUM(BCFKJE) from sta_PayApproval sp WHERE sp.FYSQ = r.FYSQ AND sp.SPZT != '作废') * 10000,0.00) AS YFJE,
         a.SFBYJ AS SFBYJS,
         CASE
-
         WHEN a.SFBYJ = 1 THEN
         '是' ELSE '否'
         END AS SFBYJ
@@ -296,7 +297,7 @@
         WHEN r.SPZT = '作废' THEN 999
         END
         ASC,
-        CJSJ DESC
+        r.CJSJ DESC
     </select>
     <select id="getRwsIdByBzId" resultType="java.lang.Integer">
         SELECT sb.XMID

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

@@ -75,7 +75,7 @@
                                 </select>
                             </div>
                         </div>
-
+                        <br/>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 70px;">费用申请</label>
                             <div class="layui-input-inline" style="width: 140px;">

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

@@ -87,8 +87,11 @@
                 [
                     {type: 'numbers'},
                     {field: 'xmmc', width: '25%', title: '项目名称'},
-                    {field: 'mc', width: '25%', title: '报账名称'},
+                    {field: 'sqje',width: '10%',title: '申请金额(元)',align: 'right'},
+                    {field: 'bzje',width: '10%',title: '报账金额(元)',align: 'right'},
+                    {field: 'yfje',width: '10%',title: '已付款金额(元)',align: 'right'},
                     {field: 'erpbh', width: '15%', title: 'ERP编号'},
+                    {field: 'mc', width: '25%', title: '报账名称'},
                     {field: 'fysqmc', width: '25%', title: '费用申请'},
                     {field: 'cjsj', width: '10%', title: '创建时间', align: 'center'},
                     {field: 'bzrxm', width: '10%', title: '报账人', align: 'center'}

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -606,8 +606,8 @@
                     {field: 'xmjsrq',title: '项目结束时间',width: '18%'},
                     {field: 'qsrq', title: '聘用起始时间', width: '15%'},
                     {field: 'jsrq', title: '聘用截止时间', width: '15%'},
-                    {field: 'fysq', title: '费用申请', width: '15%'},
-                    {field: 'bzfy', title: '报账费用', width: '15%'},
+                   /* {field: 'fysq', title: '费用申请', width: '15%'},
+                    {field: 'bzfy', title: '报账费用', width: '15%'},*/
                     {field: 'byxx', title: '毕业学校', width: '15%'},
                     {field: 'zy', title: '专业', width: '15%'},
                     {field: 'xl', title: '学历', width: '15%'},