From 33d471667c5449992a891004d9165146855de882 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 15 Jun 2023 18:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BirBaseActivityServiceImpl.java | 6 ++- .../service/impl/BirRoiRateServiceImpl.java | 2 +- .../serve/modules/bms/entity/BmsSupplier.java | 37 +++++++++++++++++++ .../erp/entity/dto/ErpDispatchSumVo.java | 2 +- .../controller/TbsCostApplyController.java | 2 +- .../service/impl/TbsCostApplyServiceImpl.java | 18 +++++++++ .../tzc/controller/TzcPolicyController.java | 22 ++++++++++- .../impl/TzcPolicyApplicationServiceImpl.java | 17 +++++++++ .../impl/VtbVerificationServiceImpl.java | 23 ++++++++++-- .../mapper/erp/ErpDispatchDataMapper.xml | 2 +- 10 files changed, 121 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index 507aa701..3324291e 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java @@ -7,7 +7,9 @@ import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.DateSplitUtil; import com.qs.serve.modules.sys.mapper.SysUserMapper; import com.qs.serve.modules.tbs.entity.TbsActivity; +import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; +import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -35,6 +37,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl tbsActivityCenters = tbsActivityCenterService.listByCostApplyId(Long.parseLong(id)); List tbsActivitySubjects = tbsActivitySubjectService.listByCostApplyId(Long.parseLong(id)); diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index b0b4538c..5befdd1b 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -16,6 +16,7 @@ import com.qs.serve.modules.seeyon.entity.CtpAffairQo; import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; @@ -64,6 +65,7 @@ public class TzcPolicyController { private TbsBudgetLogService tbsBudgetLogService; private SysUserService sysUserService; private SeeYonRequestService seeYonService; + private SysPostUserService postUserService; @GetMapping("succ") public R succ(Long id){ @@ -105,7 +107,7 @@ public class TzcPolicyController { } /** - * 翻页 + * 翻页(我的) * @param param * @return */ @@ -120,6 +122,24 @@ public class TzcPolicyController { return R.byPageHelperList(list); } + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/pageMyAndChild") + public R> getPageMyAndChild(TzcPolicy param){ + String userId = AuthContextUtils.getSysUserId(); + List userIds = postUserService.listByChildIds(userId); + userIds.add(userId); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + lqw.in(TzcPolicy::getUserId,userIds); + lqw.orderByDesc(TzcPolicy::getCreateTime); + List list = tzcPolicyService.list(lqw); + return R.byPageHelperList(list); + } + /** * 翻页 * @param param diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index c78491f0..bc2673e9 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -7,7 +7,11 @@ import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.*; import com.qs.serve.common.util.model.DateFormatString; +import com.qs.serve.modules.bms.entity.BmsRegion; +import com.qs.serve.modules.bms.entity.BmsRegion2; 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.service.BmsSupplierService; import com.qs.serve.modules.goods.entity.GoodsSku; import com.qs.serve.modules.goods.service.GoodsSkuService; @@ -82,6 +86,8 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ private GoodsSkuService goodsSkuService; private XiaoLuTonService xiaoLuTonService; private ProjectProperties projectProperties; + private final BmsRegionMapper regionMapper; + private final BmsRegion2Mapper region2Mapper; @Override public void syncPolicyItem(Long policyItemId) { @@ -166,6 +172,17 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ data.put("targetId",tzcPolicy.getId()); data.put("targetCode",tzcPolicy.getPolicyCode()); data.put("exsp1", TbsSeeYonConst.PolicyConf.Code()); + + //拓展添加审批关联区域 + String saleRegionId = supplier.handleSaleRegionId(); + String bizRegionId = supplier.handleBizRegionId(); + BmsRegion saleRegion = regionMapper.selectById(saleRegionId); + BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId); + String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null"; + String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null"; + data.put("exsp2",saleRegionNames); + data.put("exsp3",bizRegionNames); + //添加跳转地址业务 String urlKey = "exsp5"+IdUtil.simpleUUID(); String baseJumpUrl = JumpToUtil.getUrl(projectProperties.getHostUrl(),TbsSeeYonConst.CostApplyConf.Code(),urlKey); 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 0a4e1a3d..ec2afc41 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 @@ -7,10 +7,9 @@ import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.*; import com.qs.serve.common.util.model.DateFormatString; -import com.qs.serve.modules.bms.entity.BmsChannel; -import com.qs.serve.modules.bms.entity.BmsChannelPoint; -import com.qs.serve.modules.bms.entity.BmsSubject; -import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.entity.*; +import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper; +import com.qs.serve.modules.bms.mapper.BmsRegionMapper; import com.qs.serve.modules.bms.service.BmsChannelPointService; import com.qs.serve.modules.bms.service.BmsChannelService; import com.qs.serve.modules.bms.service.BmsSubjectService; @@ -90,6 +89,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl SELECT DATE_FORMAT(date,'%Y%m') AS `yearMonth`, - SUM(dispatch_cost) as dispatchSumCost + SUM(sum_money) as dispatchSumCost FROM `erp_dispatch_data` where