From 4131196f712eff02ec9bec557d31abc396676a1d Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 9 Aug 2023 15:53:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/service/impl/BirCenterRateServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index c0560363..8829bd5e 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.SpringUtils; import com.qs.serve.modules.bir.entity.BirActivityCenterGoods; @@ -26,6 +27,7 @@ import com.qs.serve.modules.tbs.common.util.QuarterUtil; import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import com.qs.serve.modules.tbs.mapper.TbsActivityCenterMapper; +import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper; import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; import com.qs.serve.modules.tzc.entity.TzcPolicyItem; @@ -58,7 +60,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { private BirActivityCenterGoodsMapper birActivityCenterGoodsMapper; private TbsActivityCenterMapper tbsActivityCenterMapper; private TzcPolicyItemMapper tzcPolicyItemMapper; - + private TbsBudgetLogMapper tbsBudgetLogMapper; public List findCostCenterDataByCostApplyId(Long costApplyId,Long policyId){ List centerDataList = new ArrayList<>(); @@ -124,10 +126,17 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { scheduleItemBudgetLambdaQueryWrapper.in(TbsScheduleItemBudget::getBudgetId,tbsBudgetList.stream().map(a->a.getId()).collect(Collectors.toList())); List scheduleItemBudgetList = tbsScheduleItemBudgetMapper.selectList(scheduleItemBudgetLambdaQueryWrapper); //合计目标发货和金定额 - BigDecimal targetBudgetAmout = scheduleItemBudgetList.stream().map(a->a.getBudgetAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); BigDecimal targetDispatchAmout = scheduleItemBudgetList.stream().map(a->a.getPreDispatchAmount()==null?BigDecimal.ZERO:a.getPreDispatchAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); costCenter.setTargetSales(targetDispatchAmout.toString()); + + LambdaQueryWrapper tbsbudgetLogLambdaQueryWrapper = new LambdaQueryWrapper(); + tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterId,centerId); + tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterType,centerType); + tbsbudgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); + List logList = tbsBudgetLogMapper.selectList(tbsbudgetLogLambdaQueryWrapper); + BigDecimal targetBudgetAmout = logList.stream().map(a->a.getAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); costCenter.setAreaBudget(targetBudgetAmout.toString()); + BigDecimal targetExpenseRate = BigDecimal.ZERO; if(targetDispatchAmout.compareTo(BigDecimal.ZERO)!=0) { targetExpenseRate = targetBudgetAmout.divide(targetDispatchAmout, 2, BigDecimal.ROUND_HALF_DOWN); From ae050c64998d7844e210c5592921a78beb879b16 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 9 Aug 2023 15:54:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=A2=84=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bir/service/impl/BirCenterRateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index 8829bd5e..5b92b3a1 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java @@ -129,7 +129,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { BigDecimal targetDispatchAmout = scheduleItemBudgetList.stream().map(a->a.getPreDispatchAmount()==null?BigDecimal.ZERO:a.getPreDispatchAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); costCenter.setTargetSales(targetDispatchAmout.toString()); - LambdaQueryWrapper tbsbudgetLogLambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper tbsbudgetLogLambdaQueryWrapper = new LambdaQueryWrapper(); tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterId,centerId); tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterType,centerType); tbsbudgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag()); From 2115d1f034a3cf1127a618bcb06ff6dffdc257a1 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 9 Aug 2023 17:24:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/tbs/entity/TbsBudgetLog.java | 6 ++++++ .../serve/modules/tbs/entity/so/TbsBudgetLogSo.java | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java index 9cc713c1..dc4b20a1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java @@ -182,6 +182,7 @@ public class TbsBudgetLog implements Serializable { @TableField(condition = SqlCondition.LIKE) private String activityCode; + @TableField(condition = SqlCondition.LIKE) private String activityTheme; /** 政策id */ @@ -194,13 +195,16 @@ public class TbsBudgetLog implements Serializable { /** 政策标题 */ @Length(max = 255,message = "政策标题长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String policyTitle; /** 政策项id */ + @TableField(condition = SqlCondition.LIKE) private Long policyItemId; /** 政策项编码 */ @Length(max = 30,message = "政策项编码长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String policyItemCode; /** 费用申请id */ @@ -213,6 +217,7 @@ public class TbsBudgetLog implements Serializable { /** 费用申请主题 */ @Length(max = 150,message = "费用申请主题长度不能超过150字") + @TableField(condition = SqlCondition.LIKE) private String costApplyTheme; /** 备注 */ @@ -248,6 +253,7 @@ public class TbsBudgetLog implements Serializable { /** 目标编码 */ @Length(max = 30,message = "目标编码长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String targetCode; /** 目标名称 */ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetLogSo.java b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetLogSo.java index 37582c3f..3e253a1d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetLogSo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetLogSo.java @@ -28,6 +28,9 @@ public class TbsBudgetLogSo implements Serializable { /** id */ private Long id; + /** 操作人编号 */ + private String optUserCode; + /** 类型：0-预算新增；1-费用申请；2-预算调增；3-预算调减；4-费用释放 */ private Integer optType; @@ -43,6 +46,11 @@ public class TbsBudgetLogSo implements Serializable { /** 考核编码 */ private String itemName; + private String activityTheme; + private String targetType; + private String targetCode; + private String targetName; + /** 开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDate; @@ -102,6 +110,10 @@ public class TbsBudgetLogSo implements Serializable { /** 费用申请主题 */ private String costApplyTheme; + private String policyCode; + private String policyTitle; + private String policyItemCode; + /** 操作人id */ private String optUserId; From 34981a1fa3982324a0de0f43c1301c8dea24fd92 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Wed, 9 Aug 2023 17:25:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/bms/BmsSupplierMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index f253b34c..58463dc0 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -159,7 +159,7 @@ or `bms_supplier`.`region2_last` is null or TRIM(`bms_supplier`.`region2_last`) = '' ) - + and `bms_supplier`.`region_last` is not null and `bms_supplier`.`region2_last` is not null and TRIM(`bms_supplier`.`region_last`) != '' and TRIM(`bms_supplier`.`region2_last`) != ''