From 81db2b1e533d5c63fa6509ca090b77bbb5f34622 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 20 Oct 2023 12:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtapd=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmsCostCenterController.java | 8 ++++ .../bms/controller/BmsRegionController.java | 2 + .../controller/TbsCostApplyController.java | 27 +++++++++++++ .../modules/tbs/entity/TbsBudgetBatch.java | 40 +++++++++---------- .../impl/TbsBudgetBatchServiceImpl.java | 2 +- .../TbsBudgetChangeOperationServiceImpl.java | 10 ++++- .../service/impl/TbsBudgetServiceImpl.java | 18 ++++----- .../controller/VtbVerificationController.java | 4 +- 8 files changed, 78 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java index 7b7a19a8..3fa53024 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java +++ b/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 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(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 2a55302f..3fcbcf81 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/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 budgetLambdaQueryWrapper = new LambdaQueryWrapper<>(); budgetLambdaQueryWrapper.eq(TbsBudget::getCenterType, TbsCenterType.saleRegion); budgetLambdaQueryWrapper.eq(TbsBudget::getCenterId,id); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index cff0bca5..8ea4c36e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/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()); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java index 2555dcb5..482a73bb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java +++ b/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 changeList; - public static TbsBudgetBatch toNewObject(TbsBudgetBatch source){ - TbsBudgetBatch budgetBatch = new TbsBudgetBatch(); - budgetBatch.setId(source.getId()); - budgetBatch.setBatchTitle(source.getBatchTitle()); - budgetBatch.setBatchCode(source.getBatchCode()); - budgetBatch.setBatchState(source.getBatchState()); - budgetBatch.setSyFormId(source.getSyFormId()); - budgetBatch.setUserId(source.getUserId()); - budgetBatch.setUserCode(source.getUserCode()); - budgetBatch.setUserName(source.getUserName()); - budgetBatch.setSubmitTime(source.getSubmitTime()); - budgetBatch.setRemark(source.getRemark()); - budgetBatch.setCreateTime(source.getCreateTime()); - budgetBatch.setUpdateTime(source.getUpdateTime()); - budgetBatch.setTenantId(source.getTenantId()); - budgetBatch.setCreateBy(source.getCreateBy()); - budgetBatch.setUpdateBy(source.getUpdateBy()); - budgetBatch.setDelFlag(source.getDelFlag()); - return budgetBatch; - } +// public static TbsBudgetBatch toNewObject(TbsBudgetBatch source){ +// TbsBudgetBatch budgetBatch = new TbsBudgetBatch(); +// budgetBatch.setId(source.getId()); +// budgetBatch.setBatchTitle(source.getBatchTitle()); +// budgetBatch.setBatchCode(source.getBatchCode()); +// budgetBatch.setBatchState(source.getBatchState()); +// budgetBatch.setSyFormId(source.getSyFormId()); +// budgetBatch.setUserId(source.getUserId()); +// budgetBatch.setUserCode(source.getUserCode()); +// budgetBatch.setUserName(source.getUserName()); +// budgetBatch.setSubmitTime(source.getSubmitTime()); +// budgetBatch.setRemark(source.getRemark()); +// budgetBatch.setCreateTime(source.getCreateTime()); +// budgetBatch.setUpdateTime(source.getUpdateTime()); +// budgetBatch.setTenantId(source.getTenantId()); +// budgetBatch.setCreateBy(source.getCreateBy()); +// budgetBatch.setUpdateBy(source.getUpdateBy()); +// budgetBatch.setDelFlag(source.getDelFlag()); +// return budgetBatch; +// } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java index 3a3f7488..7c186a43 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java @@ -73,7 +73,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl0){ tbsBudget.setAttachIds(budgetChange.getNewAttachIds()); + updBudget = true; + } + if(updBudget){ budgetMapper.updateById(tbsBudget); } SysUser sysUser = getSysUserService().getById(budgetChange.getUserId()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 8f032d9f..61ffcffb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -574,15 +574,15 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetVo.setAttachList(attachList); } //TODO 添加子状态码；有更变时,修改为审批状态 - if(budgetVo.getBudgetState().equals(1)&&!budgetVo.getBudgetCheckState().equals(TbsBudgetCheckState.State_1_apply)){ - LambdaQueryWrapper change_lqw = new LambdaQueryWrapper<>(); - change_lqw.eq(TbsBudgetChange::getBudgetId,budgetVo.getId()); - change_lqw.eq(TbsBudgetChange::getBudgetCheckState,TbsBudgetCheckState.State_1_apply); - long count = tbsBudgetChangeMapper.selectCount(change_lqw); - if(count>0){ - budgetVo.setBudgetCheckState(TbsBudgetCheckState.State_1_apply); - } - } +// if(budgetVo.getBudgetState().equals(1)&&!budgetVo.getBudgetCheckState().equals(TbsBudgetCheckState.State_1_apply)){ +// LambdaQueryWrapper change_lqw = new LambdaQueryWrapper<>(); +// change_lqw.eq(TbsBudgetChange::getBudgetId,budgetVo.getId()); +// change_lqw.eq(TbsBudgetChange::getBudgetCheckState,TbsBudgetCheckState.State_1_apply); +// long count = tbsBudgetChangeMapper.selectCount(change_lqw); +// if(count>0){ +// budgetVo.setBudgetCheckState(TbsBudgetCheckState.State_1_apply); +// } +// } budgetVo.setTemplateFlag(budget.getTemplateFlag()); if(budget.getTemplateFlag().equals(1)&&budget.getTemplateIds()!=null&&budget.getTemplateIds().length>0){ diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index f35486d9..a41bc170 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/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 userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId());