修改字段为double

ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwXmsb.java

@@ -53,34 +53,34 @@ public class FgwXmsb extends BaseEntity
 
     /** 项目总投资 */
     @Excel(name = "项目总投资")
-    private Long xmztz;
+    private double xmztz;
 
     /** 上级补助 */
     @Excel(name = "上级补助")
-    private String sjbz;
+    private double sjbz;
 
     /** 市财政补助 */
     @Excel(name = "市财政补助")
-    private String sczbj;
+    private double sczbj;
 
     /** 专项债 */
     @Excel(name = "专项债")
-    private String zxz;
+    private double zxz;
 
     /** ppp */
     @Excel(name = "ppp")
-    private String ppp;
+    private double ppp;
 
     /** 融资 */
     @Excel(name = "融资")
-    private String rz;
+    private double rz;
     /** 企业自筹 */
     @Excel(name = "企业自筹")
-    private String qyzc;
+    private double qyzc;
 
     /** 年度计划完成投资 */
     @Excel(name = "年度计划完成投资")
-    private Long ndjh;
+    private double ndjh;
 
     /** 上级补助资金渠道 */
     @Excel(name = "上级补助资金渠道")
@@ -125,7 +125,7 @@ public class FgwXmsb extends BaseEntity
 
     /** 纳统项目完成投资 */
     @Excel(name = "纳统项目完成投资")
-    private Long ntxmtc;
+    private double ntxmtc;
 
     /** 申报状态 1:申报库 2:项目库 */
     @Excel(name = "申报状态 1:申报库 2:项目库")
@@ -185,361 +185,332 @@ public class FgwXmsb extends BaseEntity
     @Excel(name = "是问题项目种类")
     private String wtType;
 
-    public String getQyzc() {
-        return qyzc;
+    public Long getId() {
+        return id;
     }
 
-    public void setQyzc(String qyzc) {
-        this.qyzc = qyzc;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getIsWt() {
-        return isWt;
+    public String getXmmc() {
+        return xmmc;
     }
 
-    public void setIsWt(String isWt) {
-        this.isWt = isWt;
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
     }
 
-    public String getWtType() {
-        return wtType;
+    public String getXmbh() {
+        return xmbh;
     }
 
-    public void setWtType(String wtType) {
-        this.wtType = wtType;
+    public void setXmbh(String xmbh) {
+        this.xmbh = xmbh;
     }
 
-    public Date getNkgsj() {
-        return nkgsj;
+    public String getXmdw() {
+        return xmdw;
     }
 
-    public void setNkgsj(Date nkgsj) {
-        this.nkgsj = nkgsj;
+    public void setXmdw(String xmdw) {
+        this.xmdw = xmdw;
     }
 
-    public Date getJgsj() {
-        return jgsj;
+    public String getQtzrdw() {
+        return qtzrdw;
     }
 
-    public void setJgsj(Date jgsj) {
-        this.jgsj = jgsj;
+    public void setQtzrdw(String qtzrdw) {
+        this.qtzrdw = qtzrdw;
     }
 
-    public Date getNjgsj() {
-        return njgsj;
+    public String getQtsld() {
+        return qtsld;
     }
 
-    public void setNjgsj(Date njgsj) {
-        this.njgsj = njgsj;
+    public void setQtsld(String qtsld) {
+        this.qtsld = qtsld;
     }
 
-    public String getNttz() {
-        return nttz;
+    public String getGmnr() {
+        return gmnr;
     }
 
-    public void setNttz(String nttz) {
-        this.nttz = nttz;
+    public void setGmnr(String gmnr) {
+        this.gmnr = gmnr;
     }
 
-    public String getXmbq() {
-        return xmbq;
+    public Date getJhkgsj() {
+        return jhkgsj;
     }
 
-    public void setXmbq(String xmbq) {
-        this.xmbq = xmbq;
+    public void setJhkgsj(Date jhkgsj) {
+        this.jhkgsj = jhkgsj;
     }
 
-    public String getIsJs() {
-        return isJs;
+    public double getXmztz() {
+        return xmztz;
     }
 
-    public void setIsJs(String isJs) {
-        this.isJs = isJs;
+    public void setXmztz(double xmztz) {
+        this.xmztz = xmztz;
     }
 
-    public List<Long> getIdList() {
-        return idList;
+    public double getSjbz() {
+        return sjbz;
     }
 
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
+    public void setSjbz(double sjbz) {
+        this.sjbz = sjbz;
     }
 
-    public String getPsnr() {
-        return psnr;
+    public double getSczbj() {
+        return sczbj;
     }
 
-    public void setPsnr(String psnr) {
-        this.psnr = psnr;
+    public void setSczbj(double sczbj) {
+        this.sczbj = sczbj;
     }
 
-    public List<FgwFj> getFjList() {
-        return fjList;
+    public double getZxz() {
+        return zxz;
     }
 
-    public void setFjList(List<FgwFj> fjList) {
-        this.fjList = fjList;
+    public void setZxz(double zxz) {
+        this.zxz = zxz;
     }
 
-    public void setId(Long id)
-    {
-        this.id = id;
+    public double getPpp() {
+        return ppp;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public void setPpp(double ppp) {
+        this.ppp = ppp;
     }
-    public void setXmmc(String xmmc) 
-    {
-        this.xmmc = xmmc;
+
+    public double getRz() {
+        return rz;
     }
 
-    public String getXmmc() 
-    {
-        return xmmc;
+    public void setRz(double rz) {
+        this.rz = rz;
     }
-    public void setXmbh(String xmbh) 
-    {
-        this.xmbh = xmbh;
+
+    public double getQyzc() {
+        return qyzc;
     }
 
-    public String getXmbh() 
-    {
-        return xmbh;
+    public void setQyzc(double qyzc) {
+        this.qyzc = qyzc;
     }
-    public void setXmdw(String xmdw) 
-    {
-        this.xmdw = xmdw;
+
+    public double getNdjh() {
+        return ndjh;
     }
 
-    public String getXmdw() 
-    {
-        return xmdw;
+    public void setNdjh(double ndjh) {
+        this.ndjh = ndjh;
     }
-    public void setQtzrdw(String qtzrdw) 
-    {
-        this.qtzrdw = qtzrdw;
+
+    public String getSjbzzjqd() {
+        return sjbzzjqd;
     }
 
-    public String getQtzrdw() 
-    {
-        return qtzrdw;
+    public void setSjbzzjqd(String sjbzzjqd) {
+        this.sjbzzjqd = sjbzzjqd;
     }
-    public void setQtsld(String qtsld) 
-    {
-        this.qtsld = qtsld;
+
+    public String getRzqd() {
+        return rzqd;
     }
 
-    public String getQtsld() 
-    {
-        return qtsld;
+    public void setRzqd(String rzqd) {
+        this.rzqd = rzqd;
     }
-    public void setGmnr(String gmnr) 
-    {
-        this.gmnr = gmnr;
+
+    public String getDq() {
+        return dq;
     }
 
-    public String getGmnr() 
-    {
-        return gmnr;
+    public void setDq(String dq) {
+        this.dq = dq;
     }
-    public void setJhkgsj(Date jhkgsj) 
-    {
-        this.jhkgsj = jhkgsj;
+
+    public String getJsdw() {
+        return jsdw;
     }
 
-    public Date getJhkgsj() 
-    {
-        return jhkgsj;
+    public void setJsdw(String jsdw) {
+        this.jsdw = jsdw;
     }
 
-    public void setSjbz(String sjbz) 
-    {
-        this.sjbz = sjbz;
+    public Long getJsDeptId() {
+        return jsDeptId;
     }
 
-    public String getSjbz() 
-    {
-        return sjbz;
+    public void setJsDeptId(Long jsDeptId) {
+        this.jsDeptId = jsDeptId;
     }
-    public void setSczbj(String sczbj) 
-    {
-        this.sczbj = sczbj;
+
+    public Long getDeptId() {
+        return deptId;
     }
 
-    public String getSczbj() 
-    {
-        return sczbj;
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
     }
-    public void setZxz(String zxz) 
-    {
-        this.zxz = zxz;
+
+    public String getDeptName() {
+        return deptName;
     }
 
-    public String getZxz() 
-    {
-        return zxz;
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
     }
-    public void setPpp(String ppp) 
-    {
-        this.ppp = ppp;
+
+    public Long getUserId() {
+        return userId;
     }
 
-    public String getPpp() 
-    {
-        return ppp;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
-    public void setRz(String rz) 
-    {
-        this.rz = rz;
+
+    public Date getKgsj() {
+        return kgsj;
     }
 
-    public String getRz() 
-    {
-        return rz;
+    public void setKgsj(Date kgsj) {
+        this.kgsj = kgsj;
     }
 
-    public Long getNdjh() {
-        return ndjh;
+    public Date getNtsj() {
+        return ntsj;
     }
 
-    public void setNdjh(Long ndjh) {
-        this.ndjh = ndjh;
+    public void setNtsj(Date ntsj) {
+        this.ntsj = ntsj;
     }
 
-    public void setSjbzzjqd(String sjbzzjqd)
-    {
-        this.sjbzzjqd = sjbzzjqd;
+    public double getNtxmtc() {
+        return ntxmtc;
     }
 
-    public String getSjbzzjqd() 
-    {
-        return sjbzzjqd;
+    public void setNtxmtc(double ntxmtc) {
+        this.ntxmtc = ntxmtc;
     }
-    public void setRzqd(String rzqd) 
-    {
-        this.rzqd = rzqd;
+
+    public String getType() {
+        return type;
     }
 
-    public String getRzqd() 
-    {
-        return rzqd;
+    public void setType(String type) {
+        this.type = type;
     }
-    public void setDq(String dq) 
-    {
-        this.dq = dq;
+
+    public String getProgress() {
+        return progress;
     }
 
-    public String getDq() 
-    {
-        return dq;
+    public void setProgress(String progress) {
+        this.progress = progress;
     }
-    public void setJsdw(String jsdw) 
-    {
-        this.jsdw = jsdw;
+
+    public String getStatus() {
+        return status;
     }
 
-    public String getJsdw() 
-    {
-        return jsdw;
+    public void setStatus(String status) {
+        this.status = status;
     }
-    public void setJsDeptId(Long jsDeptId) 
-    {
-        this.jsDeptId = jsDeptId;
+
+    public List<FgwFj> getFjList() {
+        return fjList;
     }
 
-    public Long getJsDeptId() 
-    {
-        return jsDeptId;
+    public void setFjList(List<FgwFj> fjList) {
+        this.fjList = fjList;
     }
-    public void setDeptId(Long deptId) 
-    {
-        this.deptId = deptId;
+
+    public String getPsnr() {
+        return psnr;
     }
 
-    public Long getDeptId() 
-    {
-        return deptId;
+    public void setPsnr(String psnr) {
+        this.psnr = psnr;
     }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
+
+    public List<Long> getIdList() {
+        return idList;
     }
 
-    public Long getUserId() 
-    {
-        return userId;
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
     }
-    public void setKgsj(Date kgsj) 
-    {
-        this.kgsj = kgsj;
+
+    public Date getNkgsj() {
+        return nkgsj;
     }
 
-    public Date getKgsj() 
-    {
-        return kgsj;
+    public void setNkgsj(Date nkgsj) {
+        this.nkgsj = nkgsj;
     }
-    public void setNtsj(Date ntsj) 
-    {
-        this.ntsj = ntsj;
+
+    public Date getJgsj() {
+        return jgsj;
     }
 
-    public Date getNtsj() 
-    {
-        return ntsj;
+    public void setJgsj(Date jgsj) {
+        this.jgsj = jgsj;
     }
 
-    public Long getXmztz() {
-        return xmztz;
+    public Date getNjgsj() {
+        return njgsj;
     }
 
-    public void setXmztz(Long xmztz) {
-        this.xmztz = xmztz;
+    public void setNjgsj(Date njgsj) {
+        this.njgsj = njgsj;
     }
 
-    public Long getNtxmtc() {
-        return ntxmtc;
+    public String getNttz() {
+        return nttz;
     }
 
-    public void setNtxmtc(Long ntxmtc) {
-        this.ntxmtc = ntxmtc;
+    public void setNttz(String nttz) {
+        this.nttz = nttz;
     }
 
-    public void setType(String type)
-    {
-        this.type = type;
+    public String getXmbq() {
+        return xmbq;
     }
 
-    public String getType() 
-    {
-        return type;
+    public void setXmbq(String xmbq) {
+        this.xmbq = xmbq;
     }
-    public void setProgress(String progress) 
-    {
-        this.progress = progress;
+
+    public String getIsJs() {
+        return isJs;
     }
 
-    public String getProgress() 
-    {
-        return progress;
+    public void setIsJs(String isJs) {
+        this.isJs = isJs;
     }
-    public void setStatus(String status) 
-    {
-        this.status = status;
+
+    public String getIsWt() {
+        return isWt;
     }
 
-    public String getStatus() 
-    {
-        return status;
+    public void setIsWt(String isWt) {
+        this.isWt = isWt;
     }
 
-    public String getDeptName() {
-        return deptName;
+    public String getWtType() {
+        return wtType;
     }
 
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
+    public void setWtType(String wtType) {
+        this.wtType = wtType;
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwCommonServiceImpl.java

@@ -152,9 +152,9 @@ public class FgwCommonServiceImpl implements IFgwCommonService {
         List<FgwXmsb> fgwXmsbs = fgwXmsbService.selectFgwXmsbList(xmsb);
         if (fgwXmsbs != null && fgwXmsbs.size() > 0) {
             map.put("xmzs", fgwXmsbs.size());
-            long xmztz = fgwXmsbs.stream().mapToLong(FgwXmsb::getXmztz).sum();
-            long jstz = fgwXmsbs.stream().mapToLong(FgwXmsb::getNdjh).sum();
-            long nttz = fgwXmsbs.stream().mapToLong(FgwXmsb::getNtxmtc).sum();
+            double xmztz = fgwXmsbs.stream().mapToDouble(FgwXmsb::getXmztz).sum();
+            double jstz = fgwXmsbs.stream().mapToDouble(FgwXmsb::getNdjh).sum();
+            double nttz = fgwXmsbs.stream().mapToDouble(FgwXmsb::getNtxmtc).sum();
             map.put("xmztz", xmztz);
             map.put("jstz", jstz);
             map.put("nttz", nttz);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwShyjServiceImpl.java

@@ -268,9 +268,9 @@ public class FgwShyjServiceImpl implements IFgwShyjService {
             if ("Y".equals(isNt)){
                 String nttz = fgwJzqk.getNttz();
                 fgwXmsb.setNttz(nttz);
-                Long ntxmtc = fgwXmsb.getNtxmtc();
-                if (ntxmtc != null){
-                    long result = ntxmtc + Long.parseLong(nttz);
+                double ntxmtc = fgwXmsb.getNtxmtc();
+                if (ntxmtc >0){
+                    double result = ntxmtc + Double.parseDouble(nttz);
                     fgwXmsb.setNtxmtc(result);
                 }
                 //修改主表状态

ruoyi-system/src/main/resources/mapper/system/fgw/FgwXmsbMapper.xml

@@ -57,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFgwXmsbList" parameterType="FgwXmsb" resultMap="FgwXmsbResult">
         select d.id, d.xmmc, d.xmbh,d.nkgsj,d.jgsj,d.njgsj,d.nttz,d.xmbq,d.is_js,d.is_wt,d.wt_type, d.xmdw, d.qtzrdw, d.qtsld, d.gmnr, d.jhkgsj, d.xmztz, d.sjbz, d.sczbj, d.zxz, d.ppp, d.rz,d.qyzc, d.ndjh, d.sjbzzjqd, d.rzqd, d.dq, d.jsdw, d.js_dept_id, d.dept_id,d.dept_name, d.user_id, d.kgsj, d.ntsj, d.ntxmtc, d.type, d.progress, d.status, d.create_by, d.create_time, d.update_by, d.update_time, d.remark,d.psnr from fgw_xmsb d
-
         <where>
 
             <if test="idList != null  and idList.size() > 0">