年度预算-增加本年度已申请金额和已报账金额

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

@@ -292,6 +292,8 @@ public class PrjAnnualbudgetController extends BaseController {
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getBudgetList(nys);
         //获取已执行情况
         List<PrjAnnualbudgetYzxqkVo> yzxqkVos = prjAnnualbudgetdetailDao.getYzxqk(nys);
+        //获取所有的年度预算
+        List<PrjAnnualbudgetdetail> allBudgetDetails = prjAnnualbudgetdetailService.listAllBudgetDetail(nys);
         String res = "";
         try {
             List<Map<String, Object>> readValue = JsonTool.getObjectMapper().readValue(JsonTool.toJsonString(list), List.class);
@@ -299,9 +301,17 @@ public class PrjAnnualbudgetController extends BaseController {
                 yzxqkVos.forEach(yzxItem -> {
                     readValue.stream().filter(item -> item.get("fymc").equals(yzxItem.getFymc())).forEach(item -> item.put("yzxqk" + yzxItem.getNf(), yzxItem.getBzje()));
                 });
+
                 Set<String> nf = yzxqkVos.stream().map(PrjAnnualbudgetYzxqkVo::getNf).collect(Collectors.toSet());
                 //后端对已执行情况的父级求和
                 sumYzxqk(readValue, nf);
+                nf.forEach(nfItem -> {
+                    readValue.stream().forEach(item -> {
+                        Double ysje = allBudgetDetails.stream().filter(allBudgetDetailItem -> allBudgetDetailItem.getFymc().equals(item.get("fymc")) && nfItem.equals(String.valueOf(allBudgetDetailItem.getNf()))).collect(Collectors.toList()).get(0).getYsje();
+
+                        item.put("yzxqk" + nfItem, (ysje == null ? 0 : ysje) + "(" + (item.get("yzxqk" + nfItem) == null ? 0 : item.get("yzxqk" + nfItem)) + ")");
+                    });
+                });
             }
             res = JsonTool.toJsonString(readValue);
         } catch (JsonProcessingException e) {

src/main/java/com/liang/dao/PrjAnnualbudgetdetailDao.java

@@ -132,5 +132,7 @@ public interface PrjAnnualbudgetdetailDao {
     List<PrjAnnualbudgetYzxqkVo> getYzxqk(@Param("nys") Integer nys);
 
     List<PrjAnnualbudgetYzxqkVo> getNf(@Param("nys")Integer nys);
+
+    List<PrjAnnualbudgetdetail> listAllBudgetDetail(@Param("nys") Integer nys);
 }
 

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -205,5 +206,8 @@ public class PrjAnnualbudgetdetail implements Serializable {
      */
     private Double dnzyzf;
 
+    private BigDecimal bndsqje;
+    private BigDecimal bndbzje;
+
 }
 

src/main/java/com/liang/service/PrjAnnualbudgetdetailService.java

@@ -89,4 +89,6 @@ public interface PrjAnnualbudgetdetailService {
 
 
     Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
+
+    List<PrjAnnualbudgetdetail> listAllBudgetDetail(@Param("nys") Integer nys);
 }

src/main/java/com/liang/service/impl/PrjAnnualbudgetdetailServiceImpl.java

@@ -229,4 +229,9 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
         return this.prjAnnualbudgetdetailDao.getSubNodeCount(nys,page,limit);
     }
 
+    @Override
+    public List<PrjAnnualbudgetdetail> listAllBudgetDetail(Integer nys) {
+        return this.prjAnnualbudgetdetailDao.listAllBudgetDetail(nys);
+    }
+
 }

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -14,6 +14,8 @@
         <result property="px" column="PX" jdbcType="VARCHAR"/>
         <result property="hjbm" column="HJBM" jdbcType="VARCHAR"/>
         <result property="bz" column="BZ" jdbcType="VARCHAR"/>
+        <result property="bndsqje" column="bndbzje" jdbcType="NUMERIC"/>
+        <result property="bndsqje" column="bndbzje" jdbcType="NUMERIC"/>
         <result property="dw1" column="DW1" jdbcType="NUMERIC"/>
         <result property="dw2" column="DW2" jdbcType="NUMERIC"/>
         <result property="dw3" column="DW3" jdbcType="NUMERIC"/>
@@ -517,8 +519,33 @@
 
     <!--获取年度预算-->
     <select id="getBudgetList" resultMap="PrjAnnualbudgetdetailMap">
-        select (select FYMC from prj_AnnualBudgetDetail where BM = b.FJ and NYS = b.NYS) as FJMC, b.*
+        select (select FYMC from prj_AnnualBudgetDetail where BM = b.FJ and NYS = b.NYS) as FJMC,
+               ID, b.FYMC, YSJE, YSQJE, NYS, BM, FJ, NF, PX, HJBM, BZ, DW1, DW2, DW3, DW4, DW5, DW6, DW7, DW8, DW9, DW10, SJYS1, SJYS2, SJYS3, SJYS4, SJYS5, SJYS6, SJYS7, SJYS8, SJYS9, SJYS10, XTJSYZX, XMZ,BYJ, ZRJE, RWSYS, XMZYS, YBZJE, ZCBYJ, KYYS, ZCJE, BYJYSQ, BYQYBZ, ZRBYJ, DNZYZF,
+               a.bzje sjyzx,
+               c.bndsqje,
+               c.bndbzje
         from prj_AnnualBudgetDetail b
+        left join (
+        SELECT convert(decimal(18,2),(sum(BZJE)/10000))  BZJE ,pa.fymc
+        from(SELECT	id ,fylb
+        from sta_BudgetApproval
+        where	nys in (
+        select	id
+        from prj_AnnualBudget
+        where rws = (select  rws from prj_AnnualBudget where id = #{nys}) and nf &lt; (select  nf  from prj_AnnualBudget where id = #{nys}) )) sb
+        left join sta_Reimbursement sa on sa.fysq = sb.id
+        LEFT join prj_AnnualBudgetDetail pa on pa.id = sb.fylb group by pa.fymc
+        ) a on a.fymc = b.fymc
+        left join (
+            SELECT SUM(sb.SQJE) bndsqje, SUM(sr.BZJE) bndbzje,pa.FYMC
+            from
+            sta_BudgetApproval sb
+            left join sta_Reimbursement sr on sr.FYSQ = sb.ID and sr.SPZT = '审批结束'
+            left join prj_AnnualBudgetDetail pa on pa.ID = sb.FYLB
+            where
+             sb.NYS = #{nys} and sb.SPZT != '作废'
+            GROUP by pa.FYMC
+        ) c on c.fymc = b.fymc
         where NYS = #{nys}
     </select>
 
@@ -599,12 +626,15 @@
     </select>
     <select id="getYzxqk" resultType="com.liang.vo.PrjAnnualbudgetYzxqkVo">
         SELECT convert(decimal(18,2),(sum(BZJE)/10000)) BZJE ,pa.fymc,sb.nf
-        from(SELECT	id ,fylb,nf
-             from sta_BudgetApproval
+        from(SELECT	sb.id ,sb.fylb,pa.nf
+             from sta_BudgetApproval sb
+                 left join prj_AnnualBudget pa on pa.id = sb.nys
              where	nys in (
                  select	id
                  from prj_AnnualBudget
-                 where rws = (select rws from prj_AnnualBudget where ID = #{nys}))) sb
+                 where rws = (select rws from prj_AnnualBudget where ID = #{nys})
+                   AND  NF &lt;( select DISTINCT NF from prj_AnnualBudget  where id = #{nys} )
+                 )) sb
                 left join sta_Reimbursement sa on sa.fysq = sb.id
                 LEFT join prj_AnnualBudgetDetail pa on pa.id = sb.fylb
         group by pa.fymc,sb.nf
@@ -613,7 +643,17 @@
     <select id="getNf" resultType="com.liang.vo.PrjAnnualbudgetYzxqkVo">
         select DISTINCT NF
         from prj_AnnualBudget
-        where rws = (SELECT RWS  from prj_AnnualBudget where id = #{nys})
+        where
+         rws = (SELECT RWS  from prj_AnnualBudget where id = #{nys})
+        AND  NF &lt;( select DISTINCT NF from prj_AnnualBudget  where id = #{nys} )
+    </select>
+    <select id="listAllBudgetDetail" resultType="com.liang.entity.PrjAnnualbudgetdetail">
+        select a.FYMC ,a.YSJE ,b.NF
+        from
+            prj_AnnualBudgetDetail A
+            left join prj_AnnualBudget B on b.ID = A.NYS
+        where
+           nys in (select  ID from prj_AnnualBudget where rws = (select  rws from prj_AnnualBudget where id = #{nys}))
     </select>
 </mapper>
 

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

@@ -254,6 +254,13 @@
                 nf = result;
             }
         });
+        var field = "";
+        var title = "已执行情况";
+        if (nf.length === 1) {
+            field = nf[0].title;
+            title = title + nf[0].title;
+            nf = new Array();
+        }
         let fjArray = []
         fjArray = Array.from(dataBudget1, ({fj}) => fj)
         for (var j = 0; j < dataBudget1.length; j++) {
@@ -281,17 +288,16 @@
             // toolbar: '#toolbarDemo',
             cols: [
                 [
-                    {type: 'numbers', width: '3%',rowspan:2},
-                    {field: 'fymc', width: '30%', title: '费用名称',rowspan:2},
-                    {field: 'xmzys', width: '12%', title: '项目总预算',rowspan:2},
-                    {field: 'xtjsyzx', width: '15%', title: '系统计算已执行',rowspan:2},
-                    {field: 'yzxqk', width: '15%',align: 'center',title: '已执行情况',colspan:nf.length},
-                    {field: 'sjyzx', width: '12%', title: '实际已执行',rowspan:2},
-                    {field: 'ysje', width: '10%', title: '预算金额',rowspan:2},
-                    {field: 'xmz', width: '9%', title: '项目组',rowspan:2},
-                    {field: "byj", width: '9%', title: '备用金',rowspan:2}
-                    // {field: 'ysqje', width: '11%', title: '已申请金额'},
-                    // {field: 'ybzje', width: '11%', title: '已报账金额'},
+                    {type: 'numbers', width: '3%', rowspan: 2},
+                    {field: 'fymc', width: '30%', title: '费用名称', rowspan: 2},
+                    {field: 'xmzys', width: '12%', title: '项目总预算', rowspan: 2},
+                    {field: 'yzxqk' + field, width: '15%', align: 'center', title: title, colspan: nf.length},
+                    {field: 'sjyzx', width: '12%', title: '实际已执行', rowspan: 2},
+                    {field: 'ysje', width: '10%', title: '预算金额', rowspan: 2},
+                    {field: 'xmz', width: '9%', title: '项目组', rowspan: 2},
+                    {field: "byj", width: '9%', title: '备用金', rowspan: 2},
+                    {field: 'bndsqje', width: '11%', title: '本年度已申请金额'},
+                    {field: 'bndbzje', width: '11%', title: '本年度已报账金额'},
                     // {field: 'byjysq', width: '11%', title: '备用金已申请'},
                     // {field: 'byjybz', width: '11%', title: '备用金已报账'}
                 ], nf