fix: debug

src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java

@@ -284,23 +284,28 @@ public class AsyncFactory {
                     }
                     VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
                     String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString());
-                    DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class);
-                    // TbsAffairCommitBo.state 0-否定，1-同意，2-退回
-                    Integer state = commitService.getState(verificationOperationService.getTemplateCode(),verificationId+"");
-                    VtbVerificationApplication verificationApplication = SpringUtils.getBean(VtbVerificationApplication.class);
-                    if(state.equals(1)){
-                        //调用成功回调方法
-                        verificationApplication.finishCallBack(verification, totalAmount);
-                    }else if(state.equals(2)){
-                        verificationApplication.backCommitAndStop(verification,true);
-                    }else if(state.equals(0)){
-                        verificationApplication.backCommitAndStop(verification,false);
-                    }else {
-                        return;
-                    }
-                    if(realaseFlag){
-                        vtbVerificationService.release(verification.getActivityId(),userCode,false);
+
+                    if(summeryResult.equals(TbsCostApplyOperationServiceImpl.SummeryState_Success)){
+                        DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class);
+                        // TbsAffairCommitBo.state 0-否定，1-同意，2-退回
+                        Integer state = commitService.getState(verificationOperationService.getTemplateCode(),verificationId+"");
+                        VtbVerificationApplication verificationApplication = SpringUtils.getBean(VtbVerificationApplication.class);
+                        if(state.equals(1)){
+                            //调用成功回调方法
+                            verificationApplication.finishCallBack(verification, totalAmount);
+                        }else if(state.equals(2)){
+                            verificationApplication.backCommitAndStop(verification,true);
+                        }else if(state.equals(0)){
+                            verificationApplication.backCommitAndStop(verification,false);
+                        }else {
+                            return;
+                        }
+                        if(realaseFlag){
+                            vtbVerificationService.release(verification.getActivityId(),userCode,false);
+                        }
                     }
+
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -141,7 +141,7 @@ public class BmsSupplierController {
         initSupplierList(list);
         initParentList(list);
 
-        List<BmsSupplierExcelBo> boList = list.stream().map(a->BmsSupplierExcelBo.toExcelBo(a)).collect(Collectors.toList());
+        List<BmsSupplierExcelBo> boList = list.stream().map(BmsSupplierExcelBo::toExcelBo).collect(Collectors.toList());
 
         return R.ok(boList);
     }
@@ -1144,6 +1144,11 @@ public class BmsSupplierController {
                 supplier.setStopFlagDate(a.getCloseAccountDate());
                 supplier.setCooperatePauseFlag(a.getSuspendCooperationStatus());
                 supplier.setCooperatePauseFlagDate(a.getSuspendCooperationDate());
+                supplier.setSupplierFlag(a.getIsSupplier());
+                supplier.setSupplierInfoFlag(a.getSupplierInfoFlag());
+                supplier.setSupplierLicenseImg(a.getSupplierLicenseImg());
+                supplier.setSupplierUser(a.getSupplierUser());
+                supplier.setSupplierTaxNumber(a.getSupplierTaxNumber());
                 if(StringUtils.hasText(a.getMainHeadCode())){
                     SysUser sysUser = sysUserMap.get(a.getMainHeadCode());
                     supplier.setUserId(sysUser.getId());
@@ -1207,6 +1212,11 @@ public class BmsSupplierController {
                 supplier.setStopFlagDate(a.getCloseAccountDate());
                 supplier.setCooperatePauseFlag(a.getSuspendCooperationStatus());
                 supplier.setCooperatePauseFlagDate(a.getSuspendCooperationDate());
+                supplier.setSupplierFlag(a.getIsSupplier());
+                supplier.setSupplierInfoFlag(a.getSupplierInfoFlag());
+                supplier.setSupplierLicenseImg(a.getSupplierLicenseImg());
+                supplier.setSupplierUser(a.getSupplierUser());
+                supplier.setSupplierTaxNumber(a.getSupplierTaxNumber());
                 if(StringUtils.hasText(a.getMainHeadCode())){
                     SysUser sysUser = sysUserMap.get(a.getMainHeadCode());
                     supplier.setUserId(sysUser.getId());

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java

@@ -122,6 +122,16 @@ public class BmsSupplierExcelBo {
             BmsRegion secRegion = (BmsRegion)bmsSupplier.getRegionSecondInfo();
             bo.setSalesRegionName(secRegion.getName());
         }
+        if(bmsSupplier.getRegionThirdInfo()!=null) {
+            BmsRegion secRegion = (BmsRegion)bmsSupplier.getRegionThirdInfo();
+            bo.setSalesRegionName(secRegion.getName());
+        }
+        if(bmsSupplier.getRegionFourthlyInfo()!=null) {
+            BmsRegion secRegion = (BmsRegion)bmsSupplier.getRegionFourthlyInfo();
+            if(StringUtils.hasText(secRegion.getName())){
+                bo.setSalesRegionName(secRegion.getName());
+            }
+        }
         if(bmsSupplier.getRegion2FirstInfo()!=null) {
             BmsRegion2 first2Region = (BmsRegion2)bmsSupplier.getRegion2FirstInfo();
             bo.setFirstLevelAdministrativeRegionName(first2Region.getName());

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

@@ -164,11 +164,22 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
             if(budget.getBudgetCheckState().equals(TbsCommonCheckState.State_1_apply)){
                 Assert.throwEx("预算审批中无法编辑");
             }
+            LambdaQueryWrapper<TbsBudget> lqwName = new LambdaQueryWrapper<>();
+            lqwName.eq(TbsBudget::getBudgetCode,budgetBo.getBudgetCode());
+            lqwName.ne(TbsBudget::getId,budgetBo.getId());
+            if(this.count(lqwName)>0){
+                Assert.throwEx("名称已存在");
+            }
             //移除旧的条件数据
             LambdaQueryWrapper<TbsBudgetCondition> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsBudgetCondition::getBudgetId,budget.getId());
             budgetConditionService.remove(lqw);
         }else {
+            LambdaQueryWrapper<TbsBudget> lqwName = new LambdaQueryWrapper<>();
+            lqwName.eq(TbsBudget::getBudgetCode,budgetBo.getBudgetCode());
+            if(this.count(lqwName)>0){
+                Assert.throwEx("名称已存在");
+            }
             budget = CopierUtil.copy(budgetBo,new TbsBudget());
             budget.setBudgetNumber("BM"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget));
         }

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java

@@ -7,10 +7,13 @@ import com.qs.serve.common.util.SpringUtils;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
+import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityPayCondition;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
+import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.TbsActivityPayConditionService;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
@@ -43,6 +46,7 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
     private VtbFundFlowService vtbFundFlowService;
     private TbsActivityPayConditionService activityPayConditionService;
     private TbsActivityService tbsActivityService;
+    private TbsCostApplyMapper tbsCostApplyMapper;
 
     @Override
     public boolean checkSyFormIdIsNotNull(String targetId) {
@@ -100,6 +104,12 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
                 VtbVerificationService service = SpringUtils.getBean(VtbVerificationService.class);
                 service.cancelRelease(tbsActivity.getId());
             }
+
+            TbsCostApply costApply = tbsCostApplyMapper.selectById(tbsActivity.getCostApplyId());
+            if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
+                costApply.setChargeState(TbsCostApplyState.State_2_actioning.getCode());
+                tbsCostApplyMapper.updateById(costApply);
+            }
         }
         return null;
     }