소스 검색

fix:更新时添加判断,并抛出异常

ly 10 달 전
부모
커밋
554ea32c13

+ 9 - 3
src/main/java/cn/ezhizao/project/business/deduct/controller/BizDeductController.java

@@ -198,7 +198,7 @@ public class BizDeductController extends BaseController {
         entrustCondition.setId(conditions.getEntrustOrderId());
         BizEntrustOrder bizEntrustOrder = bizEntrustOrderService.getList(entrustCondition).stream().findFirst().orElse(null);
         if (bizEntrustOrder == null) {
-            new RuntimeException("委托单不存在");
+            throw new RuntimeException("委托单不存在");
         }
         // 结算订单号
         bizDeduct.setFormNo(bizEntrustOrder.getFormNo());
@@ -267,8 +267,14 @@ public class BizDeductController extends BaseController {
         List<String> months = loopEntrust.stream().map(v -> DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd")).distinct().sorted().collect(Collectors.toList());
         List<BizCompany> finalCompanies = companies;
         months.forEach(l -> {
-            List<BizEntrust> monthEntrust = loopEntrust.stream().filter(v -> DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd").equals(l)).collect(Collectors.toList());
-            finalCompanies.stream().filter(v -> monthEntrust.stream().anyMatch(e -> e.getCompanyId().equals(v.getId()))).forEach(v -> {
+            List<BizEntrust> monthEntrust = loopEntrust.stream()
+                    .filter(v ->
+                            DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd").equals(l))
+                    .collect(Collectors.toList());
+            finalCompanies.stream().filter(v ->
+                    monthEntrust.stream()
+                            .anyMatch(e -> e.getCompanyId().equals(v.getId())))
+                    .forEach(v -> {
                 BizStatementAccountLoop item = new BizStatementAccountLoop();
                 item.setEntrustOrderId(bizDeduct.getEntrustOrderId());
                 item.setSocialCreditCode(v.getSocialCreditCode());

+ 3 - 0
src/main/java/cn/ezhizao/project/business/deposit/service/impl/BizDepositServiceImpl.java

@@ -76,6 +76,9 @@ public class BizDepositServiceImpl extends ServiceImpl<BizDepositMapper, BizDepo
     @Override
     public boolean updateById(BizDeposit bizDeposit) {
         boolean status = super.updateById(bizDeposit);
+        if(!status){
+            return false;
+        }
         List<SysFileStorage> sysFileStorage = bizDeposit.getFiles();
         if (sysFileStorage != null) {
             sysFileStorage.forEach(l -> {