fix：修复预算批量导入

feat：兼容预算补偿接口调用批量导入

src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java

@@ -155,8 +155,8 @@ public class BirActivityCenterGoodsController {
                 .eq(TbsCostApply::getCancelFlag,0)
                 .gt(TbsCostApply::getTotalActivity,0)
                 .ne(TbsCostApply::getTmpState,11)
-                .le(TbsCostApply::getCreateTime, LocalDate.of(2024,1,1).atStartOfDay())
+                //.le(TbsCostApply::getCreateTime, LocalDate.of(2024,1,1).atStartOfDay())
-                .ge(TbsCostApply::getCreateTime, LocalDate.of(2023,1,1).atStartOfDay()) ;
+                .ge(TbsCostApply::getCreateTime, LocalDate.of(2024,1,1).atStartOfDay()) ;
         boolean ex = extracted(lqw);
         while (!ex){
             ex = extracted(lqw);

src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java

@@ -250,6 +250,10 @@ public class BmsRegion2Controller {
         param.setId(regionBo.getId());
         param.setName(regionBo.getName());
         param.setPid(regionBo.getPid());
+        param.setRemark(regionBo.getRemark());
+        param.setSysCode1(regionBo.getSysCode1());
+        param.setSysCode2(regionBo.getSysCode2());
+        param.setSysCode3(regionBo.getSysCode3());
         boolean result = bmsRegion2Service.updateBizRegionById(param);
         return R.isTrue(result);
     }

src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java

@@ -50,6 +50,7 @@ public class BmsRegion2 implements Serializable {
     /** 祖级id */
     private String pathNames;
 
+    private String remark;
 
     /** 系统编码1 */
     private String sysCode1;

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java

@@ -14,6 +14,7 @@ import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
 import com.qs.serve.modules.tbs.service.TbsBudgetChangeService;
 import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import com.qs.serve.modules.tbs.service.impl.TbsBudgetApplyOperationServiceImpl;
+import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl;
 import com.qs.serve.modules.tbs.service.impl.TbsBudgetChangeOperationServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,27 +39,49 @@ public class TbsBudgetCheckController {
     private final TbsBudgetChangeService tbsBudgetChangeService;
     private final TbsBudgetApplyOperationServiceImpl tbsBudgetApplyOperationService;
     private final TbsBudgetChangeOperationServiceImpl tbsBudgetChangeOperationService;
+    private final TbsBudgetBatchOperationServiceImpl tbsBudgetBatchOperationService;
 
 
     /**
      * 提交申请
      * @return
      */
-    @PostMapping("commitApply/{id}")
+    @PostMapping("commitApply/{budgetId}")
-    public R<?> commitApply(@PathVariable("id") Long id){
+    public R<?> commitApply(@PathVariable("budgetId") Long id){
         tbsBudgetService.commitApply(id);
         return R.ok();
     }
 
-    @PostMapping("runApplyCompensate/{id}")
+    /**
-    public R<?> runCompensate(@PathVariable("id") Long id){
+     * 补偿申请单子
-        tbsBudgetApplyOperationService.runCompensate(id+"");
+     * @param budgetId
+     * @return
+     */
+    @PostMapping("runApplyCompensate/{budgetId}")
+    public R<?> runCompensate(@PathVariable("budgetId") Long budgetId){
+        TbsBudget budget = tbsBudgetService.getById(budgetId);
+        if(budget.getBatchApplyId()!=null){
+            tbsBudgetBatchOperationService.runCompensate(budget.getBatchApplyId()+"");
+        }else {
+            tbsBudgetApplyOperationService.runCompensate(budgetId+"");
+        }
         return R.ok();
     }
 
-    @PostMapping("runChangeCompensate/{id}")
+    /**
-    public R<?> runChangeCompensate(@PathVariable("id") Long id){
+     * 补偿修改单子
-        tbsBudgetChangeOperationService.runCompensate(id+"");
+     * @param changeId
+     * @return
+     */
+    @PostMapping("runChangeCompensate/{changeId}")
+    public R<?> runChangeCompensate(@PathVariable("changeId") Long changeId){
+        TbsBudgetChange change = tbsBudgetChangeService.getById(changeId);
+        //如果时批量的申请，调用批量补偿
+        if(change.getBatchApplyId()!=null){
+            tbsBudgetBatchOperationService.runCompensate(change.getBatchApplyId()+"");
+        }else {
+            tbsBudgetChangeOperationService.runCompensate(changeId+"");
+        }
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java

@@ -73,6 +73,13 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
         return null;
     }
 
+    @Override
+    public Object compensateFinished(String targetId) {
+        TbsAffairCommitBo param = new TbsAffairCommitBo();
+        param.setTargetId(targetId);
+        return doFinished(param);
+    }
+
     @Override
     public Object doFinished(TbsAffairCommitBo param) {
         TbsBudget tbsBudget = budgetMapper.selectById(param.getTargetId());

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java

@@ -80,6 +80,12 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi
         return null;
     }
 
+    @Override
+    public Object compensateFinished(String targetId) {
+        dofinishedAction(targetId);
+        return null;
+    }
+
     /**
      * 执行完成回调
      * @param changeId