同步年度预算的外委研究支出费,项目总预算,任务书预算

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

@@ -278,7 +278,7 @@ public class PrjAnnualbudgetController extends BaseController {
             for(int i=0;i<list.size();i++){
                 if("总计".equals(list.get(i).getFymc())){
                     zjfy=i;
-                    list.get(i).setXmzys(list.get(i).getRwsys());
+                    list.get(i).setXmzys(list.get(i).getXmzys());
                 }
                 if((list.get(i).getFymc()).endsWith("外委支出费")&&!(list.get(i).getFymc()).startsWith("（1）")){
                     fy1=i;

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

@@ -1,6 +1,5 @@
 package com.liang.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
@@ -11,18 +10,15 @@ import com.liang.common.utils.MoneyToChineseUtil;
 import com.liang.common.utils.StringUtils;
 import com.liang.common.utils.WordUtils;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
-import com.liang.dao.PrjProjectDao;
 import com.liang.entity.*;
 import com.liang.service.*;
 //import com.liang.vo.service.*;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -345,18 +341,16 @@ public class PrjProjectController extends BaseController {
     public BaseResult updateSpzt(@RequestBody String strData) {
         PrjProject rws = JsonTool.parseObject(strData, PrjProject.class);
         int num = prjProjectService.updateSpzt(rws);
-        //审批结束时 同步年度预算的数据
+        //审批结束时 更新任务书预算
         if (StringUtils.isNotBlank(rws.getSpzt()) && "审批结束".equals(rws.getSpzt())) {
-            int updateNum = prjAnnualbudgetdetailDao.updateRWSYSAndXMZYSAndDw1(rws.getId());
-
+            int updateNum = prjAnnualbudgetdetailDao.updateRWSYS(rws.getId());
+            //更新项目总预算
+            BigDecimal XMZYS = prjAnnualbudgetdetailDao.selectXMZYS(rws.getId());
+            int numXMZYS = prjAnnualbudgetdetailDao.updateXMZYS(rws.getId(), XMZYS);
             //更新外委研究支出费
             BigDecimal WWYJZCF = prjAnnualbudgetdetailDao.selectWWYJZCF(rws.getId());
             int numWWYJZCF = prjAnnualbudgetdetailDao.updateWWYJZCF(rws.getId(), WWYJZCF);
-            if (numWWYJZCF > 0 && updateNum > 0) {
-                return BaseResult.success("保存成功!");
-            } else {
-                return BaseResult.failure("保存失败!");
-            }
+
         }
         if (num > 0) {
             return BaseResult.success("保存成功!");

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

@@ -102,10 +102,14 @@ public interface PrjAnnualbudgetdetailDao {
      */
     int batchDelete(List<Integer> nysList);
 
-    int updateRWSYSAndXMZYSAndDw1(Integer id);
+    int updateRWSYS(Integer id);
 
     int updateWWYJZCF(@Param("id") Integer id, @Param("WWYJZCF") BigDecimal WWYJZCF);
 
     BigDecimal selectWWYJZCF(Integer id);
+
+    BigDecimal selectXMZYS(Integer id);
+
+    int updateXMZYS(@Param("id") Integer id, @Param("rwsys") BigDecimal rwsys);
 }
 

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -437,12 +437,11 @@
             BYJ     = #{byj}
         where ID = #{id}
     </update>
-    <update id="updateRWSYSAndXMZYSAndDw1">
+    <update id="updateRWSYS">
 
         update A
-        set A.DW1   = B.YSJE,
-            A.RWSYS = B.YSJE,
-            A.XMZYS =B.YSJE
+        set
+            A.RWSYS = B.YSJE
         from prj_AnnualBudgetDetail A
         inner join (SELECT  MC ,YSJE from prj_Budget where XM = #{id}) B on A.FYMC = B.MC
         where
@@ -460,6 +459,14 @@
           and FYMC = '1.外委研究支出费'
 
     </update>
+    <update id="updateXMZYS">
+        update prj_AnnualBudgetDetail
+        set
+            XMZYS = #{rwsys}
+        where
+            NYS = (SELECT ID from prj_AnnualBudget where RWS = #{id})
+          and FYMC = '总计'
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">
@@ -520,5 +527,10 @@
         where
             pu.DWMC not LIKE  '%国网陕西省电力%'
     </select>
+    <select id="selectXMZYS" resultType="java.math.BigDecimal">
+
+        SELECT SUM(CZJE) from prj_feescheme  where ZB = #{id} and DWMC  LIKE  '%国网陕西省电力%'
+
+    </select>
 </mapper>
 

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

@@ -211,6 +211,7 @@
                     }
                 }
                 $("#ndbyj").val(dataBudget[zjfy].byj);
+                $("#rwsys").val(dataBudget[zjfy].xmzys);
             }
         });
 
@@ -248,7 +249,7 @@
                 [
                     {type: 'numbers', width: '3%'},
                     {field: 'fymc', width: '30%', title: '费用名称'},
-                    {field: 'xmzys', width: '12%', title: '项目总预算'},
+                    {field: 'rwsys', width: '12%', title: '项目总预算'},
                     {field: 'xtjsyzx', width: '15%', title: '系统计算已执行'},
                     {field: 'sjyzx', width: '12%', title: '实际已执行'},
                     {field: 'ysje', width: '10%', title: '预算金额'},