年度预算增加年预算、已申请、已报账金额

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

@@ -188,6 +188,9 @@ public class PrjAnnualbudgetController extends BaseController {
         return BaseResult.success(result);
     }
 
+    @Resource
+    private SysDeptInfoService sysDeptInfoService;
+
     @ApiOperation(value = "页面初始化", notes = "页面初始化")
     @RequestMapping(value = "/init_mylist", method = RequestMethod.GET)
     public String init_mylist(Model model) {
@@ -201,6 +204,7 @@ public class PrjAnnualbudgetController extends BaseController {
         List<String> yearList = prjAnnualbudgetService.getYearList();
         model.addAttribute("yearList", yearList);
 
+        model.addAttribute("dept",sysDeptInfoService.getDeptName());
         return "annualbudget/mylist";
     }
         @RequestMapping(value = "/ViewXGSQ", method = RequestMethod.GET)

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

@@ -96,6 +96,20 @@ public class PrjAnnualbudget implements Serializable {
      */
     private Integer sfxg;
 
+    /**
+     * 年度出资额
+     */
+    private Double czje;
+
+    /**
+     * 年度报账额
+     */
+    private Double bzze;
+
+    /**
+     * 申请金额
+     */
+    private Double sqje;
 
 }
 

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -20,6 +20,10 @@
         <result property="ssbm" column="SSBM" jdbcType="INTEGER"/>
         <result property="xmzxq" column="XMZXQ" jdbcType="VARCHAR"/>
         <result property="sfxg" column="SFXG" jdbcType="INTEGER"/>
+        <result property="czje" column="CZJE" jdbcType="DOUBLE"/>
+        <result property="bzze" column="BZZE" jdbcType="DOUBLE"/>
+        <result property="sqje" column="SQJE" jdbcType="DOUBLE"/>
+
     </resultMap>
 
     <!--查询单个-->
@@ -349,9 +353,27 @@
         r.XM AS XMFZRXM,
         d.dept_name AS SSBMMC,
         u.name AS SQRXM,
-        bd.XMZYS
+        bd.XMZYS,
+        pf.CZJE * 10000 AS CZJE,
+        COALESCE(
+        -- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
+        (SELECT SUM(sb.BZJE)
+        FROM sta_BudgetApproval sb
+        where sb.NYS = a.ID AND sb.SPZT != '作废'
+        ),
+        0.00
+        ) AS BZZE,
+        COALESCE(
+        -- 在子查询里先对BZJE列的NULL值替换为0，再进行关联、筛选、分组求和
+        (SELECT SUM(sb.SQJE)
+        FROM sta_BudgetApproval sb
+        where sb.NYS = a.ID AND sb.SPZT != '作废'
+        ),
+        0.00
+        ) AS SQJE
         FROM
         prj_AnnualBudget a
+        LEFT JOIN prj_FeeScheme pf ON a.RWS = pf.ZB and a.NF =  pf.NF
         LEFT JOIN base_ProjectType t ON t.XMLX = a.XMLX
         LEFT JOIN base_Person r ON r.ID = a.XMFZR
         LEFT JOIN sys_user_info u ON u.user_id = a.SQR

src/main/resources/templates/annualbudget/mylist.html

@@ -48,6 +48,7 @@
                                 </select>
                             </div>
                         </div>
+                        <br/>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">项目类型</label>
                             <div class="layui-input-inline" style="width: 145px">
@@ -58,7 +59,7 @@
                                 </select>
                             </div>
                         </div>
-                        <br/>
+
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">所属部门</label>
                             <div class="layui-input-inline" style="width: 145px"><!--
@@ -169,19 +170,32 @@
             cols: [
                 [
                     {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', align: 'center'},
-                    {field: 'spzt', width: '13%', title: '审批状态'},
+                    {type: 'numbers', align: 'center',title: '序号'},
+                    {field: 'spzt', width: '7%', title: '审批状态'},
                     {field: 'rwsmc', width: '20%', title: '项目名称'},
                     // {field: 'mc', width: '20%', title: '名称'},
-                    {field: 'mc', width: '20%', title: '年度预算名称'},
+
                     {field: 'erpbh', width: '8%', title: 'ERP编号'},
-                    {field: 'xmlxmc', width: '12%', title: '项目类型'},
-                    {field: 'xmfzrxm', width: '7%', title: '项目负责人'},
-                    {field: 'ssbmmc', width: '10%', title: '所属部门'},
+                    {field: 'czje',width: '7%',title: '年预算（元）',align: 'right'},
+                    {field: 'sqje', width: '7%',title: '已申请（元）',align: 'right'},
+                    {field: 'bzze',width: '7%',title: '已报账（元）',align: 'right'},
+                    {templet: function (row) {
+                            const czjeValue = Number(row.czje); // 将获取到的值转换为数值类型
+                            const bzzeValue = Number(row.sqje);
+                            if (!isNaN(czjeValue) &&!isNaN(bzzeValue) && bzzeValue!== 0) { // 避免除数为0
+                                const syl =  (bzzeValue / czjeValue) * 100;
+                                return syl.toFixed(2) + '%';// 乘以100转换为百分比形式
+                            }
+                            return '0%'; // 如果出现异常情况（比如除数为0等），返回默认值0
+                        }, width: '7%',title: '使用率（%）',align: 'right'},
                     {field: 'nf', width: '5%', title: '年份'},
+                    {field: 'ssbmmc', width: '10%', title: '所属部门'},
                     {field: 'sqrxm', width: '6%', title: '申请人'},
                     {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'},
-                    {field: 'sm', width: '10%', title: '说明'}
+                    {field: 'xmlxmc', width: '12%', title: '项目类型'},
+                    {field: 'xmfzrxm', width: '7%', title: '项目负责人'},
+                    {field: 'mc', width: '20%', title: '年度预算名称'},
+                   /* {field: 'sm', width: '10%', title: '说明'}*/
                 ]
             ],
             autoSort: false,
@@ -224,7 +238,8 @@
                 "rwsmc": '',
                 "ssbmmc": '',
                 "nf": '',
-                "spzt": ''
+                "spzt": '',
+                "xmmc": ''
             });
             // 执行搜索重载
             currTable.reload({

src/main/resources/templates/annualbudget/view_xgsq.html

@@ -54,7 +54,7 @@
       cols: [
         [
           {type: "checkbox", fixed: 'left'},
-          {type: 'numbers', align: 'center'},
+          {type: 'numbers', align: 'center',title: '序号'},
           {field: 'spzt', width: '12%', title: '审批状态', sort: true},
           {field: 'xmlxmc', width: '10%', title: '类型', sort: true},
           {field: 'xm', width: '35%', title: '项目/申请', sort: true},