年度预算-新建年度预算时同步实际已执行

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

@@ -426,7 +426,7 @@ public class PrjAnnualbudgetController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/doAdd", method = RequestMethod.POST)
-//    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public BaseResult doAdd(PrjAnnualbudget annualbudget) {
         annualbudget.setSpzt("未提交");
         int num = prjAnnualbudgetService.insert(annualbudget);

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

@@ -408,11 +408,11 @@ public class StaReimbursementController extends BaseController {
     public BaseResult updateSpzt(@RequestBody String strData) {
         StaReimbursement fybz = JsonTool.parseObject(strData, StaReimbursement.class);
         int num = staReimbursementService.updateSpzt(fybz);
-        if (StringUtils.isNotBlank(fybz.getSpzt()) && "审批结束".equals(fybz.getSpzt())) {
-            Integer rwsId = staReimbursementDao.getRwsIdByBzId(fybz.getId());
-//            BigDecimal nysSum = prjAnnualbudgetDao.getNYSSum(fybz.getId(), rwsId);
-            prjAnnualbudgetDao.updateSJYZXByBZID(fybz.getId(),null);
-        }
+//        if (StringUtils.isNotBlank(fybz.getSpzt()) && "审批结束".equals(fybz.getSpzt())) {
+//            Integer rwsId = staReimbursementDao.getRwsIdByBzId(fybz.getId());
+////            BigDecimal nysSum = prjAnnualbudgetDao.getNYSSum(fybz.getId(), rwsId);
+//            prjAnnualbudgetDao.updateSJYZXByBZID(fybz.getId(),null);
+//        }
         if (num > 0) {
             return BaseResult.success("保存成功!");
         } else {

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

@@ -138,5 +138,7 @@ public interface PrjAnnualbudgetDao {
     void updateSJYZXByBZID(@Param("bzId") Integer bzId, @Param("nysSum") BigDecimal nysSum);
 
     BigDecimal getNYSSum(@Param("id") Integer id, @Param("rwsId") Integer rwsId);
+
+    void updateSJYZXSum(Integer rws);
 }
 

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

@@ -146,7 +146,8 @@ public class PrjAnnualbudgetServiceImpl implements PrjAnnualbudgetService {
             prjAnnualbudgetDao.updateXTJSYZX(rws);
             //更新 历史年度预算的实际已执行
             prjAnnualbudgetDao.updateSJYZX(rws);
-
+            //更新已执行总计
+            prjAnnualbudgetDao.updateSJYZXSum(rws);
         }
     }
 }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -462,6 +462,26 @@
         where
             a.id=b.id
     </update>
+    <update id="updateSJYZXSum">
+        update A
+        set A.sjyzx = B.BZJE from prj_AnnualBudgetDetail A
+        inner join (SELECT	sum(BZJE) BZJE ,pa.fymc
+	        from(SELECT	id ,fylb
+	  	from sta_BudgetApproval
+		where	nys in (
+			select	id
+			from prj_AnnualBudget
+			where rws = #{rws})) 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 ) B
+        on A.FYMC = B.fymc
+        where
+            NYS = (
+            SELECT top 1 ID from
+            prj_AnnualBudget
+            where RWS = #{rws} order by nf desc )
+    </update>
 
     <!--已申请费用的预算-->
     <select id="getFysqBudgetList">

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

@@ -362,6 +362,7 @@
             var value = obj.value,
                 item = obj.data,
                 colName = obj.field;
+            console.log(obj);
             if(item.children == undefined)
             {
                 //当前行预算

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

@@ -28,44 +28,53 @@
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">名称</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="hidden" id="id" name="id" class="layui-input" th:value="${annualbudget.id}">
-                                <input type="text" id="mc" name="mc" class="layui-input" th:value="${annualbudget.mc}" readonly>
+                                <input type="hidden" id="id" name="id" class="layui-input"
+                                       th:value="${annualbudget.id}">
+                                <input type="text" id="mc" name="mc" class="layui-input" th:value="${annualbudget.mc}"
+                                       readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">任务书</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="hidden" id="rws" name="rws" class="layui-input" th:value="${annualbudget.rws}">
-                                <input type="text" id="rwsmc" name="rwsmc" class="layui-input" th:value="${annualbudget.rwsmc}" readonly>
+                                <input type="hidden" id="rws" name="rws" class="layui-input"
+                                       th:value="${annualbudget.rws}">
+                                <input type="text" id="rwsmc" name="rwsmc" class="layui-input"
+                                       th:value="${annualbudget.rwsmc}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">项目执行期</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="text" id="xmzxq" name="xmzxq" class="layui-input" autocomplete="off" th:value="${annualbudget.xmzxq}" readonly>
+                                <input type="text" id="xmzxq" name="xmzxq" class="layui-input" autocomplete="off"
+                                       th:value="${annualbudget.xmzxq}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label required" style="width: 70px">年份</label>
                             <div class="layui-input-inline" style="width: 855px">
                                 <input type="number" id="nf" name="nf" value="2023" lay-verify="required"
-                                       lay-reqtext="年份不能为空" class="layui-input" autocomplete="off" th:value="${annualbudget.nf}" readonly>
+                                       lay-reqtext="年份不能为空" class="layui-input" autocomplete="off"
+                                       th:value="${annualbudget.nf}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">说明</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <textarea id="sm" name="sm"  class="layui-textarea" style="width: 100%;height: 150px" th:text="${annualbudget.sm}" readonly></textarea>
+                                <textarea id="sm" name="sm" class="layui-textarea" style="width: 100%;height: 150px"
+                                          th:text="${annualbudget.sm}" readonly></textarea>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">申请人</label>
                             <div class="layui-input-inline" style="width: 380px">
-                                <input type="text" name="sqrxm" class="layui-input" th:value="${annualbudget.sqrxm}" readonly>
+                                <input type="text" name="sqrxm" class="layui-input" th:value="${annualbudget.sqrxm}"
+                                       readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">申请时间</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="sqsj" name="sqsj" class="layui-input" th:value="${annualbudget.sqsj}" readonly>
+                                <input type="text" id="sqsj" name="sqsj" class="layui-input"
+                                       th:value="${annualbudget.sqsj}" readonly>
                             </div>
                         </div>
                         <!--                        <div class="layui-form-item layui-inline" style="width: 100%">-->
@@ -77,27 +86,32 @@
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">可研报告</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="text" id="xmmc" name="xmmc" class="layui-input" th:value="${annualbudget.xmmc}" readonly>
+                                <input type="text" id="xmmc" name="xmmc" class="layui-input"
+                                       th:value="${annualbudget.xmmc}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">ERP编号</label>
                             <div class="layui-input-inline" style="width: 380px">
-                                <input type="text" id="erpbh" name="erpbh" class="layui-input" th:value="${annualbudget.erpbh}" readonly>
+                                <input type="text" id="erpbh" name="erpbh" class="layui-input"
+                                       th:value="${annualbudget.erpbh}" readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">项目类型</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="xmlxmc" name="xmlxmc" class="layui-input" th:value="${annualbudget.xmlxmc}" readonly>
+                                <input type="text" id="xmlxmc" name="xmlxmc" class="layui-input"
+                                       th:value="${annualbudget.xmlxmc}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 90px">电科院负责人</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="xmfzrxm" name="xmfzrxm" class="layui-input" th:value="${annualbudget.xmfzrxm}" readonly>
+                                <input type="text" id="xmfzrxm" name="xmfzrxm" class="layui-input"
+                                       th:value="${annualbudget.xmfzrxm}" readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">所属部门</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input" th:value="${annualbudget.ssbmmc}" readonly>
+                                <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input"
+                                       th:value="${annualbudget.ssbmmc}" readonly>
                             </div>
                         </div>
 
@@ -120,19 +134,23 @@
                     <div class="layui-form layuimini-form">
                         <div class="layui-form-item" style="margin-bottom: -10px">
                             <div class="layui-inline">
-                                <label class="layui-form-label " style="width: fit-content; margin-bottom: -10px">单位：万元</label>
+                                <label class="layui-form-label "
+                                       style="width: fit-content; margin-bottom: -10px">单位：万元</label>
                                 <label class="layui-form-label" style="width: 100px"></label>
                             </div>
                             <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 120px; margin-left: -10px">[[${ysmc}]]</label>
+                                <label class="layui-form-label"
+                                       style="width: 120px; margin-left: -10px">[[${ysmc}]]</label>
                                 <div class="layui-input-inline" style="width: 100px">
-                                    <input type="text" id="rwsys" name="rwsys" class="layui-input" th:value="${rwsys}" readonly>
+                                    <input type="text" id="rwsys" name="rwsys" class="layui-input" th:value="${rwsys}"
+                                           readonly>
                                 </div>
                             </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 60px; margin-left: -15px">年度经费</label>
                                 <div class="layui-input-inline" style="width: 100px">
-                                    <input type="text" id="ndczje" name="ndczje" class="layui-input" th:value="${ndczje}" readonly>
+                                    <input type="text" id="ndczje" name="ndczje" class="layui-input"
+                                           th:value="${ndczje}" readonly>
                                 </div>
                             </div>
                             <div class="layui-inline">
@@ -177,10 +195,10 @@
 
         var rwsId = $("#rws").val(),
             ysId = $("#id").val();
-        var zjfy=0;
+        var zjfy = 0;
 
         // 监听查看任务书按钮
-        $("button[lay-filter='viewRwsBtn']").click(function(){
+        $("button[lay-filter='viewRwsBtn']").click(function () {
             parent.layer.open({
                 title: '查看项目任务书',
                 type: 2,
@@ -205,9 +223,9 @@
             dataType: "json",
             success: function (result) {
                 dataBudget = result;
-                for (let i = 0; i <dataBudget.length ; i++) {
-                    if(dataBudget[i].fymc.indexOf('总计')>-1){
-                        zjfy=i;
+                for (let i = 0; i < dataBudget.length; i++) {
+                    if (dataBudget[i].fymc.indexOf('总计') > -1) {
+                        zjfy = i;
                     }
                 }
                 $("#ndbyj").val(dataBudget[zjfy].byj);
@@ -226,7 +244,15 @@
                 dataBudget1 = result;
             }
         });
-
+        console.log(dataBudget1);
+        let fjArray = []
+        fjArray = Array.from(dataBudget1,({fj}) => fj)
+        console.log('fjArray'+fjArray);
+        for (var j = 0; j < dataBudget1.length; j++){
+            if (!fjArray.includes(dataBudget1[j].bm)) {
+                setFjBudget(dataBudget1[j].fj);
+            }
+        }
         treeTable.render({
             elem: '#currentTableId',
             data: dataBudget1,
@@ -261,13 +287,80 @@
                     // {field: 'byjybz', width: '11%', title: '备用金已报账'}
                 ]
             ],
+            done: function () {
+            }
         });
 
         // 监听取消按钮
-        $("button[lay-filter='cancleBtn']").click(function(){
+        $("button[lay-filter='cancleBtn']").click(function () {
             var iframeIndex = parent.layer.getFrameIndex(window.name);
             parent.layer.close(iframeIndex);
         });
+
+        //父级预算
+        function setFjBudget(fj) {
+            if (fj != null && fj != '') {
+                var xmzys = 0, xmz = 0, byj = 0, xtjsyzx = 0, sjyzx = 0;
+                //子节点的值相加
+                for (var j = 0; j < dataBudget1.length; j++) {
+                    if (fj == dataBudget1[j].fj) {
+                        // var t = parseFloat(dataBudget[j].xmzys);
+                        // if (!isNaN(t))
+                        //     xmzys += t;
+                        var t1 = parseFloat(dataBudget1[j].xmz);
+                        if (!isNaN(t1))
+                            xmz += t1;
+                        var t2 = parseFloat(dataBudget1[j].byj);
+                        if (!isNaN(t2))
+                            byj += t2;
+                        var t3 = parseFloat(dataBudget1[j].xtjsyzx);
+                        if (!isNaN(t3))
+                            xtjsyzx += t3;
+                        var t4 = parseFloat(dataBudget1[j].sjyzx);
+                        if (!isNaN(t4))
+                            sjyzx += t4;
+                    }
+                }
+                console.log(sjyzx);
+                //更新父节点的值
+                for (var j = 0; j < dataBudget1.length; j++) {
+                    if (fj == dataBudget1[j].bm) {
+                        // if (xmzys == 0)
+                        //     dataBudget[j].xmzys = '';
+                        // else
+                        //     dataBudget[j].xmzys = xmzys.toFixed(2);
+                        if (xmz == 0)
+                            dataBudget1[j].xmz = '';
+                        else
+                            dataBudget1[j].xmz = xmz.toFixed(2);
+                        if (xtjsyzx == 0)
+                            dataBudget1[j].xtjsyzx = '';
+                        else
+                            dataBudget1[j].xtjsyzx = xtjsyzx.toFixed(2);
+                        if (sjyzx == 0)
+                            dataBudget1[j].sjyzx = '';
+                        else
+                            dataBudget1[j].sjyzx = sjyzx.toFixed(2);
+                        // if (byj > 0)
+                        //     dataBudget[j].byj = byj.toFixed(2);
+                        // else if(dataBudget[j].fj != '')
+                        //     dataBudget[j].byj = '';
+
+                        // console.log(dataBudget[j].fj);
+                        // console.log(dataBudget[j].byj);
+
+                        var ysje = xmz + byj;
+                        if (ysje == 0)
+                            dataBudget1[j].ysje = "";
+                        else
+                            dataBudget1[j].ysje = ysje.toFixed(2);
+
+                        setFjBudget(dataBudget1[j].fj);
+                        break;
+                    }
+                }
+            }
+        }
     });
 </script>
 </body>