Merge remote-tracking branch 'origin/v1.0' into v1.0

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<TbsCostSubItem.CostCenterTranStr> findCostCenterDataByCostApplyId(Long costApplyId,Long policyId){
         List<TbsCostSubItem.CostCenterTranStr> 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<TbsScheduleItemBudget> 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<TbsBudgetLog> tbsbudgetLogLambdaQueryWrapper = new LambdaQueryWrapper<TbsBudgetLog>();
+        tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterId,centerId);
+        tbsbudgetLogLambdaQueryWrapper.eq(TbsBudgetLog::getCenterType,centerType);
+        tbsbudgetLogLambdaQueryWrapper.in(TbsBudgetLog::getOptType, BudgetLogOptFlag.getFinalBudgetOptFlag());
+        List<TbsBudgetLog> 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);

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;
 
     /** 目标名称 */

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;
 

src/main/resources/mapper/bms/BmsSupplierMapper.xml

@@ -159,7 +159,7 @@
                     or `bms_supplier`.`region2_last` is null  or  TRIM(`bms_supplier`.`region2_last`) = ''
                     )
                 </if>
-                <if test=' query.isRegionNull != "1"'>
+                <if test=' query.isRegionNull == "0"'>
                     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`) != ''
                 </if>