年度预算-取消备用金

年度预算-新建和编辑页面项目总预算回显

src/main/java/com/liang/common/enums/ProjectTypeEnnum.java

@@ -7,15 +7,15 @@ package com.liang.common.enums;
  */
 
 public enum ProjectTypeEnnum {
-    SXGSKJXM("S1","陕西公司科技项目"),
-    GWGSKJXM("S2","国网公司科技项目"),
-    GWGSKJXM_2018("S3","国网公司科技项目（2018年以前）"),
-    SXGSKJXM_2018("S4","陕西公司科技项目（2018年以前）"),
-    SYSGSXM("S5","四院四公司项目"),
-    JDHZ_ZHJH("S6","交大合作（综合计划）"),
-    JDHZ_ZXCB("S6","交大合作（专项成本）"),
-    ZBLXM("S7","资本类项目"),
-    ZFLXM("S8","政府类项目");
+    SXGSKJXM("s1","陕西公司科技项目"),
+    GWGSKJXM("s2","国网公司科技项目"),
+    GWGSKJXM_2018("s3","国网公司科技项目（2018年以前）"),
+    SXGSKJXM_2018("s4","陕西公司科技项目（2018年以前）"),
+    SYSGSXM("s5","四院四公司项目"),
+    JDHZ_ZHJH("s6","交大合作（综合计划）"),
+    JDHZ_ZXCB("s6-1","交大合作（专项成本）"),
+    ZBLXM("s7","资本类项目"),
+    ZFLXM("s8","政府类项目");
 
     private String msg;
     private String code;

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

@@ -2,6 +2,8 @@ package com.liang.controller;
 
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.ProjectTypeEnnum;
+import com.liang.dao.PrjAnnualbudgetDao;
 import com.liang.entity.*;
 import com.liang.service.PrjAnnualbudgetdetailService;
 import org.springframework.data.domain.Page;
@@ -34,7 +36,7 @@ public class PrjAnnualbudgetdetailController {
      * 分页查询
      *
      * @param prjAnnualbudgetdetail 筛选条件
-     * @param pageRequest      分页对象
+     * @param pageRequest           分页对象
      * @return 查询结果
      */
     @GetMapping
@@ -75,14 +77,23 @@ public class PrjAnnualbudgetdetailController {
         return ResponseEntity.ok(this.prjAnnualbudgetdetailService.deleteById(id));
     }
 
+    @Resource
+    private PrjAnnualbudgetDao prjAnnualbudgetDao;
+
     /**
      * 获取年度预算列表
+     *
      * @return
      */
     @ResponseBody
     @RequestMapping(value = "/list/{nys}", method = RequestMethod.POST)
     public Object list(@PathVariable Integer nys) {
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getBudgetList(nys);
+        PrjAnnualbudget prjAnnualbudget = prjAnnualbudgetDao.queryById(nys);
+        //国网项目不展示备用金
+        if (ProjectTypeEnnum.GWGSKJXM.getCode().equals(prjAnnualbudget.getXmlx()) || ProjectTypeEnnum.GWGSKJXM_2018.getCode().equals(prjAnnualbudget.getXmlx())) {
+            list.forEach(item -> item.setByj(null));
+        }
         String strData = JsonTool.toJsonString(list);
         return strData;
     }
@@ -94,26 +105,24 @@ public class PrjAnnualbudgetdetailController {
      */
     @ResponseBody
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
-    public BaseResult doUpdate(@RequestBody String data)
-    {
+    public BaseResult doUpdate(@RequestBody String data) {
         List<PrjAnnualbudgetdetail> budgetDetails = JsonTool.parseArray(data, PrjAnnualbudgetdetail.class);
         int num = prjAnnualbudgetdetailService.updateBatch(budgetDetails);
         if (num > 0) {
             return BaseResult.success("保存成功!");
-        }
-        else {
+        } else {
             return BaseResult.failure("保存失败!");
         }
     }
 
     /**
      * 获取年度预算列表
+     *
      * @return
      */
     @ResponseBody
     @RequestMapping(value = "/yslist/{nys}", method = RequestMethod.POST)
-    public Object yslist(@PathVariable Integer nys)
-    {
+    public Object yslist(@PathVariable Integer nys) {
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getBudgetList(nys);
 
         Map<String, Object> resultMap = new HashMap<>();

src/main/resources/mapper/PrjProjectDao.xml

@@ -441,7 +441,10 @@
 
     <!--年度预算项目列表-->
     <select id="getNdysProjectList" resultMap="PrjProjectMap" parameterType="map">
-        select DISTINCT p.ID, p.ZWMC, p.QS, p.WC, p.ERPBH, p.XMLX, t.XMLXMC, u.name as CJRXM, k.MC as KYBGMC, p.SSBM, d.dept_name as SSBMMC, b.YSJE,
+        select DISTINCT p.ID, p.ZWMC, p.QS, p.WC, p.ERPBH, p.XMLX, t.XMLXMC, u.name as CJRXM, k.MC as KYBGMC, p.SSBM, d.dept_name as SSBMMC,
+            (
+                SELECT SUM(CZJE) from prj_feescheme  where ZB = p.ID and DWMC  LIKE  '%国网陕西省电力%'
+            )  YSJE,
             (select TOP 1 RY from prj_Member where XM = p.ID and XMJS = 1) as XMFZR,
             (select TOP 1 RYXM from prj_Member where XM = p.ID and XMJS = 1) as XMFZRXM,
             (SELECT STUFF((SELECT ','+XM from (select xm from base_Person

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

@@ -363,7 +363,6 @@
                                 dataType: "json",
                                 success: function (result) {
                                     $("#ndczje").val(result);
-                                    $("#ndbyj").val(parseFloat(result*0.1).toFixed(4));
                                 }
                             });
 

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

@@ -269,6 +269,7 @@
                     }
                 }
                 $("#ndbyj").val(dataBudget1[zjfy].byj);
+                $("#rwsys").val(dataBudget1[zjfy].xmzys);
             }
         });
         //查看年度预算（项目总预算）