修复tapd异常

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

@@ -278,6 +278,14 @@ public class BmsCostCenterController {
         if(result){
             return R.error("存在子节点无法删除");
         }
+
+        //bmsCostCenterService
+        LambdaQueryWrapper<BmsCenterRegion> centerRegionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        centerRegionLambdaQueryWrapper.eq(BmsCenterRegion::getCenterId,id);
+        boolean centerRegionExist = bmsCenterRegionService.count(centerRegionLambdaQueryWrapper)>0;
+        if(centerRegionExist){
+            return R.error("区域使用中，删除失败");
+        }
         bmsCostCenterService.removeById(id);
         return R.ok();
     }

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

@@ -49,6 +49,7 @@ public class BmsRegionController {
     private BmsRegionUserService bmsRegionUserService;
     private HisUserSupplierService hisUserSupplierService;
     private TbsBudgetService tbsBudgetService;
+    private BmsCostCenterService bmsCostCenterService;
 
     /**
      * 列表
@@ -380,6 +381,7 @@ public class BmsRegionController {
         if(bmsChannelPointService.listByBizRegionId(id).size()>0){
             return R.error("地区含有网点无法删除");
         }
+
         LambdaQueryWrapper<TbsBudget> budgetLambdaQueryWrapper = new LambdaQueryWrapper<>();
         budgetLambdaQueryWrapper.eq(TbsBudget::getCenterType, TbsCenterType.saleRegion);
         budgetLambdaQueryWrapper.eq(TbsBudget::getCenterId,id);

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

@@ -12,7 +12,9 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
@@ -68,6 +70,7 @@ public class TbsCostApplyController {
     private final TbsActivityChannelPointService activityChannelPointService;
     private TbsBudgetLogService tbsBudgetLogService;
     private BmsSupplierService bmsSupplierService;
+    private BmsRegion2Service region2Service;
     private SysUserService sysUserService;
     private SeeYonRequestService seeYonService;
     private TbsBudgetApplicationService budgetApplicationService;
@@ -262,6 +265,18 @@ public class TbsCostApplyController {
         entity.setCode(CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply));
         entity.setSupplierCode(supplier.getCode());
         entity.setSupplierName(supplier.getName());
+        if(StringUtils.hasText(supplier.getRegion2First())){
+            BmsRegion2 region2 = region2Service.getById(supplier.getRegion2First());
+            entity.setSupplierBizRegionFirstName(region2.getName());
+        }
+        if(StringUtils.hasText(supplier.getRegion2Second())){
+            BmsRegion2 region2 = region2Service.getById(supplier.getRegion2Second());
+            entity.setSupplierBizRegionSecondName(region2.getName());
+        }
+        if(StringUtils.hasText(supplier.getRegion2Third())){
+            BmsRegion2 region2 = region2Service.getById(supplier.getRegion2Third());
+            entity.setSupplierBizRegionThirdName(region2.getName());
+        }
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         entity.setUserId(sysUser.getId());
         entity.setUserCode(sysUser.getCode());
@@ -339,6 +354,18 @@ public class TbsCostApplyController {
         activityBo.setTemplateId(param.getTemplateId());
         activityBo.setTemplateTitle(param.getTemplateTitle());
         entity.setSupplierCode(supplier.getCode());
+        if(StringUtils.hasText(supplier.getRegion2First())){
+            BmsRegion2 region2 = region2Service.getById(supplier.getRegion2First());
+            entity.setSupplierBizRegionFirstName(region2.getName());
+        }
+        if(StringUtils.hasText(supplier.getRegion2Second())){
+            BmsRegion2 region2 = region2Service.getById(supplier.getRegion2Second());
+            entity.setSupplierBizRegionSecondName(region2.getName());
+        }
+        if(StringUtils.hasText(supplier.getRegion2Third())){
+            BmsRegion2 region2 = region2Service.getById(supplier.getRegion2Third());
+            entity.setSupplierBizRegionThirdName(region2.getName());
+        }
         entity.setSupplierName(supplier.getName());
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         entity.setUserId(sysUser.getId());

src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java

@@ -112,26 +112,26 @@ public class TbsBudgetBatch implements Serializable {
     @TableField(exist = false)
     private List<TbsBudgetChange> changeList;
 
-	public static TbsBudgetBatch toNewObject(TbsBudgetBatch source){
+//	public static TbsBudgetBatch toNewObject(TbsBudgetBatch source){
-		TbsBudgetBatch budgetBatch = new TbsBudgetBatch();
+//		TbsBudgetBatch budgetBatch = new TbsBudgetBatch();
-		budgetBatch.setId(source.getId());
+//		budgetBatch.setId(source.getId());
-		budgetBatch.setBatchTitle(source.getBatchTitle());
+//		budgetBatch.setBatchTitle(source.getBatchTitle());
-		budgetBatch.setBatchCode(source.getBatchCode());
+//		budgetBatch.setBatchCode(source.getBatchCode());
-		budgetBatch.setBatchState(source.getBatchState());
+//		budgetBatch.setBatchState(source.getBatchState());
-		budgetBatch.setSyFormId(source.getSyFormId());
+//		budgetBatch.setSyFormId(source.getSyFormId());
-		budgetBatch.setUserId(source.getUserId());
+//		budgetBatch.setUserId(source.getUserId());
-		budgetBatch.setUserCode(source.getUserCode());
+//		budgetBatch.setUserCode(source.getUserCode());
-		budgetBatch.setUserName(source.getUserName());
+//		budgetBatch.setUserName(source.getUserName());
-		budgetBatch.setSubmitTime(source.getSubmitTime());
+//		budgetBatch.setSubmitTime(source.getSubmitTime());
-		budgetBatch.setRemark(source.getRemark());
+//		budgetBatch.setRemark(source.getRemark());
-		budgetBatch.setCreateTime(source.getCreateTime());
+//		budgetBatch.setCreateTime(source.getCreateTime());
-		budgetBatch.setUpdateTime(source.getUpdateTime());
+//		budgetBatch.setUpdateTime(source.getUpdateTime());
-		budgetBatch.setTenantId(source.getTenantId());
+//		budgetBatch.setTenantId(source.getTenantId());
-		budgetBatch.setCreateBy(source.getCreateBy());
+//		budgetBatch.setCreateBy(source.getCreateBy());
-		budgetBatch.setUpdateBy(source.getUpdateBy());
+//		budgetBatch.setUpdateBy(source.getUpdateBy());
-		budgetBatch.setDelFlag(source.getDelFlag());
+//		budgetBatch.setDelFlag(source.getDelFlag());
-		return budgetBatch;
+//		return budgetBatch;
-	}
+//	}
 
 }
 

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

@@ -73,7 +73,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
     public Object commit(TbsBudgetBatchBo param) {
 
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
-        String batchCode = CodeGenUtil.generate(CodeGenUtil.SourceKey.BudgetBatch);
+        String batchCode = "BH"+CodeGenUtil.generate(CodeGenUtil.SourceKey.BudgetBatch);
         String templateCode = TbsSeeYonConst.BudgetBatchApplyConf.Code();
         //构建Batch
         TbsBudgetBatch budgetBatch = buildBatchData(param, batchCode, sysUser);

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

@@ -8,6 +8,7 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.common.TbsBudgetCheckState;
@@ -96,9 +97,16 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi
             return;
         }
         TbsBudget tbsBudget = budgetMapper.selectById(budgetChange.getBudgetId());
-        tbsBudget.setBudgetCode(budgetChange.getBudgetTitle());
+        boolean updBudget = false;
+        if(StringUtils.hasText(budgetChange.getNewBudgetTitle())){
+            tbsBudget.setBudgetCode(budgetChange.getNewBudgetTitle());
+            updBudget = true;
+        }
         if(budgetChange.getNewAttachIds()!=null&& budgetChange.getNewAttachIds().length>0){
             tbsBudget.setAttachIds(budgetChange.getNewAttachIds());
+            updBudget = true;
+        }
+        if(updBudget){
             budgetMapper.updateById(tbsBudget);
         }
         SysUser sysUser = getSysUserService().getById(budgetChange.getUserId());

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

@@ -574,15 +574,15 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
             budgetVo.setAttachList(attachList);
         }
         //TODO 添加子状态码；有更变时,修改为审批状态
-        if(budgetVo.getBudgetState().equals(1)&&!budgetVo.getBudgetCheckState().equals(TbsBudgetCheckState.State_1_apply)){
+//        if(budgetVo.getBudgetState().equals(1)&&!budgetVo.getBudgetCheckState().equals(TbsBudgetCheckState.State_1_apply)){
-            LambdaQueryWrapper<TbsBudgetChange> change_lqw = new LambdaQueryWrapper<>();
+//            LambdaQueryWrapper<TbsBudgetChange> change_lqw = new LambdaQueryWrapper<>();
-            change_lqw.eq(TbsBudgetChange::getBudgetId,budgetVo.getId());
+//            change_lqw.eq(TbsBudgetChange::getBudgetId,budgetVo.getId());
-            change_lqw.eq(TbsBudgetChange::getBudgetCheckState,TbsBudgetCheckState.State_1_apply);
+//            change_lqw.eq(TbsBudgetChange::getBudgetCheckState,TbsBudgetCheckState.State_1_apply);
-            long count = tbsBudgetChangeMapper.selectCount(change_lqw);
+//            long count = tbsBudgetChangeMapper.selectCount(change_lqw);
-            if(count>0){
+//            if(count>0){
-                budgetVo.setBudgetCheckState(TbsBudgetCheckState.State_1_apply);
+//                budgetVo.setBudgetCheckState(TbsBudgetCheckState.State_1_apply);
-            }
+//            }
-        }
+//        }
 
         budgetVo.setTemplateFlag(budget.getTemplateFlag());
         if(budget.getTemplateFlag().equals(1)&&budget.getTemplateIds()!=null&&budget.getTemplateIds().length>0){

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -114,10 +114,10 @@ public class VtbVerificationController {
         //减少mysql limit 产生的 IO
         lqw.select(VtbVerification::getId);
         if(param.getQueryStartTime()!=null){
-            lqw.ge(VtbVerification::getFinishedTime,param.getQueryStartTime());
+            lqw.ge(VtbVerification::getCreateTime,param.getQueryStartTime());
         }
         if(param.getQueryEndTime()!=null){
-            lqw.le(VtbVerification::getFinishedTime,param.getQueryEndTime());
+            lqw.le(VtbVerification::getCreateTime,param.getQueryEndTime());
         }
         if(loadChild!=null&&loadChild.equals(1)){
             List<String> userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId());