项目成本新增项目预算+间接费汇总字段

module_kzks/src/main/java/org/jeecg/modules/projectCost/entity/ProjectCost.java

@@ -263,6 +263,14 @@ public class ProjectCost implements Serializable, Cloneable {
     @Excel(name = "间接费预算", width = 15)
     @ApiModelProperty(value = "间接费预算")
     private java.math.BigDecimal jjys;
+    /**项目预算*/
+    @Excel(name = "项目预算", width = 15)
+    @ApiModelProperty(value = "项目预算")
+    private java.math.BigDecimal xmys;
+    /**间接费汇总*/
+    @Excel(name = "间接费汇总", width = 15)
+    @ApiModelProperty(value = "间接费汇总")
+    private java.math.BigDecimal jjfhz;
 
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectCost/mapper/xml/ProjectCostMapper.xml

@@ -9,7 +9,7 @@
                c.clf ,c.zyf,c.swf,c.wxf,c.sxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
                c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.business_man_name,c.sjgs,c.scgs,c.status,c.proportion,c.ywfzrname,
-               c.clys,c.wxys,c.xhzzrname,c.zyys,c.swys,c.jjys,
+               c.clys,c.wxys,c.xhzzrname,c.zyys,c.swys,c.jjys,c.xmys,c.jjfhz,
                2 as ji
         from kzks_project_cost c
         left join mes_info_installationcost m on  m.taskno = #{taskno}
@@ -23,7 +23,7 @@
                c.clf ,c.zyf,c.swf,c.wxf,c.sxf,c.rldlf,c.gdzczj,c.gzjlwf,c.glf,IFNULL(c.zjcb,m.value) AS zjcb,c.lbsy ,
                c.workhour,c.zrbm,c.jycsid,c.jycs ,c.hxzxid,c. hxzxname ,c.tasktype,c.AuditPrice,c.iflag,c.Brief,
                c.reftaskno,c.pcCode,c.bcCode,c.blCode,c.business_man_name,c.sjgs,c.scgs,c.status,c.proportion,c.ywfzrname,
-               c.clys,c.wxys,c.xhzzrname,
+               c.clys,c.wxys,c.xhzzrname,c.zyys,c.swys,c.jjys,c.xmys,c.jjfhz,
                2 as ji
         from kzks_project_cost c
                  left join mes_info_installationcost m on m.taskno = c.taskno

module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostVO.java

@@ -268,6 +268,14 @@ public class ProjectCostVO implements Serializable {
     @Excel(name = "间接费预算", width = 15)
     @ApiModelProperty(value = "间接费预算")
     private java.math.BigDecimal jjys;
+    /**项目预算*/
+    @Excel(name = "项目预算", width = 15)
+    @ApiModelProperty(value = "项目预算")
+    private java.math.BigDecimal xmys;
+    /**间接费汇总*/
+    @Excel(name = "间接费汇总", width = 15)
+    @ApiModelProperty(value = "间接费汇总")
+    private java.math.BigDecimal jjfhz;
 
 
 

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/convert/impl/ProjectCostHuijiConverCustomImpl.java

@@ -143,6 +143,8 @@ public class ProjectCostHuijiConverCustomImpl implements ProjectCostHuijiCustomC
             projectCostHuijiListVO.setZyys(huiji.getZyys());
             projectCostHuijiListVO.setSwys(huiji.getSwys());
             projectCostHuijiListVO.setJjys(huiji.getJjys());
+            projectCostHuijiListVO.setXmys(huiji.getXmys());
+            projectCostHuijiListVO.setJjfhz(huiji.getJjfhz());
         }
         List<ProjectCostVO> list = children;
         if ( list != null ) {

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -354,5 +354,13 @@ public class ProjectCostHuiji implements Serializable, Cloneable {
     @Excel(name = "间接费预算", width = 15)
     @ApiModelProperty(value = "间接费预算")
     private java.math.BigDecimal jjys;
+    /**项目预算*/
+    @Excel(name = "项目预算", width = 15)
+    @ApiModelProperty(value = "项目预算")
+    private java.math.BigDecimal xmys;
+    /**间接费汇总*/
+    @Excel(name = "间接费汇总", width = 15)
+    @ApiModelProperty(value = "间接费汇总")
+    private java.math.BigDecimal jjfhz;
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/mapper/xml/ProjectCostHuijiMapper.xml

@@ -17,7 +17,7 @@
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
         sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
-        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
+        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys,sum(xmys) as xmys,sum(jjfhz) as jjfhz
         from kzks_project_cost_huiji
         <where>
             <if test="taskno != null  and taskno != ''">and taskno = #{taskno}</if>
@@ -69,7 +69,7 @@
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
         sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
-        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
+        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys,sum(xmys) as xmys,sum(jjfhz) as jjfhz
         from kzks_project_cost_huiji
         where taskno in
         <foreach collection="taskNos" index="index" item="taskNo" open="(" separator="," close=")">
@@ -82,7 +82,7 @@
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
         sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
-        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
+        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys,sum(xmys) as xmys,sum(jjfhz) as jjfhz
         from kzks_project_cost
         where taskno in
         <foreach collection="taskList" index="index" item="taskno" open="(" separator="," close=")">
@@ -95,7 +95,7 @@
         sum(TaskMoney) as TaskMoney,sum(zcb) as zcb,sum(clf) as clf,sum(zyf) as zyf,sum(swf) as swf,
         sum(wxf) as wxf,sum(sxf) as sxf,sum(rldlf) as rldlf,sum(gdzczj) as gdzczj,sum(gzjlwf) as gzjlwf,sum(glf) as glf,
         sum(zjcb) as zjcb,sum(lbsy ) as lbsy,sum(workhour) as workhour,sum(sjgs) as sjgs,
-        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
+        sum(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys,sum(xmys) as xmys,sum(jjfhz) as jjfhz
         from kzks_project_cost_huiji
         <where>
             <if test="huiji.taskno != null  and huiji.taskno != ''">and taskno = #{huiji.taskno}</if>
@@ -135,7 +135,7 @@
                ROUND(c.glf /10000, 2) as glf, ROUND(c.sxf /10000, 2) as sxf, ROUND(IFNULL(c.zjcb,m.value) / 10000, 2) as zjcb,
                c.lbsy, c.workhour, c.zrbm, c.jycsid, c.jycs, c.hxzxid, c.hxzxname, c.tasktype, c.AuditPrice as auditprice, c.iflag,
                c.Brief as brief, c.reftaskno, c.pcCode as pccode, c.bcCode as bccode, c.blCode as blcode, c.business_man_name as businessManName,
-               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs
+               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs,ROUND(c.xmys, 2) as xmys,ROUND(c.jjfhz, 2) as jjfhz
         FROM kzks_project_cost_huiji c
         LEFT JOIN mes_info_installationcost m on m.taskno = c.taskno
         ORDER BY c.id DESC
@@ -154,7 +154,7 @@
         ROUND(c.glf /10000, 2) as glf, ROUND(c.sxf /10000, 2) as sxf, ROUND(IFNULL(c.zjcb,m.value) / 10000, 2) as zjcb,
         c.lbsy, c.workhour, c.zrbm, c.jycsid, c.jycs, c.hxzxid, c.hxzxname, c.tasktype, c.AuditPrice as auditprice, c.iflag,
         c.Brief as brief, c.reftaskno, c.pcCode as pccode, c.bcCode as bccode, c.blCode as blcode, c.business_man_name as businessManName,
-        c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs
+        c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs,ROUND(c.xmys, 2) as xmys,ROUND(c.jjfhz, 2) as jjfhz
         FROM kzks_project_cost_huiji c
         LEFT JOIN mes_info_installationcost m on m.taskno = c.taskno
         where c.zrbm in
@@ -181,7 +181,7 @@
                ROUND(c.glf /10000, 2) as glf, ROUND(c.sxf /10000, 2) as sxf, ROUND(IFNULL(c.zjcb,m.value) / 10000, 2) as zjcb,
                c.lbsy, c.workhour, c.zrbm, c.jycsid, c.jycs, c.hxzxid, c.hxzxname, c.tasktype, c.AuditPrice as auditprice, c.iflag,
                c.Brief as brief, c.reftaskno, c.pcCode as pccode, c.bcCode as bccode, c.blCode as blcode, c.business_man_name as businessManName,
-               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs
+               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs,ROUND(c.xmys, 2) as xmys,ROUND(c.jjfhz, 2) as jjfhz
         FROM kzks_project_cost_huiji c
         LEFT JOIN mes_info_installationcost m on m.taskno = c.taskno
         where c.business_man_name=#{realName} or c.ywfzrname=#{realName} or c.xhzzrname=#{realName}
@@ -201,7 +201,7 @@
                ROUND(c.glf /10000, 2) as glf, ROUND(c.sxf /10000, 2) as sxf, ROUND(IFNULL(c.zjcb,m.value) / 10000, 2) as zjcb,
                c.lbsy, c.workhour, c.zrbm, c.jycsid, c.jycs, c.hxzxid, c.hxzxname, c.tasktype, c.AuditPrice as auditprice, c.iflag,
                c.Brief as brief, c.reftaskno, c.pcCode as pccode, c.bcCode as bccode, c.blCode as blcode, c.business_man_name as businessManName,
-               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs
+               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs,ROUND(c.xmys, 2) as xmys,ROUND(c.jjfhz, 2) as jjfhz
         FROM kzks_project_cost c
         LEFT JOIN mes_info_installationcost m on m.taskno = #{taskno}
         where c.taskno = #{taskno} order by c.status
@@ -220,7 +220,7 @@
                ROUND(c.glf /10000, 2) as glf, ROUND(c.sxf /10000, 2) as sxf, ROUND(IFNULL(c.zjcb,m.value) / 10000, 2) as zjcb,
                c.lbsy, c.workhour, c.zrbm, c.jycsid, c.jycs, c.hxzxid, c.hxzxname, c.tasktype, c.AuditPrice as auditprice, c.iflag,
                c.Brief as brief, c.reftaskno, c.pcCode as pccode, c.bcCode as bccode, c.blCode as blcode, c.business_man_name as businessManName,
-               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs
+               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs,ROUND(c.xmys, 2) as xmys,ROUND(c.jjfhz, 2) as jjfhz
         FROM kzks_project_cost c
         left join mes_info_installationcost m on m.taskno = c.taskno
         where c.reftaskno = #{taskno} order by c.taskno ,c.status
@@ -239,7 +239,7 @@
                ROUND(c.glf /10000, 2) as glf, ROUND(c.sxf /10000, 2) as sxf, ROUND(IFNULL(c.zjcb,m.value) / 10000, 2) as zjcb,
                c.lbsy, c.workhour, c.zrbm, c.jycsid, c.jycs, c.hxzxid, c.hxzxname, c.tasktype, c.AuditPrice as auditprice, c.iflag,
                c.Brief as brief, c.reftaskno, c.pcCode as pccode, c.bcCode as bccode, c.blCode as blcode, c.business_man_name as businessManName,
-               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs
+               c.ywfzrname, c.xhzzrname, c.sjgs, c.scgs,ROUND(c.xmys, 2) as xmys,ROUND(c.jjfhz, 2) as jjfhz
         FROM kzks_project_cost c
                  left join mes_info_installationcost m on m.taskno = c.taskno
         where c.taskno = #{taskno} or c.reftaskno = #{taskno} order by c.taskno ,c.status

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -254,7 +254,14 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "子集")
     private List<ProjectCostVO> children;
 
-
+    /**项目预算*/
+    @Excel(name = "项目预算", width = 15)
+    @ApiModelProperty(value = "项目预算")
+    private java.math.BigDecimal xmys;
+    /**间接费汇总*/
+    @Excel(name = "间接费汇总", width = 15)
+    @ApiModelProperty(value = "间接费汇总")
+    private java.math.BigDecimal jjfhz;
 
 
     /** 汇集状态 */
@@ -266,6 +273,53 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "科研任务责任人/来自科研任务")
     private java.lang.String xhzzrname;
 
+    public BigDecimal getZyys() {
+        return zyys;
+    }
+
+    public void setZyys(BigDecimal zyys) {
+        this.zyys = zyys;
+    }
+
+    public BigDecimal getSwys() {
+        return swys;
+    }
+
+    public void setSwys(BigDecimal swys) {
+        this.swys = swys;
+    }
+
+    public BigDecimal getJjys() {
+        return jjys;
+    }
+
+    public void setJjys(BigDecimal jjys) {
+        this.jjys = jjys;
+    }
+
+    public BigDecimal getSxf() {
+        return sxf;
+    }
+
+    public void setSxf(BigDecimal sxf) {
+        this.sxf = sxf;
+    }
+
+    public BigDecimal getXmys() {
+        return xmys;
+    }
+
+    public void setXmys(BigDecimal xmys) {
+        this.xmys = xmys;
+    }
+
+    public BigDecimal getJjfhz() {
+        return jjfhz;
+    }
+
+    public void setJjfhz(BigDecimal jjfhz) {
+        this.jjfhz = jjfhz;
+    }
 
     public String getXhzzrname() {
         return xhzzrname;