项目成本分页查询结果加上专用费预算、事务费预算、间接费预算

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

@@ -249,4 +249,20 @@ public class ProjectCost implements Serializable, Cloneable {
             throw new AssertionError();
         }
     }
+
+
+    /**专用费预算*/
+    @Excel(name = "专用费预算", width = 15)
+    @ApiModelProperty(value = "专用费预算")
+    private java.math.BigDecimal zyys;
+    /**事务费预算*/
+    @Excel(name = "事务费预算", width = 15)
+    @ApiModelProperty(value = "事务费预算")
+    private java.math.BigDecimal swys;
+    /**间接费预算*/
+    @Excel(name = "间接费预算", width = 15)
+    @ApiModelProperty(value = "间接费预算")
+    private java.math.BigDecimal jjys;
+
+
 }

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.clys,c.wxys,c.xhzzrname,c.zyys,c.swys,c.jjys,
                2 as ji
         from kzks_project_cost c
         left join mes_info_installationcost m on  m.taskno = #{taskno}

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

@@ -247,6 +247,7 @@ public class ProjectCostVO implements Serializable {
     @ApiModelProperty(value = "用于判断是一级还是二级")
     private java.lang.Integer ji;
 
+
     /**
      * 状态：0未加入到产品价格库的；4加入到产品价格库的；
      */
@@ -254,6 +255,22 @@ public class ProjectCostVO implements Serializable {
     @ApiModelProperty(value = "状态")
     private java.lang.String hjstatus;
 
+
+    /**专用费预算*/
+    @Excel(name = "专用费预算", width = 15)
+    @ApiModelProperty(value = "专用费预算")
+    private java.math.BigDecimal zyys;
+    /**事务费预算*/
+    @Excel(name = "事务费预算", width = 15)
+    @ApiModelProperty(value = "事务费预算")
+    private java.math.BigDecimal swys;
+    /**间接费预算*/
+    @Excel(name = "间接费预算", width = 15)
+    @ApiModelProperty(value = "间接费预算")
+    private java.math.BigDecimal jjys;
+
+
+
     public String getHjstatus() {
         return hjstatus;
     }

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

@@ -140,6 +140,9 @@ public class ProjectCostHuijiConverCustomImpl implements ProjectCostHuijiCustomC
             projectCostHuijiListVO.setYwfzrname(huiji.getYwfzrname());
             projectCostHuijiListVO.setXhzzrname(huiji.getXhzzrname());
             projectCostHuijiListVO.setSxf(huiji.getSxf());
+            projectCostHuijiListVO.setZyys(huiji.getZyys());
+            projectCostHuijiListVO.setSwys(huiji.getSwys());
+            projectCostHuijiListVO.setJjys(huiji.getJjys());
         }
         List<ProjectCostVO> list = children;
         if ( list != null ) {

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

@@ -340,4 +340,19 @@ public class ProjectCostHuiji implements Serializable, Cloneable {
             throw new AssertionError();
         }
     }
+
+
+    /**专用费预算*/
+    @Excel(name = "专用费预算", width = 15)
+    @ApiModelProperty(value = "专用费预算")
+    private java.math.BigDecimal zyys;
+    /**事务费预算*/
+    @Excel(name = "事务费预算", width = 15)
+    @ApiModelProperty(value = "事务费预算")
+    private java.math.BigDecimal swys;
+    /**间接费预算*/
+    @Excel(name = "间接费预算", width = 15)
+    @ApiModelProperty(value = "间接费预算")
+    private java.math.BigDecimal jjys;
+
 }

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(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
         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(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
         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(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
         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(scgs) as scgs,sum(clys) as clys,sum(wxys) as wxys,sum(zyys) as zyys,sum(swys) as swys,sum(jjys) as jjys
         from kzks_project_cost_huiji
         <where>
             <if test="huiji.taskno != null  and huiji.taskno != ''">and taskno = #{huiji.taskno}</if>

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

@@ -243,6 +243,21 @@ public class ProjectCostHuijiListVO implements Serializable {
     @ApiModelProperty(value = "科研任务责任人/来自科研任务")
     private java.lang.String xhzzrname;
 
+
+    /**专用费预算*/
+    @Excel(name = "专用费预算", width = 15)
+    @ApiModelProperty(value = "专用费预算")
+    private java.math.BigDecimal zyys;
+    /**事务费预算*/
+    @Excel(name = "事务费预算", width = 15)
+    @ApiModelProperty(value = "事务费预算")
+    private java.math.BigDecimal swys;
+    /**间接费预算*/
+    @Excel(name = "间接费预算", width = 15)
+    @ApiModelProperty(value = "间接费预算")
+    private java.math.BigDecimal jjys;
+
+
     public String getXhzzrname() {
         return xhzzrname;
     }