From 81db2b1e533d5c63fa6509ca090b77bbb5f34622 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 20 Oct 2023 12:00:22 +0800 Subject: [PATCH 1/8] =?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()); From 9c66ddc3ce35a35eb69c50e5f6d68caf8d9b8137 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 23 Oct 2023 10:29:14 +0800 Subject: [PATCH 2/8] =?UTF-8?q?0=E5=85=83=E6=A0=B8=E9=94=80=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9Bbir=5Fact=E8=84=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BirActivityCenterGoodsServiceImpl.java | 3 ++ .../impl/VtbVerificationServiceImpl.java | 36 +++++++++++++------ .../bir/BirActivityCenterGoodsMapper.xml | 26 +++++--------- .../mapper/bms/BmsChannelPointMapper.xml | 3 +- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index 5b93391d..e340919b 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -88,6 +88,9 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl activityIds = activityCenterGoodsAllList.stream().filter(a->a.getId()!=null) .map(TbsActivityCenterGoods::getActivityId).collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 31669cfd..c0cad725 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -957,8 +957,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectBoList = verificationBo.getSubjectList(); int countCode = 1; for (VtbVerificationSubjectBo subjectBo : subjectBoList) { + boolean isCheckZero = subjectBo.getAmount().compareTo(BigDecimal.ZERO)==0; //忽略金额为0的数据 - if (subjectBo.getAmount() == null || subjectBo.getAmount().compareTo(BigDecimal.ZERO) < 1) { + if (subjectBo.getAmount() != null && subjectBo.getAmount().compareTo(BigDecimal.ZERO) < 1) { continue; } BmsSubject subject = subjectService.getById(subjectBo.getSubjectId()); @@ -970,17 +971,21 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectFundFlowItems = funFlowListMap.get(subject.getId()); - BigDecimal totalSubjectUsedAmount = BigDecimal.ZERO; - if (CollectionUtil.isNotEmpty(subjectFundFlowItems)) { - for (VtbFundFlow subjectFundFlowItem : subjectFundFlowItems) { - totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectFundFlowItem.getUsedAmount()); + //兼容支持非0元核销 + if(!isCheckZero){ + List subjectFundFlowItems = funFlowListMap.get(subject.getId()); + BigDecimal totalSubjectUsedAmount = BigDecimal.ZERO; + if (CollectionUtil.isNotEmpty(subjectFundFlowItems)) { + for (VtbFundFlow subjectFundFlowItem : subjectFundFlowItems) { + totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectFundFlowItem.getUsedAmount()); + } + } + totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectBo.getAmount()); + if (totalSubjectUsedAmount.compareTo(currentActivitySubject.getAmount()) > 0) { + Assert.throwEx("费用类型[" + subject.getSubjectName() + "]超额"); } } - totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectBo.getAmount()); - if (totalSubjectUsedAmount.compareTo(currentActivitySubject.getAmount()) > 0) { - Assert.throwEx("费用类型[" + subject.getSubjectName() + "]超额"); - } + //保存费用结果 VtbVerificationSubject verificationSubject = new VtbVerificationSubject(); verificationSubject.setVerificationSubCode(verificationCode+"_"+countCode); @@ -1013,6 +1018,17 @@ public class VtbVerificationServiceImpl extends ServiceImpl @@ -351,6 +351,7 @@ and `bms_channel_point`.`id` = #{query.id} and `bms_channel_point`.`channel_id` = #{query.channelId} and `bms_channel_point`.`channel_name` like concat('%',#{query.channelName},'%') + and `bms_channel_point`.`channel_code` like concat('%',#{query.channelCode},'%') and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') and `bms_channel_point`.`shop_area` = #{query.shopArea} From 631a0f9d8776ddd481e607745978b1c358e27a45 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 23 Oct 2023 17:44:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E8=87=AA=E5=8A=A8=E4=BF=AE=E5=A4=8D=EF=BC=9B?= =?UTF-8?q?SPU=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/GoodsSpuController.java | 164 ++++++++++++++++-- .../goods/entity/bo/GoodsSpuImportBo.java | 41 +++++ .../serve/modules/sys/entity/SysSyncLog.java | 2 + .../serve/modules/third/PortalController.java | 13 ++ .../vtb/service/VtbVerificationService.java | 5 + .../impl/VtbVerificationServiceImpl.java | 27 ++- 6 files changed, 241 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 2f3c4c17..fd96ae56 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -10,10 +10,7 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; import com.qs.serve.modules.goods.common.GoodsConst; import com.qs.serve.modules.goods.entity.*; -import com.qs.serve.modules.goods.entity.bo.GoodsSpuBatchTasteBo; -import com.qs.serve.modules.goods.entity.bo.GoodsSpuBo; -import com.qs.serve.modules.goods.entity.bo.GoodsSpuEditBo; -import com.qs.serve.modules.goods.entity.bo.GoodsSpuTasteBo; +import com.qs.serve.modules.goods.entity.bo.*; import com.qs.serve.modules.goods.entity.dto.InventoryCusPrice; import com.qs.serve.modules.goods.entity.so.InventoryCusPriceQuery; import com.qs.serve.modules.goods.entity.vo.GoodsSpuVo; @@ -96,12 +93,14 @@ public class GoodsSpuController { try { String supplierCode = param.getSupplierCode(); List skuCodes = toSkuKeys.stream().map(OmsSpuToSkuKey::getInvCode).collect(Collectors.toList()); - InventoryCusPriceQuery query = new InventoryCusPriceQuery(); - query.setCusCode(supplierCode); - query.setInvCodes(skuCodes); - R res = seeYonRequestBaseService.postBase(TbsSeeYonConst.ERP_CUS_INV_PRICE,query,"查询客户特殊价"); - if(res.getStatus().equals(200)){ - inventoryCusPrices = JsonUtil.jsonToList(res.getData(), InventoryCusPrice.class); + if(skuCodes.size()>0){ + InventoryCusPriceQuery query = new InventoryCusPriceQuery(); + query.setCusCode(supplierCode); + query.setInvCodes(skuCodes); + R res = seeYonRequestBaseService.postBase(TbsSeeYonConst.ERP_CUS_INV_PRICE,query,"查询客户特殊价"); + if(res.getStatus().equals(200)){ + inventoryCusPrices = JsonUtil.jsonToList(res.getData(), InventoryCusPrice.class); + } } } catch (Exception e) { log.error("客户特殊价异常：{}",e.getMessage()); @@ -279,6 +278,151 @@ public class GoodsSpuController { return R.ok(goodsSpuService.editTasteSpu(param)); } + /** + * 导入 + * @param param + * @return + */ + @PostMapping("/importSpu") + @SysLog(module = SystemModule.GOODS, title = "import", biz = BizType.INSERT) + public R importSpu(@RequestBody @Valid GoodsSpuImportBo param){ + final String UPDATE = "update"; + final String DELETE = "delete"; + final String SAVE = "save"; + + //导入 + List spuCodes = new ArrayList<>(); + List cateNames = new ArrayList<>(); + for (GoodsSpuImportBo.SpuItem item : param.getSpuList()) { + spuCodes.add(item.getSpuCode()); + //删除只需要spu编码 + if(StringUtils.hasText(item.getCategoryName())&&!item.getOpt().equals(DELETE)){ + cateNames.add(item.getCategoryName()); + } + } + if(spuCodes.size()<1){ + return R.error("获取SKU编码失败"); + } + LambdaQueryWrapper spuLqw = new LambdaQueryWrapper<>(); + spuLqw.in(GoodsSpu::getSpuCode,spuCodes); + List spuList = goodsSpuService.list(spuLqw); + + List cateList = null; + if(cateNames.size()>0){ + LambdaQueryWrapper cateLqw = new LambdaQueryWrapper<>(); + cateLqw.in(GoodsCategory::getName,cateNames); + cateLqw.eq(GoodsCategory::getLevel,3); + cateList = goodsCategoryService.list(cateLqw); + } + + boolean isError = false; + for (GoodsSpuImportBo.SpuItem item : param.getSpuList()) { + spuCodes.add(item.getSpuCode()); + //更新或者保存，需要校验类目名称 + if(StringUtils.hasText(item.getCategoryName())&&!item.getOpt().equals(DELETE)){ + if(cateList==null){ + isError = true; + item.setErrMsg("["+item.getCategoryName()+"]类目不存在"); + }else { + String cateName = item.getCategoryName(); + boolean existCate = cateList.stream().anyMatch(a->a.getName().equals(cateName)); + if(!existCate){ + isError = true; + item.setErrMsg("["+item.getCategoryName()+"]类目不存在"); + } + } + } + + + String spuCode = item.getSpuCode(); + boolean existSpu = spuList.stream().anyMatch(a->a.getSpuCode().equals(spuCode)); + + if(existSpu&&item.getOpt().equals(SAVE)){ + isError = true; + item.setErrMsg("SKU编码已存在"); + }else if(!existSpu && item.getOpt().equals(UPDATE)){ + isError = true; + item.setErrMsg("SKU编码不存在"); + } + + } + + if(isError){ + return R.error("数据异常",param); + } + + List rmIds = new ArrayList<>(); + List spuUpdateList = new ArrayList<>(); + List spuSaveList = new ArrayList<>(); + + for (GoodsSpuImportBo.SpuItem spuItem : param.getSpuList()) { + + if(spuItem.getOpt().equals(SAVE)){ + GoodsSpu goodsSpu = new GoodsSpu(); + goodsSpu.setSpuCode(spuItem.getSpuCode()); + goodsSpu.setName(spuItem.getName()); + //修改类目 + this.toSetSpuCate(cateList, spuItem, goodsSpu); + goodsSpu.setShelf(1); + goodsSpu.setCostFlag(1); + spuSaveList.add(goodsSpu); + continue; + } + + for (GoodsSpu spu : spuList) { + if(spu.getSpuCode().equals(spuItem.getSpuCode())){ + //删除 + if(spuItem.getOpt().equals(DELETE)){ + rmIds.add(spu.getId()); + continue; + } + //更新start + if(StringUtils.hasText(spuItem.getName())){ + spu.setName(spuItem.getName()); + } + //修改类目 + this.toSetSpuCate(cateList, spuItem, spu); + //关联 + if(spuItem.getOpt().equals(UPDATE)){ + spuUpdateList.add(spu); + } + } + } + } + if(rmIds.size()>0){ + goodsSpuService.removeBatchByIds(rmIds); + } + if(spuUpdateList.size()>0){ + goodsSpuService.updateBatchById(spuUpdateList); + } + if(spuSaveList.size()>0){ + goodsSpuService.saveBatch(spuSaveList); + } + + return R.ok(); + } + + /** + * 修改类目 + * @param cateList + * @param spuItem + * @param spu + */ + private void toSetSpuCate(List cateList, GoodsSpuImportBo.SpuItem spuItem, GoodsSpu spu) { + if(cateList !=null){ + for (GoodsCategory category : cateList) { + if(category.getName().equals(spuItem.getCategoryName())){ + String[] cateIds = category.getLevelPath().split("_"); + if(cateIds.length==3){ + spu.setCategoryFirst(cateIds[0]); + spu.setCategorySecond(cateIds[1]); + spu.setCategoryThird(cateIds[2]); + spu.setCategoryLast(cateIds[2]); + } + } + } + } + } } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java new file mode 100644 index 00000000..46520a6a --- /dev/null +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java @@ -0,0 +1,41 @@ +package com.qs.serve.modules.goods.entity.bo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; +import lombok.Data; +import org.apache.ibatis.type.JdbcType; + +import java.util.List; + +/** + * 口味品类 + * @author YenHex + * @since 2022/10/10 + */ +@Data +public class GoodsSpuImportBo { + + private List spuList; + + @Data + public static class SpuItem{ + /** + * 操作方式：save,update,delete + */ + private String opt; + + /** 商品编码 */ + private String spuCode; + + /** 商品名字 */ + private String name; + + /** 分类名称 */ + private String categoryName; + + private String errMsg; + } + +} diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java b/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java index 21f93b1e..f4c22cdd 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java @@ -58,6 +58,8 @@ public class SysSyncLog implements Serializable { /** 是否需要处理 */ private Integer todoState; + private Integer tryTimes; + /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; diff --git a/src/main/java/com/qs/serve/modules/third/PortalController.java b/src/main/java/com/qs/serve/modules/third/PortalController.java index e18705ef..31d2481a 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalController.java @@ -13,6 +13,7 @@ import com.qs.serve.modules.seeyon.service.XiaoLuTonService; import com.qs.serve.modules.sys.service.SysUserLoginService; import com.qs.serve.modules.third.entity.AptPolicyPayment; import com.qs.serve.modules.third.entity.param.SSOLoginParam; +import com.qs.serve.modules.vtb.service.VtbVerificationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -35,6 +36,7 @@ import java.util.Map; public class PortalController { private SysUserLoginService sysUserLoginService; + private VtbVerificationService vtbVerificationService; /** * 单点登录 @@ -76,4 +78,15 @@ public class PortalController { } + /** + * 同步错误的支付 + * @apiNote headers+ => tenant-id = 001 \n headers+ => v-token = MD5.encrypt('jslApi-'+yyyy-MM-dd) + * @return + */ + @RequestMapping("/syncErrorPay") + public R sync(){ + vtbVerificationService.toPayRequest(); + return R.ok("sync_success"); + } + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java index 0a49931e..5d013ab8 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java @@ -84,5 +84,10 @@ public interface VtbVerificationService extends IService { */ boolean checkCommitting(Long activityId); + /** + * 支付请求 + */ + void toPayRequest(); + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index c0cad725..81532785 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -917,7 +917,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl0; } + + @Override + public void toPayRequest() { + String COST_TO_PAY_API = projectApisProperties.getCostToPay(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SysSyncLog::getFrom,"to支付请求") + .eq(SysSyncLog::getSuccessStatus,0) + .eq(SysSyncLog::getTodoState,1) + //重试两次 + .lt(SysSyncLog::getTryTimes,3); + List sysSyncLogs = sysSyncLogService.list(lqw); + for (SysSyncLog syncLog : sysSyncLogs) { + SysSyncLog syncLogBack = ThirtyVerificationUtil.requestToPayment("to支付请求",syncLog.getRemark(), COST_TO_PAY_API, syncLog.getRequestJson()); + if(syncLogBack.getSuccessStatus().equals(1)){ + syncLog.setSuccessStatus(1); + sysSyncLogService.updateById(syncLog); + }else { + syncLog.setFailReason(syncLogBack.getFailReason()+""); + syncLog.setTryTimes(syncLog.getTryTimes()+1); + syncLog.setUpdateTime(null); + sysSyncLogService.updateById(syncLog); + } + } + } + } From 815472a86984810ae2f246dd672d23074f0600d5 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 24 Oct 2023 16:12:53 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A6=BB=E8=81=8C?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BA=A4=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/bms/entity/BmsSupplier.java | 3 + .../modules/bms/mapper/BmsSupplierMapper.java | 16 ++++ .../impl/BmsSupplierApplicationService.java | 64 +++++++++++++++- .../sys/controller/SysUserController.java | 2 +- .../serve/modules/sys/entity/SysSyncLog.java | 22 +----- .../modules/sys/service/SysUserService.java | 5 +- .../sys/service/impl/SysUserServiceImpl.java | 76 ++++++++++++++++--- .../modules/third/PortalOfCostController.java | 2 +- .../service/PortalOfCostApplication.java | 2 +- .../third/util/ThirtyVerificationUtil.java | 2 +- .../impl/VtbVerificationServiceImpl.java | 2 +- .../task/controller/TaskUserController.java | 14 +--- .../bir/BirActivityCenterGoodsMapper.xml | 9 ++- 13 files changed, 161 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index f49fbc89..7a19f518 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -346,6 +346,9 @@ public class BmsSupplier implements Serializable { private List searchInIds; /*-------------- ----------------- */ + @TableField(exist = false) + private String otherUserIdsString; + public List listBizRegionIds(){ List list = new ArrayList<>(); list.add(this.getRegion2First()); diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java index bfd5c741..de38d787 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java @@ -18,6 +18,22 @@ public interface BmsSupplierMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") List selectSupplierList(@Param("query") BmsSupplier bmsSupplier); + /** + * + * @param query + * @return + */ + @InterceptorIgnore(tenantLine = "1") + @Update("update bms_supplier" + + " set user_id = #{query.userId}" + + ",user_code = #{query.userCode}" + + ",user_name = #{query.userName}" + + ",other_user_ids = #{query.otherUserIdsString}" + + ",other_user_names = #{query.otherUserNames}" + + ",other_user_codes = #{query.otherUserCodes}" + + " where id = #{query.id}") + int updateRelateUserInfo(@Param("query") BmsSupplier query); + @InterceptorIgnore(tenantLine = "1") @Update("update bms_supplier set user_id = null,user_code = null, user_name = null where id = #{supplierId}") int removeRelateUserInfo(@Param("supplierId") Long supplierId); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java index e7205b2f..69d16d0b 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java @@ -10,6 +10,8 @@ import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper; import com.qs.serve.modules.bms.mapper.BmsRegionMapper; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.mapper.SysUserMapper; import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.common.TbsGoodsType; import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; @@ -26,10 +28,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -50,6 +49,63 @@ public class BmsSupplierApplicationService { // private TbsActivityMapper activityMapper; private BmsSupplierMapper bmsSupplierMapper; + /** + * 移除用户所有的客户权限 + * @param leaveUser 离职用户 + * @param enterUser 入职用户(可空) + */ + public void removeUserOfSupplierList(final SysUser leaveUser,SysUser enterUser){ + String leaveUserId = leaveUser.getId(); + BmsSupplier query = new BmsSupplier(); + query.setCurrUserId(leaveUser.getId()); + query.setDelFlag(false); + List supplierList = bmsSupplierMapper.selectSupplierList(query); + String enterUserId = ""; + String enterUserCode = ""; + String enterUserName = ""; + if(enterUser!=null){ + enterUserId = enterUser.getId(); + enterUserCode = enterUser.getCode(); + enterUserName = enterUser.getName(); + } + + for (BmsSupplier supplier : supplierList) { + //主要负责人 + if(leaveUserId.equals(supplier.getUserId())){ + supplier.setUserId(enterUserId); + if(enterUser==null){ + supplier.setUserName(""); + supplier.setUserCode(""); + }else { + supplier.setUserName(enterUser.getName()); + supplier.setUserCode(enterUser.getCode()); + } + } + //其它负责人 + List otherUserIdList = new ArrayList<>(); + for (String otherUserId : supplier.getOtherUserIds()) { + if(otherUserId.equals(leaveUserId)){ + if(enterUserId==null){ + continue; + }else { + otherUserIdList.add(enterUserId); + continue; + } + } + otherUserIdList.add(otherUserId); + } + if(otherUserIdList.size()>0){ + String userIds = otherUserIdList.stream().distinct().collect(Collectors.joining(",")); + supplier.setOtherUserIdsString(userIds); + String otherName = supplier.getOtherUserNames().replace(leaveUser.getName(),enterUserName); + String otherCode = supplier.getOtherUserCodes().replace(leaveUser.getCode(),enterUserCode); + supplier.setOtherUserNames(otherName); + supplier.setOtherUserCodes(otherCode); + bmsSupplierMapper.updateRelateUserInfo(supplier); + } + } + } + // /** // * 客户更新区域时，预算政策统计 // * @param supplierId diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index f691d86c..c586d91e 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -623,7 +623,7 @@ public class SysUserController { @SysLog(title = "人员",desc = "离职调整",biz = BizType.LEAVE) @PostMapping("/leaveNow") public R leaveNow(String userId){ - sysUserService.leaveNow(userId); + sysUserService.leaveNow(Arrays.asList(userId),true); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java b/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java index f4c22cdd..b235443b 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysSyncLog.java @@ -34,7 +34,7 @@ public class SysSyncLog implements Serializable { /** 来自系统 */ @Length(max = 255,message = "来自系统长度不能超过255字") @TableField(value = "form_plat") - private String from; + private String fromPlat; /** 请求地址 */ @Length(max = 255,message = "请求地址长度不能超过255字") @@ -94,25 +94,5 @@ public class SysSyncLog implements Serializable { @JsonProperty private Boolean delFlag; - - public static SysSyncLog toNewObject(SysSyncLog source){ - SysSyncLog syncLog = new SysSyncLog(); - syncLog.setId(source.getId()); - syncLog.setFrom(source.getFrom()); - syncLog.setUrl(source.getUrl()); - syncLog.setEntityClass(source.getEntityClass()); - syncLog.setRequestJson(source.getRequestJson()); - syncLog.setFailReason(source.getFailReason()); - syncLog.setSuccessStatus(source.getSuccessStatus()); - syncLog.setRemark(source.getRemark()); - syncLog.setCreateTime(source.getCreateTime()); - syncLog.setCreateBy(source.getCreateBy()); - syncLog.setUpdateTime(source.getUpdateTime()); - syncLog.setUpdateBy(source.getUpdateBy()); - syncLog.setTenantId(source.getTenantId()); - syncLog.setDelFlag(source.getDelFlag()); - return syncLog; - } - } diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java index f59d7b0c..f9285704 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java +++ b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java @@ -57,9 +57,10 @@ public interface SysUserService extends IService { /** * 立刻离职执行函数 - * @param userId + * @param userIds + * @param updateLeaveStatus */ - void leaveNow(String userId); + void leaveNow(List userIds,Boolean updateLeaveStatus); /** * 取消离职 diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index f3a90d9f..cddf6ac7 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -11,6 +11,8 @@ import com.qs.serve.common.model.enums.HttpCode; import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.BmsRegionUser; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; +import com.qs.serve.modules.bms.service.impl.BmsSupplierApplicationService; +import com.qs.serve.modules.his.service.HisUserSupplierService; import com.qs.serve.modules.sys.entity.*; import com.qs.serve.modules.sys.entity.bo.SysUserLeaveBo; import com.qs.serve.modules.sys.entity.dto.SysUpdateSeeYonPassword; @@ -41,15 +43,14 @@ public class SysUserServiceImpl extends ServiceImpl impl private final SysPostUserService sysPostUserService; private final SysUserRoleService sysUserRoleService; private final SysUserLeaveService sysUserLeaveService; - private final SysRoleMenuMapper sysRoleMenuMapper; private final SysPermitService sysPermitService; private final SysRoleService sysRoleService; private final SysDeptMapper sysDeptMapper; private final SysMenuMapper sysMenuMapper; private final SysPostMapper postMapper; - private final SysPostUserMapper postUserMapper; private final BmsSupplierMapper supplierMapper; - private SeeYonProperties seeYonProperties; + private final BmsSupplierApplicationService supplierApplicationService; + private final SeeYonProperties seeYonProperties; @Override public void updateSeeYonPassword(String syUserId, String password) { @@ -272,17 +273,68 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public void leaveNow(String userId) { - SysUser user = new SysUser(); - user.setId(userId); - user.setServingState(0); - user.setLoginEnable(0); - user.setServingLeaveDate(LocalDate.now()); - this.updateById(user); - supplierMapper.updateBmsSuppliersOtherUserNullById(Arrays.asList(userId)); - supplierMapper.updateBmsSuppliersUserNullById(Arrays.asList(userId)); + public void leaveNow(List userIds,Boolean updateLeaveStatus) { + if(userIds==null||userIds.size()<1){ + return; + } + //人员业务继承-start + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(SysUserLeave::getUserId,userIds); + lqw.eq(SysUserLeave::getLeaveStatus,0); + List sysUserLeaves = sysUserLeaveService.list(lqw); + + for (String userId : userIds) { + SysUser leaveUser = super.baseMapper.selectById(userId); + boolean match = false; + for (SysUserLeave userLeave : sysUserLeaves) { + if(userId.equals(userLeave.getUserId())){ + match = true; + //客户交接人 + String cusUserId = userLeave.getCusUserId(); + if(StringUtils.hasText(cusUserId)){ + SysUser cusUser = super.baseMapper.selectById(userId); + supplierApplicationService.removeUserOfSupplierList(leaveUser,cusUser); + } + //角色交接人 + String roleUserId = userLeave.getRoleUserId(); + //工作交接人 + String flowUserId = userLeave.getFlowUserId(); + } + } + //不匹配也要移除客户权限和角色 + if(!match){ + supplierApplicationService.removeUserOfSupplierList(leaveUser,null); + } + } + + + + + + //更新离职记录标为完成 + if(updateLeaveStatus&&sysUserLeaves.size()>0){ + for (SysUserLeave userLeaf : sysUserLeaves) { + userLeaf.setLeaveStatus(1); + } + sysUserLeaveService.updateBatchById(sysUserLeaves); + } + + //离职人员信息更新 + LambdaQueryWrapper updLqw = new LambdaQueryWrapper<>(); + updLqw.in(SysUser::getId,userIds); + SysUser sysUser = new SysUser(); + sysUser.setServingState(0); + sysUser.setLoginEnable(0); + sysUser.setServingLeaveDate(LocalDate.now()); + super.update(sysUser,updLqw); + HisUserSupplierService hisUserSupplierService = SpringUtils.getBean(HisUserSupplierService.class); + hisUserSupplierService.cleanTable(); + } + + + @Override public void cancelLeave(String userId) { SysUser sysUser = this.getById(userId); diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index cc90626b..78caf4ac 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -46,7 +46,7 @@ public class PortalOfCostController { @PostMapping("createByCostApply") public R createCostProcess(@Valid @RequestBody ProcessCreateCostApplyBo createBo,HttpServletRequest request){ SysSyncLog syncLog = new SysSyncLog(); - syncLog.setFrom("一站式费用"); + syncLog.setFromPlat("一站式费用"); syncLog.setUrl(request.getRequestURI()); syncLog.setRequestJson(JsonUtil.objectToJson(createBo)); syncLog.setEntityClass(ProcessCreateCostApplyBo.class.getName()); diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index 89c388c4..adb5008e 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -858,7 +858,7 @@ public class PortalOfCostApplication { String rs = HttpUtil.doPost(COST_TO_PAY_API, json, null); SysSyncLog syncLog = new SysSyncLog(); - syncLog.setFrom("to支付请求"); + syncLog.setFromPlat("to支付请求"); syncLog.setUrl(COST_TO_PAY_API); syncLog.setRequestJson(json); if(rs==null||!rs.contains("200")){ diff --git a/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java b/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java index 0a16faf6..ab0cfe3a 100644 --- a/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java +++ b/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java @@ -105,7 +105,7 @@ public class ThirtyVerificationUtil { rs = e.getMessage(); } SysSyncLog syncLog = new SysSyncLog(); - syncLog.setFrom(title); + syncLog.setFromPlat(title); syncLog.setUrl(api); syncLog.setRequestJson(json); if(rs==null||!rs.contains("200")){ diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 81532785..ba234c4c 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -1268,7 +1268,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); - lqw.eq(SysSyncLog::getFrom,"to支付请求") + lqw.eq(SysSyncLog::getFromPlat,"to支付请求") .eq(SysSyncLog::getSuccessStatus,0) .eq(SysSyncLog::getTodoState,1) //重试两次 diff --git a/src/main/java/com/qs/serve/task/controller/TaskUserController.java b/src/main/java/com/qs/serve/task/controller/TaskUserController.java index a1281ccf..92c76eaa 100644 --- a/src/main/java/com/qs/serve/task/controller/TaskUserController.java +++ b/src/main/java/com/qs/serve/task/controller/TaskUserController.java @@ -16,6 +16,7 @@ import com.qs.serve.modules.wx.service.WxUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -45,7 +46,7 @@ public class TaskUserController { private final BmsSupplierMapper supplierMapper; private final HisUserSupplierService hisUserSupplierService; - + @Transactional public R doLeave(){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.select(SysUserLeave::getUserId,SysUserLeave::getId); @@ -60,16 +61,7 @@ public class TaskUserController { } sysUserLeaveService.updateBatchById(sysUserLeaves); List userIds = sysUserLeaves.stream().map(a->a.getUserId()).collect(Collectors.toList()); - LambdaQueryWrapper updLqw = new LambdaQueryWrapper<>(); - updLqw.in(SysUser::getId,userIds); - SysUser sysUser = new SysUser(); - sysUser.setServingState(0); - sysUser.setLoginEnable(0); - sysUser.setServingLeaveDate(LocalDate.now()); - sysUserService.update(sysUser,updLqw); - supplierMapper.updateBmsSuppliersOtherUserNullById(userIds); - supplierMapper.updateBmsSuppliersUserNullById(userIds); - hisUserSupplierService.cleanTable(); + sysUserService.leaveNow(userIds,false); return R.ok(); } diff --git a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml index d43d7365..00869169 100644 --- a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml +++ b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml @@ -141,9 +141,12 @@ left join tbs_activity ON bir_activity_center_goods.activity_id = tbs_activity.id left join `tbs_cost_apply` on `bir_activity_center_goods`.cost_apply_id = `tbs_cost_apply`.id where - tbs_cost_apply.del_flag = 1 or tbs_cost_apply.id is null - and tbs_activity.id is null or tbs_activity.del_flag = 1 - + tbs_cost_apply.del_flag = 1 + or tbs_cost_apply.id is null + or tbs_cost_apply.cancel_flag = 1 + or tbs_activity.cancel_flag = 1 + or tbs_activity.id is null + or tbs_activity.del_flag = 1 + SELECT FROM `biz_user_group_item` `biz_user_group_item` + + and `biz_user_group_item`.`id` = #{query.id} + and `biz_user_group_item`.`group_id` = #{query.groupId} + and `biz_user_group_item`.`target_type` = #{query.targetType} + and `biz_user_group_item`.`target_id` = #{query.targetId} + and `biz_user_group_item`.`target_name` = #{query.targetName} + and `biz_user_group_item`.`target_code` = #{query.targetCode} + and `biz_user_group_item`.`remark` = #{query.remark} + and `biz_user_group_item`.`create_time` = #{query.createTime} + and `biz_user_group_item`.`create_by` = #{query.createBy} + and `biz_user_group_item`.`update_time` = #{query.updateTime} + and `biz_user_group_item`.`update_by` = #{query.updateBy} + and `biz_user_group_item`.`del_flag` = #{query.delFlag} + and `biz_user_group_item`.`tenant_id` = #{query.tenantId} + + + + From 92559012ef4b63b129425faa41f61f0d6d8789a1 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 25 Oct 2023 15:02:22 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizUserGroupController.java | 46 +--------- .../BizUserGroupItemController.java | 16 +++- .../biz/entity/bo/BizUserGroupBatchBo.java | 2 + .../entity/bo/BizUserGroupItemBatchBo.java | 18 ++++ .../impl/BizUserGroupApplicationService.java | 92 +++++++++++++++++++ 5 files changed, 128 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupItemBatchBo.java create mode 100644 src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java index 83b3505a..0cba5678 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java @@ -14,6 +14,7 @@ import com.qs.serve.modules.biz.consts.GroupDataType; import com.qs.serve.modules.biz.entity.BizUserGroupItem; import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo; import com.qs.serve.modules.biz.service.BizUserGroupItemService; +import com.qs.serve.modules.biz.service.impl.BizUserGroupApplicationService; import com.qs.serve.modules.sys.entity.SysDept; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysDeptService; @@ -41,10 +42,10 @@ import java.util.List; @RequestMapping("biz/dataGroup") public class BizUserGroupController { + private final BizUserGroupApplicationService bizUserGroupApplicationService; private BizUserGroupService bizUserGroupService; private BizUserGroupItemService bizUserGroupItemService; private SysUserService sysUserService; - private SysDeptService sysDeptService; /** * 列表 @@ -129,47 +130,8 @@ public class BizUserGroupController { */ @PostMapping("/editWithItem") public R editWithItem(@RequestBody @Valid BizUserGroupBatchBo param){ - SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); - BizUserGroup bizUserGroup = new BizUserGroup(); - if(param.getId()!=null){ - bizUserGroup = bizUserGroupService.getById(param.getId()); - if(!bizUserGroup.getUserId().equals(AuthContextUtils.getSysUserId())){ - return R.error("无相关数据"); - } - } - bizUserGroup.setGroupName(param.getGroupName()); - bizUserGroup.setUserId(sysUser.getId()); - bizUserGroup.setUserCode(sysUser.getCode()); - bizUserGroup.setUserName(sysUser.getName()); - bizUserGroup.setScene(param.getScene()); - bizUserGroup.setRemark(param.getRemark()); - bizUserGroupService.saveOrUpdate(bizUserGroup); - Long groupId = bizUserGroup.getId(); - //移除历史ITEM - LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>(); - itemLqw.eq(BizUserGroupItem::getGroupId,groupId); - bizUserGroupItemService.remove(itemLqw); - //保存item - List groupItemList = new ArrayList<>(); - for (BizUserGroupBatchBo.Item item : param.getItems()) { - BizUserGroupItem groupItem = new BizUserGroupItem(); - groupItem.setGroupId(groupId); - groupItem.setTargetType(item.getTargetType()); - groupItem.setTargetId(item.getTargetId()); - if(item.getTargetType().equals(GroupDataType.USER)){ - SysUser user = sysUserService.getById(item.getTargetId()); - groupItem.setTargetName(user.getName()); - groupItem.setTargetCode(user.getCode()); - }else if (item.getTargetType().equals(GroupDataType.DEPT)){ - SysDept dept = sysDeptService.getById(item.getTargetId()); - groupItem.setTargetName(dept.getName()); - groupItem.setTargetCode(dept.getCode()); - }else { - continue; - } - groupItemList.add(groupItem); - } - bizUserGroupItemService.saveBatch(groupItemList); + param.setEditGroupFlag(1); + bizUserGroupApplicationService.editWithItem(param); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java index e4edfebd..6435c9cb 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java @@ -9,6 +9,9 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo; +import com.qs.serve.modules.biz.entity.bo.BizUserGroupItemBatchBo; +import com.qs.serve.modules.biz.service.impl.BizUserGroupApplicationService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,7 +34,8 @@ import java.util.List; @RequestMapping("biz/dataItem") public class BizUserGroupItemController { - private BizUserGroupItemService bizUserGroupItemService; + private final BizUserGroupItemService bizUserGroupItemService; + private final BizUserGroupApplicationService bizUserGroupApplicationService; /** * 列表 @@ -65,9 +69,13 @@ public class BizUserGroupItemController { * @return */ @PostMapping("/save") - public R save(@RequestBody @Valid BizUserGroupItem param){ - boolean result = bizUserGroupItemService.save(param); - return R.isTrue(result); + public R save(@RequestBody @Valid BizUserGroupItemBatchBo param){ + BizUserGroupBatchBo groupBatchBo = new BizUserGroupBatchBo(); + groupBatchBo.setEditGroupFlag(0); + groupBatchBo.setId(param.getGroupId()); + groupBatchBo.setItems(param.getItems()); + bizUserGroupApplicationService.editWithItem(groupBatchBo); + return R.ok(); } /** diff --git a/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupBatchBo.java b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupBatchBo.java index a68aa2d7..ee0ad1ca 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupBatchBo.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupBatchBo.java @@ -27,6 +27,8 @@ public class BizUserGroupBatchBo { private List items; + private Integer editGroupFlag; + @Data public static class Item{ diff --git a/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupItemBatchBo.java b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupItemBatchBo.java new file mode 100644 index 00000000..f000d782 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/biz/entity/bo/BizUserGroupItemBatchBo.java @@ -0,0 +1,18 @@ +package com.qs.serve.modules.biz.entity.bo; + +import lombok.Data; + +import java.util.List; + +/** + * @author YenHex + * @since 2023/10/25 + */ +@Data +public class BizUserGroupItemBatchBo { + + private Long groupId; + + private List items; + +} diff --git a/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java b/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java new file mode 100644 index 00000000..de7f8983 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java @@ -0,0 +1,92 @@ +package com.qs.serve.modules.biz.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.util.Assert; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.modules.biz.consts.GroupDataType; +import com.qs.serve.modules.biz.entity.BizUserGroup; +import com.qs.serve.modules.biz.entity.BizUserGroupItem; +import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo; +import com.qs.serve.modules.biz.service.BizUserGroupItemService; +import com.qs.serve.modules.biz.service.BizUserGroupService; +import com.qs.serve.modules.sys.entity.SysDept; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysDeptService; +import com.qs.serve.modules.sys.service.SysUserService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; + +/** + * @author YenHex + * @since 2023/10/25 + */ +@Service +@AllArgsConstructor +public class BizUserGroupApplicationService { + + private BizUserGroupService bizUserGroupService; + private BizUserGroupItemService bizUserGroupItemService; + private SysUserService sysUserService; + private SysDeptService sysDeptService; + + + /** + * 编辑 （场景：同时编辑分组数据） + * @param param + * @return*/ + @Transactional(rollbackFor = Exception.class) + public void editWithItem(BizUserGroupBatchBo param){ + SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); + BizUserGroup bizUserGroup = new BizUserGroup(); + if(param.getId()!=null){ + bizUserGroup = bizUserGroupService.getById(param.getId()); + if(!bizUserGroup.getUserId().equals(AuthContextUtils.getSysUserId())){ + Assert.throwEx("无相关数据"); + } + } + if(param.getEditGroupFlag().equals(1)){ + bizUserGroup.setGroupName(param.getGroupName()); + bizUserGroup.setUserId(sysUser.getId()); + bizUserGroup.setUserCode(sysUser.getCode()); + bizUserGroup.setUserName(sysUser.getName()); + bizUserGroup.setScene(param.getScene()); + bizUserGroup.setRemark(param.getRemark()); + bizUserGroupService.saveOrUpdate(bizUserGroup); + } + Long groupId = bizUserGroup.getId(); + //移除历史ITEM + LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>(); + itemLqw.eq(BizUserGroupItem::getGroupId,groupId); + bizUserGroupItemService.remove(itemLqw); + //保存item + List groupItemList = new ArrayList<>(); + for (BizUserGroupBatchBo.Item item : param.getItems()) { + BizUserGroupItem groupItem = new BizUserGroupItem(); + groupItem.setGroupId(groupId); + groupItem.setTargetType(item.getTargetType()); + groupItem.setTargetId(item.getTargetId()); + if(item.getTargetType().equals(GroupDataType.USER)){ + SysUser user = sysUserService.getById(item.getTargetId()); + groupItem.setTargetName(user.getName()); + groupItem.setTargetCode(user.getCode()); + }else if (item.getTargetType().equals(GroupDataType.DEPT)){ + SysDept dept = sysDeptService.getById(item.getTargetId()); + groupItem.setTargetName(dept.getName()); + groupItem.setTargetCode(dept.getCode()); + }else { + continue; + } + groupItemList.add(groupItem); + } + bizUserGroupItemService.saveBatch(groupItemList); + } + +} From e229d1b50c728786da6947ed4693e7584a85f8d3 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 26 Oct 2023 09:40:36 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=99=84=E4=BB=B6=EF=BC=9B=E4=BA=BA=E5=91=98=E7=BB=84=E5=BE=AE?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizUserGroupController.java | 9 ------ .../modules/biz/entity/BizUserGroup.java | 18 ------------ .../modules/biz/entity/BizUserGroupItem.java | 19 ------------- .../impl/BizUserGroupApplicationService.java | 4 --- .../bms/controller/BmsSupplierController.java | 2 +- .../modules/data/entity/DataAffairCommit.java | 2 +- .../seeyon/entity/bo/CtpAddNodeParam.java | 3 ++ .../service/SeeYonOperationService.java | 28 +++++++++++++++++++ .../impl/TbsCostApplyPart1ServiceImpl.java | 12 ++++++++ 9 files changed, 45 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java index 0cba5678..8643cad4 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java @@ -1,34 +1,25 @@ package com.qs.serve.modules.biz.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; 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.AuthContextUtils; import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; -import com.qs.serve.modules.biz.consts.GroupDataType; import com.qs.serve.modules.biz.entity.BizUserGroupItem; import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo; import com.qs.serve.modules.biz.service.BizUserGroupItemService; import com.qs.serve.modules.biz.service.impl.BizUserGroupApplicationService; -import com.qs.serve.modules.sys.entity.SysDept; import com.qs.serve.modules.sys.entity.SysUser; -import com.qs.serve.modules.sys.service.SysDeptService; import com.qs.serve.modules.sys.service.SysUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import com.qs.serve.modules.biz.entity.BizUserGroup; import com.qs.serve.modules.biz.service.BizUserGroupService; import javax.validation.Valid; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java index 07a6234c..39589c09 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java @@ -89,23 +89,5 @@ public class BizUserGroup implements Serializable { @TableField(exist = false) List groupItemList; - public static BizUserGroup toNewObject(BizUserGroup source){ - BizUserGroup userGroup = new BizUserGroup(); - userGroup.setId(source.getId()); - userGroup.setGroupName(source.getGroupName()); - userGroup.setUserId(source.getUserId()); - userGroup.setUserCode(source.getUserCode()); - userGroup.setUserName(source.getUserName()); - userGroup.setScene(source.getScene()); - userGroup.setRemark(source.getRemark()); - userGroup.setCreateTime(source.getCreateTime()); - userGroup.setCreateBy(source.getCreateBy()); - userGroup.setUpdateTime(source.getUpdateTime()); - userGroup.setUpdateBy(source.getUpdateBy()); - userGroup.setDelFlag(source.getDelFlag()); - userGroup.setTenantId(source.getTenantId()); - return userGroup; - } - } diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java index b4078935..eed38bf6 100644 --- a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java +++ b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java @@ -84,24 +84,5 @@ public class BizUserGroupItem implements Serializable { @JsonProperty private String tenantId; - - public static BizUserGroupItem toNewObject(BizUserGroupItem source){ - BizUserGroupItem userGroupItem = new BizUserGroupItem(); - userGroupItem.setId(source.getId()); - userGroupItem.setGroupId(source.getGroupId()); - userGroupItem.setTargetType(source.getTargetType()); - userGroupItem.setTargetId(source.getTargetId()); - userGroupItem.setTargetName(source.getTargetName()); - userGroupItem.setTargetCode(source.getTargetCode()); - userGroupItem.setRemark(source.getRemark()); - userGroupItem.setCreateTime(source.getCreateTime()); - userGroupItem.setCreateBy(source.getCreateBy()); - userGroupItem.setUpdateTime(source.getUpdateTime()); - userGroupItem.setUpdateBy(source.getUpdateBy()); - userGroupItem.setDelFlag(source.getDelFlag()); - userGroupItem.setTenantId(source.getTenantId()); - return userGroupItem; - } - } diff --git a/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java b/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java index de7f8983..d7bc45bf 100644 --- a/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java +++ b/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java @@ -1,7 +1,6 @@ package com.qs.serve.modules.biz.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.modules.biz.consts.GroupDataType; @@ -17,10 +16,7 @@ import com.qs.serve.modules.sys.service.SysUserService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import javax.validation.Valid; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index f074cade..978d60d5 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -938,7 +938,7 @@ public class BmsSupplierController { LambdaQueryWrapper bmsRegion2LambdaQueryWrapper = new LambdaQueryWrapper<>(); bmsRegion2LambdaQueryWrapper.in(BmsRegion2::getPathNames,bmsBizRegionNames); bizRegionList = bmsRegion2Service.list(bmsRegion2LambdaQueryWrapper); - List exsitBizRegeionName = bizRegionList.stream().map(a->a.getName()).collect(Collectors.toList()); + List exsitBizRegeionName = bizRegionList.stream().map(BmsRegion2::getPathNames).collect(Collectors.toList()); if(bizRegionList.size(){ if(a.getType().equals("4")){ diff --git a/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java b/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java index bffcf08d..4af8ccc1 100644 --- a/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java +++ b/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java @@ -48,7 +48,7 @@ public class DataAffairCommit implements Serializable { /** 释放费用 */ private Integer releaseFlag; - /** 状态：0-否定，1-同意，2-退回 */ + /** 状态：0-否定，1-同意，2-退回,3->加签 */ private Integer state; /** 用户id */ diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java index 13cda24f..9923fdf6 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java @@ -31,4 +31,7 @@ public class CtpAddNodeParam { */ String comment; + /** 附件id */ + private String[] attachIds; + } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 68048776..a75d3025 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -96,6 +96,19 @@ public interface SeeYonOperationService extends SeeYonBaseService{ */ default R addNode(CtpAddNodeParam param){ getRequestService().testConnection(); + //获取当前最新的affairId + List rList = this.pageAffair(param.getTargetId()).getData(); + String affairId = null; + if(rList.size()>0){ + CtpAffair affair = rList.get(0).getAffairInfo(); + if(affair!=null){ + affairId = affair.getAffairId(); + } + } + if(affairId==null&¶m.getAttachIds()!=null&¶m.getAttachIds().length>0){ + return R.error("附件上传失败(如果急需提交请移除附件)"); + } + CtpAddNodeDTO addNodeDTO = new CtpAddNodeDTO(); addNodeDTO.setBackToMe(param.getBackToMe()); addNodeDTO.setTargetId(param.getTargetId()); @@ -121,6 +134,21 @@ public interface SeeYonOperationService extends SeeYonBaseService{ addNodeDTO.setComment(param.getComment()); R result = getRequestService().addNode(addNodeDTO); if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){ + DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class); + DataAffairCommit dataAffairCommit = new DataAffairCommit(); + dataAffairCommit.setTargetCode(getTemplateCode()); + dataAffairCommit.setTargetId(param.getTargetId()); + + dataAffairCommit.setId(affairId); + dataAffairCommit.setCommentVal("加签:"+param.getComment()); + dataAffairCommit.setReleaseFlag(0); + dataAffairCommit.setState(3); + dataAffairCommit.setUserId(sysUser.getId()); + dataAffairCommit.setUserCode(sysUser.getCode()); + dataAffairCommit.setUserName(sysUser.getName()); + dataAffairCommit.setResultData("addNode"); + dataAffairCommit.setAttachIds(param.getAttachIds()); + dataAffairCommitMapper.insert(dataAffairCommit); return R.ok(); } return R.error(result.getMsg()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index 03cc0195..df4b3582 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -71,8 +71,12 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { costApply.setChangeSourceId(null); costApply.setChangeExtendId(null); costApply.setCancelFlag(null); + costApply.setTotalActivityUsedAmount(null); + costApply.setCancelFlag(null); costApply.setEditAmountFlag(null); costApply.setChargeState(TbsCostApplyState.State_0_unPublish.getCode()); + costApply.setChangeActionTime(null); + costApply.setChangeStateRecord(null); tbsCostApplyService.save(costApply); final Long newCostApplyId = costApply.getId(); @@ -234,6 +238,14 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { orgActivity.setCreateTime(null); orgActivity.setUpdateTime(null); orgActivity.setUpdateBy(null); + orgActivity.setUsedAmount(null); + orgActivity.setReleaseAmount(null); + orgActivity.setCancelFlag(null); + orgActivity.setReopenFlag(null); + orgActivity.setFinishedFlag(null); + orgActivity.setFinishedTime(null); + orgActivity.setCostPassFlag(null); + orgActivity.setReleaseFlag(null); tbsActivityMapper.insert(orgActivity); final Long newActivityId = orgActivity.getId();