优化同步逻辑

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

@@ -117,6 +117,7 @@ public interface PrjAnnualbudgetdetailDao {
 
     BigDecimal selectWWYJZCF_SX(@Param("id") Integer id, @Param("DW") String DW);
 
+    BigDecimal getWw(@Param("id")Integer id,@Param("DW")String DW);
     BigDecimal selectXMZYS(Integer id);
 
     int updateXMZYS(@Param("id") Integer id, @Param("rwsys") BigDecimal rwsys);

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

@@ -264,8 +264,8 @@ public class PrjProjectServiceImpl implements PrjProjectService {
                 if (StringUtils.isNotBlank(DW)) {
                     // 更新除 总计与 外委研究支出费之外的 数据同步
                     int updateNum = prjAnnualbudgetdetailDao.updateRWSYS(rws, DW);
-                    // 更新外委
-                    int updateWw = prjAnnualbudgetdetailDao.updateWW(rws,DW);
+                   /* // 更新外委
+                    int updateWw = prjAnnualbudgetdetailDao.updateWW(rws,DW);*/
                     if ("s2".equals(prjProject.getXmlx())) {
                         //国网项目
                         WWYJZCF = prjAnnualbudgetdetailDao.selectWWYJZCF_GW(rws, DW);
@@ -276,8 +276,11 @@ public class PrjProjectServiceImpl implements PrjProjectService {
                     WWYJZCF = prjBudgetDao.queryYSJEByXMAndZJ(rws);
                 }
                 // 判断外委研究支出费中 外委研究支出费是否为空值
-                if (WWYJZCF != null){
-                    int numWWYJZCF = prjAnnualbudgetdetailDao.updateWWYJZCF(rws, WWYJZCF);
+                // 获取任务书外委预算额
+                BigDecimal ww = prjAnnualbudgetdetailDao.getWw(rws,DW);
+                if (WWYJZCF != null || ww != null){
+                    BigDecimal sum  = WWYJZCF.add(ww);
+                    int numWWYJZCF = prjAnnualbudgetdetailDao.updateWWYJZCF(rws, sum);
                     //更新外委支出总费
                     prjAnnualbudgetdetailDao.updateWWYJZCFSUM(rws);
                 }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -34,7 +34,7 @@
                         r.XM        AS XMFZRXM,
                         d.dept_name AS SSBMMC,
                         u.name      AS SQRXM,
-                        bd.XMZYS,
+                        COALESCE(bd.XMZYS,0.00) AS XMZYS,
                         p.DKYFZR,
                         bd.YSJE,
                         (

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -465,10 +465,10 @@
     <update id="updateWWYJZCF">
 
         update prj_AnnualBudgetDetail
-        set RWSYS = case when RWSYS is not null then RWSYS + CAST(#{WWYJZCF} AS DECIMAL(10, 2)) else CAST(#{WWYJZCF} AS DECIMAL(10, 2)) end,
-            XMZYS = case when XMZYS is not null then XMZYS + CAST(#{WWYJZCF} AS DECIMAL(10, 2)) else CAST(#{WWYJZCF} AS DECIMAL(10, 2)) end
+        set RWSYS = #{WWYJZCF},
+            XMZYS = #{WWYJZCF}
         where NYS in (SELECT ID from prj_AnnualBudget where RWS = #{id})
-          and FYMC = '（1）外委研究支出费';
+          and FYMC = '（1）外委研究支出费'
     </update>
     <update id="updateXMZYS">
         update prj_AnnualBudgetDetail
@@ -546,7 +546,7 @@
     <!--获取年度预算-->
     <select id="getBudgetList" resultMap="PrjAnnualbudgetdetailMap">
         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,
+               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, COALESCE(XMZYS,0.00) AS XMZYS, YBZJE, ZCBYJ, KYYS, ZCJE, BYJYSQ, BYQYBZ, ZRBYJ, DNZYZF,
                a.bzje sjyzx,
                c.bndsqje,
                c.bndbzje
@@ -746,6 +746,15 @@
         a.FYMC,
         b.XMMC;
     </select>
+    <select id="getWw" resultType="java.math.BigDecimal">
+        SELECT
+            COALESCE(${DW},0.00) AS WW
+        FROM
+            prj_Budget
+        WHERE
+            XM = #{id}
+          AND MC = '（1）外委研究支出费'
+    </select>
 
 </mapper>