From 7df2dfc579e0a0cbdb23bedf91f9572937c072df Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 9 Jul 2024 09:36:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E4=B8=8D=E8=BF=90=E4=BD=9C=E7=8A=B6=E6=80=81=EF=BC=9Bfix:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6=E6=A0=B8=E9=94=80=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=BC=82=E5=B8=B8=EF=BC=9Bfix=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/OmsOrderController.java | 4 +-- .../oms/controller/api/OmsOrderApi.java | 9 ++++--- .../impl/SeeYonRequestBaseService.java | 2 +- .../tbs/controller/TbsBudgetController.java | 14 +++++++++++ .../serve/modules/tbs/entity/TbsBudget.java | 5 +++- .../modules/tbs/entity/bo/TbsBudgetAmtBo.java | 5 +--- .../modules/tbs/entity/bo/TbsBudgetBo.java | 3 +++ .../tbs/entity/bo/TbsBudgetStateBo.java | 3 +++ .../modules/tbs/entity/so/TbsBudgetSo.java | 3 +++ .../impl/TbsBudgetChangeServiceImpl.java | 4 +-- .../service/impl/TbsBudgetServiceImpl.java | 1 + .../service/impl/TbsCostApplyServiceImpl.java | 25 ++++++++++++++++++- .../VtbVerificationBatchController.java | 4 +++ .../vtb/mapper/VtbVerificationMapper.java | 2 +- .../impl/VtbVerificationServiceImpl.java | 5 ++++ .../resources/mapper/tbs/TbsBudgetMapper.xml | 1 + 16 files changed, 74 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java index 90c268ea..177948bd 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java @@ -76,9 +76,9 @@ public class OmsOrderController { Set userIds = list.stream().map(OmsOrder::getCheckUserId).collect(Collectors.toSet()); List userList = sysUserService.listByIds(userIds); - Set orderIds = list.stream().map(OmsOrder::getId).collect(Collectors.toSet()); - List orderItems = omsOrderItemService.list(new LambdaQueryWrapper().eq(OmsOrderItem::getOrderId,orderIds)); + orderIds.add(0L); + List orderItems = omsOrderItemService.list(new LambdaQueryWrapper().in(OmsOrderItem::getOrderId,orderIds)); Map> orderItemsMap = orderItems.stream().collect(Collectors.groupingBy(OmsOrderItem::getOrderId)); for (OmsOrder order : list) { BmsSupplierAddress supplierAddress = null; diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java index 00e4e8e4..c72ce3cd 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java @@ -142,9 +142,7 @@ public class OmsOrderApi { PageUtil.startPage(); LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(param); List list = omsOrderService.list(orderWrapper); - for (OmsOrder omsOrder : list) { - omsOrderService.checkMsOrderStatus(omsOrder); - } + this.buildOrderVoInfo(list); return R.byPageHelperList(list); } @@ -161,7 +159,11 @@ public class OmsOrderApi { orderWrapper.eq(OmsOrder::getOrderType,param.getOrderType()==null?0:param.getOrderType()); orderWrapper.orderByDesc(OmsOrder::getId); List list = omsOrderService.list(orderWrapper); + this.buildOrderVoInfo(list); + return R.byPageHelperList(list); + } + private void buildOrderVoInfo(List list) { List userIds = list.stream().map(OmsOrder::getCheckUserId).collect(Collectors.toList()); List sysUserList = new ArrayList<>(); if(userIds.size()>0){ @@ -198,7 +200,6 @@ public class OmsOrderApi { order.setOrderItems(itemsMap.get(order.getId())); } - return R.byPageHelperList(list); } /** diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java index 0291f8cc..64fde847 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java @@ -48,7 +48,7 @@ public class SeeYonRequestBaseService { if(result.getStatus()!=200){ log.error("致远服务失败[{},{}]\nParam:{}",title,result.getMsg(),JsonUtil.objectToJson(param)); } - log.debug("致远服务返回R：{}",JsonUtil.objectToJson(result)); + log.info("致远服务返回R：{}",JsonUtil.objectToJson(result)); return result; } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 92c57d09..6ea47170 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.tbs.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.dto.PageVo; @@ -223,6 +224,19 @@ public class TbsBudgetController { return R.ok(); } + /** + * 更新预算的不运作状态 + * @param param + * @return + */ + @PostMapping("/updateInactiveFlag") + @SysLog(module = SystemModule.Budget, title = "预算不运作状态", biz = BizType.UPDATE) + public R updateInactiveFlag(@RequestBody @Valid TbsBudgetStateBo param){ + tbsBudgetService.update(new LambdaUpdateWrapper() + .set(TbsBudget::getInactiveFlag,param.getInactiveFlag()) + .eq(TbsBudget::getId,param.getId())); + return R.ok(); + } /** * 更新跨年状态 diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java index a3126cbf..10c770ad 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java @@ -43,7 +43,10 @@ public class TbsBudget implements Serializable { /** 费用启用状态 0/1 */ private Integer budgetState; - /** 停用状态 0/1 */ + /** 不活动的 0/1 用于随意关停预算 */ + private Integer inactiveFlag; + + /** 停用状态 0/1 用于标记跨年停用预算 */ private Integer stopFlag; /** 是否允许跨年，控制停用状态 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetAmtBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetAmtBo.java index b1fa5323..9f8d60b4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetAmtBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetAmtBo.java @@ -11,10 +11,7 @@ import java.math.BigDecimal; @Data public class TbsBudgetAmtBo { - /** - * scheduleItemBudgetId - */ - private Long scheduleItemId; + private Long budgetScheduleItemId; private BigDecimal preDispatchAmount; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java index 6f484666..44675e6c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java @@ -41,6 +41,9 @@ public class TbsBudgetBo implements Serializable { /** 是否允许跨年，控制停用状态 */ private Integer crossYearFlag; + /** 不活动的 0/1 */ + private Integer inactiveFlag; + /** * 成本中心类型： center, diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java index c6093002..a99df0b8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java @@ -22,4 +22,7 @@ public class TbsBudgetStateBo { /** 是否允许跨年，控制停用状态 */ private Integer crossYearFlag; + /** 是否允许跨年，控制停用状态 */ + private Integer inactiveFlag; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java index c5bbdbdc..e9c26930 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java @@ -31,6 +31,9 @@ public class TbsBudgetSo implements Serializable { /** 停用状态 0/1 */ private Integer stopFlag; + /** 不活动的 0/1 */ + private Integer inactiveFlag; + /** 是否允许跨年，控制停用状态 */ private Integer crossYearFlag; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java index c1207454..111c3853 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java @@ -271,7 +271,7 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl budgetAmtUpdateList = param.getBudgetAmtUpdateList(); if(CollectionUtil.isNotEmpty(budgetAmtUpdateList)){ //更变的周期项 - List budgetScheduleIds = budgetAmtUpdateList.stream().map(TbsBudgetAmtBo::getScheduleItemId).collect(Collectors.toList()); + List budgetScheduleIds = budgetAmtUpdateList.stream().map(TbsBudgetAmtBo::getBudgetScheduleItemId).collect(Collectors.toList()); List budgetLogWithAmountList = tbsScheduleItemBudgetMapper.getSumAmtInList(budgetScheduleIds,Arrays.asList(0,2,3)); //所有的周期项 List allScheduleItemBudgetList = tbsScheduleItemBudgetMapper @@ -294,7 +294,7 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl budget.setBudgetCode(budgetBo.getBudgetCode()); budget.setSubjectId(budgetBo.getSubjectId()); budget.setAttachIds(budgetBo.getAttachIds()); + budget.setInactiveFlag(budgetBo.getInactiveFlag()); //设置指定模板 budget.setTemplateIds(new String[]{}); if(budgetBo.getTemplateFlag()!=null&&budgetBo.getTemplateFlag().equals(1)){ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 0b706741..935d5057 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -430,7 +430,26 @@ public class TbsCostApplyServiceImpl extends ServiceImpl flowIdResult = null; //启用新方法开关 if( tbsCostApply.getContractFlag().equals(1)){ + List uploadFileList = new ArrayList<>(); + + List actFileIds = new ArrayList<>(); + for (TbsActivity activity : activityList) { + if (CollectionUtil.isNotEmpty(activity.getAttachIds())){ + actFileIds.addAll(Arrays.asList(activity.getAttachIds())); + } + } + if(CollectionUtil.isNotEmpty(actFileIds)){ + List attachList = sysAttachService.listByIds(actFileIds); + for (SysAttach sysAttach : attachList) { + OaUploadFile uploadFile = new OaUploadFile(); + uploadFile.setField("file"); + uploadFile.setName("活动附件"+sysAttach.getName()); + uploadFile.setUrl("https://qsjslservice.oss-cn-guangzhou.aliyuncs.com/"+sysAttach.getRelativePath()); + uploadFileList.add(uploadFile); + } + } + if(CollectionUtil.isNotEmpty(oaAttachmentsIdList)){ List attachList = sysAttachService.listByIds(oaAttachmentsIdList); for (SysAttach sysAttach : attachList) { @@ -451,6 +470,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl activityList, List payConditions, BmsSupplier supplier, SysUser sysUser, Map data,List contracts,List costTodoList ,Map newWayData) { + private void buildContractApplyData(String id, TbsCostApply tbsCostApply, List activityList, + List payConditions, BmsSupplier supplier, SysUser sysUser, + Map data,List contracts, + List costTodoList ,Map newWayData) { data.put("title", tbsCostApply.getChargeTheme()); data.put("orgId", tbsCostApply.getId().toString()); data.put("costApplyCode", tbsCostApply.getCode()); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java index c8237601..7f2ab350 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java @@ -110,6 +110,10 @@ public class VtbVerificationBatchController { @GetMapping("/getById/{id}") public R getById(@PathVariable("id") String id){ VtbVerificationBatch batch = vtbVerificationBatchService.getById(id); + if(batch.getVtbBatchStatus().equals(VtbVerificationBatch.BatchState.CHECKING)){ + vtbVerificationBatchOperationService.runCompensate(id); + batch = vtbVerificationBatchService.getById(id); + } List verificationList = vtbVerificationService .list(new LambdaQueryWrapper() .eq(VtbVerification::getBatchId,batch.getId())); diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java index 2a36fdf3..e095e67c 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java +++ b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java @@ -19,7 +19,7 @@ import java.util.List; public interface VtbVerificationMapper extends BaseMapper { - @Select("select COALESCE(sum(amount),0) from vtb_verification where del_flag = 0 and batchId = #{batchId} ") + @Select("select COALESCE(sum(amount),0) from vtb_verification where del_flag = 0 and batch_id = #{batchId} ") BigDecimal totalVtbAmtByBatchId(@Param("batchId")Long batchId); @Select("select COALESCE(sum(amount),0) from vtb_verification where del_flag = 0 and activity_id = #{activityId} and verification_state = 1") 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 dae59b2b..20580a8b 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 @@ -1584,6 +1584,11 @@ public class VtbVerificationServiceImpl extends ServiceImpl and `tbs_budget`.`budget_number` like concat('%',#{query.budgetNumber},'%') and `tbs_budget`.`budget_state` = #{query.budgetState} and `tbs_budget`.`cross_year_flag` = #{query.crossYearFlag} + and `tbs_budget`.`inactive_flag` = #{query.inactiveFlag} and `tbs_budget`.`budget_check_state` = #{query.budgetCheckState} and `tbs_budget`.`budget_code` like concat('%',#{query.budgetCode},'%')