同步已执行按钮

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

@@ -1,5 +1,6 @@
 package com.liang.service.impl;
 
+import com.liang.common.base.BaseResult;
 import com.liang.dao.PrjAnnualbudgetDao;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
 import com.liang.entity.PrjAnnualbudget;
@@ -158,7 +159,7 @@ public class PrjAnnualbudgetServiceImpl implements PrjAnnualbudgetService {
     }
     @GetMapping("/updateSJYZXAndXTJSYZX/{rwsId}/{nysId}")
     @Transactional(rollbackFor = Exception.class)
-    public void updateSJYZXAndXTJSYZX(@PathVariable("rwsId")Integer rwsId, @PathVariable("nysId")Integer nysId) {
+    public BaseResult updateSJYZXAndXTJSYZX(@PathVariable("rwsId")Integer rwsId, @PathVariable("nysId")Integer nysId) {
         List<PrjAnnualbudget> prjAnnualbudgets = prjAnnualbudgetDao.listByRws(rwsId);
         //第一年的年度预算不需要更新
         if (!Collections.isEmpty(prjAnnualbudgets) && !prjAnnualbudgets.get(0).getId().equals(nysId)) {
@@ -170,6 +171,7 @@ public class PrjAnnualbudgetServiceImpl implements PrjAnnualbudgetService {
             //更新已执行总计
             prjAnnualbudgetDao.updateSJYZXSumByNysId(rwsId,annualbudget.getNf(),annualbudget.getId());
         }
+        return BaseResult.success("已执行数据同步成功");
     }
 
     @Override

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

@@ -332,12 +332,13 @@
                     Message.error(nf + "不在项目起止时间内！", 1500);
                     return false;
                 }
-            } else {
-                if (nf < qs) {
-                    Message.error(nf + "不在项目起始时间内！", 1500);
-                    return false;
-                }
             }
+            // else {
+            //     if (nf < qs) {
+            //         Message.error(nf + "不在项目起始时间内！", 1500);
+            //         return false;
+            //     }
+            // }
             var url = AjaxUtil.ctx;
             if (ysId == -1) {
                 url += "prjAnnualbudget/doAdd";