年度预算-新建任务总预算bug

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

@@ -6,10 +6,8 @@ import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
 import com.liang.common.enums.PostInfoEnum;
-import com.liang.common.utils.ExcelPoiUtil;
-import com.liang.common.utils.MoneyToChineseUtil;
-import com.liang.common.utils.StringUtils;
-import com.liang.common.utils.WordUtils;
+import com.liang.common.enums.ProjectTypeEnnum;
+import com.liang.common.utils.*;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
 import com.liang.dao.PrjCompletecompanyDao;
 import com.liang.entity.*;
@@ -206,6 +204,10 @@ public class PrjProjectController extends BaseController {
         paraMap.put("xmlx", xmlx);
 
         List<PrjProject> list = prjProjectService.getNdysProjectList(paraMap);
+        if (Tools.notEmpty(list)) {
+            list.stream().filter(item -> ProjectTypeEnnum.GWGSKJXM.getCode().equals(item.getXmlx())).forEach(item -> item.setYsje(item.getWGYSJE()));
+            list.stream().filter(item -> ProjectTypeEnnum.SXGSKJXM.getCode().equals(item.getXmlx())).forEach(item -> item.setYsje(item.getSXYSJE()));
+        }
         PageInfo<PrjProject> pageinfo = new PageInfo<>(list);
         //取出查询结果
         List<PrjProject> rows = pageinfo.getList();

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

@@ -1,5 +1,11 @@
 package com.liang.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
 import java.sql.Date;
 import java.io.Serializable;
 
@@ -9,6 +15,10 @@ import java.io.Serializable;
  * @author makejava
  * @since 2023-03-09 20:06:48
  */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class PrjProject implements Serializable {
     private static final long serialVersionUID = -37333872052053879L;
 
@@ -169,394 +179,15 @@ public class PrjProject implements Serializable {
      *
      * @return
      */
-    private double ysje;
+    private BigDecimal ysje;
     /**
      * 年份
      */
     private String nf;
 
-    public String getNf() {
-        return nf;
-    }
-
-    public void setNf(String nf) {
-        this.nf = nf;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getZwmc() {
-        return zwmc;
-    }
-
-    public void setZwmc(String zwmc) {
-        this.zwmc = zwmc;
-    }
-
-    public String getXkfl1() {
-        return xkfl1;
-    }
-
-    public void setXkfl1(String xkfl1) {
-        this.xkfl1 = xkfl1;
-    }
-
-    public String getXkflmc1() {
-        return xkflmc1;
-    }
-
-    public void setXkflmc1(String xkflmc1) {
-        this.xkflmc1 = xkflmc1;
-    }
-
-    public String getXkfl2() {
-        return xkfl2;
-    }
-
-    public void setXkfl2(String xkfl2) {
-        this.xkfl2 = xkfl2;
-    }
-
-    public String getXkflmc2() {
-        return xkflmc2;
-    }
-
-    public void setXkflmc2(String xkflmc2) {
-        this.xkflmc2 = xkflmc2;
-    }
-
-    public String getXkfl3() {
-        return xkfl3;
-    }
-
-    public void setXkfl3(String xkfl3) {
-        this.xkfl3 = xkfl3;
-    }
-
-    public String getXkflmc3() {
-        return xkflmc3;
-    }
-
-    public void setXkflmc3(String xkflmc3) {
-        this.xkflmc3 = xkflmc3;
-    }
-
-    public Boolean getSfgjmmjsxm() {
-        return sfgjmmjsxm;
-    }
-
-    public void setSfgjmmjsxm(Boolean sfgjmmjsxm) {
-        this.sfgjmmjsxm = sfgjmmjsxm;
-    }
-
-    public String getSsgmjjhy() {
-        return ssgmjjhy;
-    }
-
-    public void setSsgmjjhy(String ssgmjjhy) {
-        this.ssgmjjhy = ssgmjjhy;
-    }
-
-    public String getSsgmjjhymc() {
-        return ssgmjjhymc;
-    }
-
-    public void setSsgmjjhymc(String ssgmjjhymc) {
-        this.ssgmjjhymc = ssgmjjhymc;
-    }
-
-    public Date getQs() {
-        return qs;
-    }
-
-    public void setQs(Date qs) {
-        this.qs = qs;
-    }
-
-    public Date getWc() {
-        return wc;
-    }
-
-    public void setWc(Date wc) {
-        this.wc = wc;
-    }
-
-    public Date getCjrq() {
-        return cjrq;
-    }
-
-    public void setCjrq(Date cjrq) {
-        this.cjrq = cjrq;
-    }
-
-    public String getXmlx() {
-        return xmlx;
-    }
-
-    public void setXmlx(String xmlx) {
-        this.xmlx = xmlx;
-    }
-
-    public String getXmlxmc() {
-        return xmlxmc;
-    }
-
-    public void setXmlxmc(String xmlxmc) {
-        this.xmlxmc = xmlxmc;
-    }
-
-    public String getYwmc() {
-        return ywmc;
-    }
-
-    public void setYwmc(String ywmc) {
-        this.ywmc = ywmc;
-    }
-
-    public Boolean getXmmb() {
-        return xmmb;
-    }
-
-    public void setXmmb(Boolean xmmb) {
-        this.xmmb = xmmb;
-    }
-
-    public String getQy() {
-        return qy;
-    }
-
-    public void setQy(String qy) {
-        this.qy = qy;
-    }
-
-    public Integer getZrs() {
-        return zrs;
-    }
-
-    public void setZrs(Integer zrs) {
-        this.zrs = zrs;
-    }
-
-    public Integer getGjzc() {
-        return gjzc;
-    }
-
-    public void setGjzc(Integer gjzc) {
-        this.gjzc = gjzc;
-    }
-
-    public Integer getZjzc() {
-        return zjzc;
-    }
-
-    public void setZjzc(Integer zjzc) {
-        this.zjzc = zjzc;
-    }
-
-    public Integer getCjzc() {
-        return cjzc;
-    }
-
-    public void setCjzc(Integer cjzc) {
-        this.cjzc = cjzc;
-    }
-
-    public Integer getYjs() {
-        return yjs;
-    }
-
-    public void setYjs(Integer yjs) {
-        this.yjs = yjs;
-    }
-
-    public String getTxsm() {
-        return txsm;
-    }
-
-    public void setTxsm(String txsm) {
-        this.txsm = txsm;
-    }
-
-    public String getYjnrjkhzb() {
-        return yjnrjkhzb;
-    }
-
-    public void setYjnrjkhzb(String yjnrjkhzb) {
-        this.yjnrjkhzb = yjnrjkhzb;
-    }
-
-    public String getYgwtsm() {
-        return ygwtsm;
-    }
-
-    public void setYgwtsm(String ygwtsm) {
-        this.ygwtsm = ygwtsm;
-    }
-
-    public Integer getCjr() {
-        return cjr;
-    }
-
-    public void setCjr(Integer cjr) {
-        this.cjr = cjr;
-    }
-
-    public String getCjrxm() {
-        return cjrxm;
-    }
-
-    public void setCjrxm(String cjrxm) {
-        this.cjrxm = cjrxm;
-    }
-
-    public String getTdi432() {
-        return tdi432;
-    }
-
-    public void setTdi432(String tdi432) {
-        this.tdi432 = tdi432;
-    }
-
-    public Boolean getSfkybg() {
-        return sfkybg;
-    }
-
-    public void setSfkybg(Boolean sfkybg) {
-        this.sfkybg = sfkybg;
-    }
-
-    public Integer getBm() {
-        return bm;
-    }
-
-    public void setBm(Integer bm) {
-        this.bm = bm;
-    }
-
-    public String getKybgmc() {
-        return kybgmc;
-    }
-
-    public void setKybgmc(String kybgmc) {
-        this.kybgmc = kybgmc;
-    }
-
-    public String getBm2() {
-        return bm2;
-    }
-
-    public void setBm2(String bm2) {
-        this.bm2 = bm2;
-    }
-
-    public Boolean getSfkybg2() {
-        return sfkybg2;
-    }
-
-    public void setSfkybg2(Boolean sfkybg2) {
-        this.sfkybg2 = sfkybg2;
-    }
-
-    public String getFj() {
-        return fj;
-    }
-
-    public void setFj(String fj) {
-        this.fj = fj;
-    }
-
-    public Integer getSsbm() {
-        return ssbm;
-    }
-
-    public void setSsbm(Integer ssbm) {
-        this.ssbm = ssbm;
-    }
-
-    public String getSsbmmc() {
-        return ssbmmc;
-    }
-
-    public void setSsbmmc(String ssbmmc) {
-        this.ssbmmc = ssbmmc;
-    }
-
-    public String getErpbh() {
-        return erpbh;
-    }
-
-    public void setErpbh(String erpbh) {
-        this.erpbh = erpbh;
-    }
-
-    public String getSpzt() {
-        return spzt;
-    }
-
-    public void setSpzt(String spzt) {
-        this.spzt = spzt;
-    }
-
-    public String getFyly() {
-        return fyly;
-    }
-
-    public void setFyly(String fyly) {
-        this.fyly = fyly;
-    }
-
-    public Integer getXmfzr() {
-        return xmfzr;
-    }
-
-    public void setXmfzr(Integer xmfzr) {
-        this.xmfzr = xmfzr;
-    }
-
-    public String getXmfzrxm() {
-        return xmfzrxm;
-    }
-
-    public void setXmfzrxm(String xmfzrxm) {
-        this.xmfzrxm = xmfzrxm;
-    }
-
-    public String getDkyfzr() {
-        return dkyfzr;
-    }
-
-    public void setDkyfzr(String dkyfzr) {
-        this.dkyfzr = dkyfzr;
-    }
-
-    public String getDkyfzrxm() {
-        return dkyfzrxm;
-    }
-
-    public void setDkyfzrxm(String dkyfzrxm) {
-        this.dkyfzrxm = dkyfzrxm;
-    }
-
-    public String getFj2() {
-        return fj2;
-    }
-
-    public void setFj2(String fj2) {
-        this.fj2 = fj2;
-    }
+    private BigDecimal WGYSJE;
+    private BigDecimal SXYSJE;
 
-    public double getYsje() {
-        return ysje;
-    }
 
-    public void setYsje(double ysje) {
-        this.ysje = ysje;
-    }
 }
 

src/main/resources/mapper/PrjProjectDao.xml

@@ -484,7 +484,10 @@
         d.dept_name as SSBMMC,
         (
         SELECT SUM(CZJE) from prj_feescheme where ZB = p.ID and DWMC LIKE '%国网陕西省电力%'
-        ) YSJE,
+        ) WGYSJE,
+        (
+        SELECT SUM(CZJE) from prj_feescheme where ZB = p.ID
+        ) SXYSJE,
         (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