任务书同步外委研究支出费合计逻辑优化

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

@@ -111,6 +111,7 @@ public interface PrjAnnualbudgetdetailDao {
     int batchDelete(List<Integer> nysList);
 
     int updateRWSYS(@Param("id") Integer id, @Param("DW") String DW);
+    int updateWW(@Param("id") Integer id, @Param("DW") String DW);
 
     int updateWWYJZCF(@Param("id") Integer id, @Param("WWYJZCF") BigDecimal WWYJZCF);
 

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

@@ -262,7 +262,10 @@ public class PrjProjectServiceImpl implements PrjProjectService {
                 //更新外委研究支出费
                 BigDecimal WWYJZCF = null;
                 if (StringUtils.isNotBlank(DW)) {
+                    // 更新除 总计与 外委研究支出费之外的 数据同步
                     int updateNum = prjAnnualbudgetdetailDao.updateRWSYS(rws, DW);
+                    // 更新外委
+                    int updateWw = prjAnnualbudgetdetailDao.updateWW(rws,DW);
                     if ("s2".equals(prjProject.getXmlx())) {
                         //国网项目
                         WWYJZCF = prjAnnualbudgetdetailDao.selectWWYJZCF_GW(rws, DW);
@@ -271,13 +274,14 @@ public class PrjProjectServiceImpl implements PrjProjectService {
                     //没有陕西国网支出 清空年度预算
                     prjAnnualbudgetdetailDao.updateNDYS(rws);
                     WWYJZCF = prjBudgetDao.queryYSJEByXMAndZJ(rws);
-
                 }
-                int numWWYJZCF = prjAnnualbudgetdetailDao.updateWWYJZCF(rws, WWYJZCF);
+                // 判断外委研究支出费中 外委研究支出费是否为空值
+                if (WWYJZCF != null){
+                    int numWWYJZCF = prjAnnualbudgetdetailDao.updateWWYJZCF(rws, WWYJZCF);
+                }
                 //更新外委支出总费
                 prjAnnualbudgetdetailDao.updateWWYJZCFSUM(rws);
             }
-
         }
         if ("s1".equals(prjProject.getXmlx())) {
             //陕西项目
@@ -302,13 +306,11 @@ public class PrjProjectServiceImpl implements PrjProjectService {
                     //没有陕西国网支出 清空年度预算
                     prjAnnualbudgetdetailDao.updateNDYS(rws);
                     WWYJZCF = prjBudgetDao.queryYSJEByXMAndZJ(rws);
-
                 }
                 int numWWYJZCF = prjAnnualbudgetdetailDao.updateWWYJZCF(rws, WWYJZCF);
                 //更新外委支出总费
                 prjAnnualbudgetdetailDao.updateWWYJZCFSUM(rws);
             }
-
         }
         return BaseResult.success("同步成功");
     }

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -451,14 +451,24 @@
           and A.FYMC != '（1）外委研究支出费'
           and A.FYMC != '总计'
     </update>
+    <update id="updateWW">
+
+        update A
+        set A.XMZYS = B.DW from prj_AnnualBudgetDetail A
+            inner join (SELECT MC, ${DW} as DW
+          , YSJE from prj_Budget where XM = #{id}) B
+        on A.FYMC = B.MC
+        where
+            NYS in (SELECT ID from prj_AnnualBudget where RWS = #{id} )
+          and A.FYMC = '（1）外委研究支出费'
+    </update>
     <update id="updateWWYJZCF">
 
         update prj_AnnualBudgetDetail
-        set RWSYS = #{WWYJZCF},
-            XMZYS = #{WWYJZCF}
+        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
         where NYS in (SELECT ID from prj_AnnualBudget where RWS = #{id})
-          and FYMC = '（1）外委研究支出费'
-
+          and FYMC = '（1）外委研究支出费';
     </update>
     <update id="updateXMZYS">
         update prj_AnnualBudgetDetail

src/main/resources/templates/prjproject/list.html

@@ -779,7 +779,6 @@
                 } else if (data[0].spzt != "审批结束") {
                     Message.warning("该任务书未审批结束，不能同步！", 1500);
                 } else {
-
                     layer.confirm('确定要将该任务书进行数据同步吗？', function (index) {
                         layer.close(index);
                         AjaxUtil.get({

src/main/resources/templates/reportinfo/list_myproject.html

@@ -12,7 +12,6 @@
         body {
             overflow-y: scroll;
         }
-
         /* 禁止刷新后出现横向滚动条 */
     </style>
 </head>