Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,34 @@
+package com.liang.common.enums;
+
+/**
+ * 枚举
+ *
+ * @author : lgl
+ */
+
+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","政府类项目");
+
+    private String msg;
+    private String code;
+
+    ProjectTypeEnnum(String code, String msg) {
+        this.msg = msg;
+        this.code = code;
+    }
+    public String getCode() {
+        return code;
+    }
+
+    public String msg() {
+        return msg;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.ProjectTypeEnnum;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.entity.*;
 import com.liang.service.*;
@@ -556,7 +557,7 @@ public class PrjAnnualbudgetController extends BaseController {
         model.addAttribute("rwsys", project.getYsje());
 
         Map<String, String> paraMap = new HashMap<>();
-        if ("政府类项目".equals(annualbudget.getXmlxmc())) {
+        if (ProjectTypeEnnum.ZFLXM.msg().equals(annualbudget.getXmlxmc())) {
             List<Integer> nfList = prjFeeschemeService.getYearList(annualbudget.getRws());
             paraMap.put("xm", annualbudget.getRws().toString());
             paraMap.put("nf", nfList.get(nfList.size() - 1).toString());
@@ -565,7 +566,7 @@ public class PrjAnnualbudgetController extends BaseController {
             paraMap.put("nf", annualbudget.getNf());
         }
         Double ndczje;
-        if ("国网公司科技项目".equals((annualbudget.getXmlxmc()))) {
+        if (ProjectTypeEnnum.GWGSKJXM.msg().equals((annualbudget.getXmlxmc()))) {
             ndczje = prjFeeschemeService.getNdFeeSchemeofDKY(paraMap);
         } else {
             ndczje = prjFeeschemeService.getNdFeeScheme(paraMap);
@@ -592,7 +593,7 @@ public class PrjAnnualbudgetController extends BaseController {
 
         Map<String, String> paraMap = new HashMap<>();
 
-        if ("政府类项目".equals(annualbudget.getXmlxmc())) {
+        if (ProjectTypeEnnum.ZFLXM.msg().equals(annualbudget.getXmlxmc())) {
             List<Integer> nfList = prjFeeschemeService.getYearList(annualbudget.getRws());
             paraMap.put("xm", annualbudget.getRws().toString());
             paraMap.put("nf", nfList.get(nfList.size() - 1).toString());
@@ -601,7 +602,7 @@ public class PrjAnnualbudgetController extends BaseController {
             paraMap.put("nf", annualbudget.getNf());
         }
         Double ndczje;
-        if ("国网公司科技项目".equals(annualbudget.getXmlxmc())) {
+        if (ProjectTypeEnnum.GWGSKJXM.msg().equals(annualbudget.getXmlxmc())) {
             ndczje = prjFeeschemeService.getNdFeeSchemeofDKY(paraMap);
             model.addAttribute("ysmc", "陕西公司出资总额");
         } else {
@@ -622,7 +623,11 @@ public class PrjAnnualbudgetController extends BaseController {
     public String forNdysView(Model model, @PathVariable Integer rws) {
         PrjAnnualbudget annualbudget = prjAnnualbudgetService.queryByRws(rws);
         model.addAttribute("annualbudget", annualbudget);
-
+        if (ProjectTypeEnnum.GWGSKJXM.msg().equals(annualbudget.getXmlxmc())) {
+            model.addAttribute("ysmc", "陕西公司出资总额");
+        } else {
+            model.addAttribute("ysmc", "项目总预算");
+        }
         return "annualbudget/view_annualbudget";
     }
 

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.ProjectTypeEnnum;
 import com.liang.entity.PrjAnnualbudget;
 import com.liang.entity.PrjFeescheme;
 import com.liang.entity.PrjProject;
@@ -233,7 +234,7 @@ public class PrjFeeschemeController extends BaseController {
         paraMap.put("nf", nf);
         double ndczje;
         PrjProject prjProject = prjProjectService.queryById(rws);
-        if ("国网公司科技项目".equals(prjProject.getXmlxmc())){
+        if (ProjectTypeEnnum.GWGSKJXM.msg().equals(prjProject.getXmlxmc())){
             ndczje=prjFeeschemeService.getNdFeeSchemeofDKY(paraMap);
         }else {
             ndczje = prjFeeschemeService.getNdFeeScheme(paraMap);

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -844,7 +844,7 @@
 
     <!--项目分项费用信息-->
     <select id="getKmFyInfo" resultMap="StaBudgetapprovalMap" parameterType="map">
-        select b.NYS, b.FYLB, (ISNULL(SUM(b.BZJE),0)+ISNULL((select SUM(SQJE) from sta_BudgetApproval where BZJE is NULL and NYS = #{nys1} and FYLB = #{fylb1} and SPZT != '作废' and SFBYJ =0),0)) as SQJE,
+        select b.NYS, b.FYLB, ISNULL((select SUM(SQJE) from sta_BudgetApproval where BZJE is NULL and NYS = #{nys1} and FYLB = #{fylb1} and SPZT != '作废' and SFBYJ =0),0) as SQJE,
                SUM(b.BZJE) as BZJE,
                (select YSJE from prj_AnnualBudgetDetail where NYS = b.NYS and ID = b.FYLB) as YSJE
         from sta_BudgetApproval b

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

@@ -244,10 +244,8 @@
                 dataBudget1 = result;
             }
         });
-        console.log(dataBudget1);
         let fjArray = []
         fjArray = Array.from(dataBudget1,({fj}) => fj)
-        console.log('fjArray'+fjArray);
         for (var j = 0; j < dataBudget1.length; j++){
             if (!fjArray.includes(dataBudget1[j].bm)) {
                 setFjBudget(dataBudget1[j].fj);
@@ -321,7 +319,6 @@
                             sjyzx += t4;
                     }
                 }
-                console.log(sjyzx);
                 //更新父节点的值
                 for (var j = 0; j < dataBudget1.length; j++) {
                     if (fj == dataBudget1[j].bm) {

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

@@ -344,8 +344,8 @@
                 "km": "项目年度经费",
                 "ysje": [[${xmFyInfo.ysje}]],
                 // "ysqje": [[${xmFyInfo.sqje}]],
-                "ysqje": [[${xmFyInfo.ysje}]]*10000-[[${kmFyInfo.sqje}]],
-                "ybzje": [[${xmFyInfo.bzje}]]
+                "ysqje": [[${kmFyInfo.ysje}]]*10000-[[${kmFyInfo.sqje}]],
+                "ybzje": [[${kmFyInfo.ysje}]]*10000-[[${kmFyInfo.bzje}]]
             }
         ];
         //统计信息