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

# Conflicts:
#	src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

src/main/java/com/qs/serve/common/model/enums/MonthValues.java

@@ -0,0 +1,40 @@
+package com.qs.serve.common.model.enums;
+
+/**
+ * @author YenHex
+ * @since 2023/9/13
+ */
+public class MonthValues {
+
+    public static final int[] Q1 = {1,2,3};
+    public static final int[] Q2 = {4,5,6};
+    public static final int[] Q3 = {7,8,9};
+    public static final int[] Q4 = {10,11,12};
+
+
+
+    public static int[] getQArr(Integer val){
+        for (int i = 0; i < Q1.length; i++) {
+            if(val==Q1[i]){
+                return Q1;
+            }
+        }
+        for (int i = 0; i < Q2.length; i++) {
+            if(val==Q2[i]){
+                return Q2;
+            }
+        }
+        for (int i = 0; i < Q3.length; i++) {
+            if(val==Q3[i]){
+                return Q3;
+            }
+        }
+        for (int i = 0; i < Q4.length; i++) {
+            if(val==Q4[i]){
+                return Q4;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java

@@ -62,6 +62,7 @@ public class BirCenterRateServiceImpl implements BirCenterRateService {
     private TzcPolicyItemMapper tzcPolicyItemMapper;
     private TbsBudgetLogMapper tbsBudgetLogMapper;
 
+    @Override
     public List<TbsCostSubItem.CostCenterTranStr> findCostCenterDataByCostApplyId(Long costApplyId,Long policyId){
         List<TbsCostSubItem.CostCenterTranStr> centerDataList = new ArrayList<>();
         if(costApplyId!=null) {

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierTarget.java

@@ -0,0 +1,77 @@
+package com.qs.serve.modules.bms.entity;
+
+import java.time.LocalDate;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+
+/**
+ *  实体类
+ * @author YenHex
+ * @since 2023-09-13
+ */
+@Data
+@TableName("bms_supplier_target")
+public class BmsSupplierTarget implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**  */
+    private Long supplierId;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String supplierCode;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String supplierName;
+
+    /** 对应tbs_schedule的ID */
+    private Long scheduleId;
+
+    /** 对应tbs_schedule_item的ID */
+    private Long scheduleItemId;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String scheduleItemName;
+
+    /**  */
+    private BigDecimal targetDispatchAmount;
+
+    /**  */
+    private BigDecimal targetCostAmount;
+
+
+	public static BmsSupplierTarget toNewObject(BmsSupplierTarget source){
+		BmsSupplierTarget supplierTarget = new BmsSupplierTarget();
+		supplierTarget.setId(source.getId());
+		supplierTarget.setSupplierId(source.getSupplierId());
+		supplierTarget.setSupplierCode(source.getSupplierCode());
+		supplierTarget.setSupplierName(source.getSupplierName());
+		supplierTarget.setScheduleId(source.getScheduleId());
+		supplierTarget.setScheduleItemId(source.getScheduleItemId());
+		supplierTarget.setScheduleItemName(source.getScheduleItemName());
+		supplierTarget.setTargetDispatchAmount(source.getTargetDispatchAmount());
+		supplierTarget.setTargetCostAmount(source.getTargetCostAmount());
+		return supplierTarget;
+	}
+
+}
+

src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierTargetMapper.java

@@ -0,0 +1,14 @@
+package com.qs.serve.modules.bms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.modules.bms.entity.BmsSupplierTarget;
+
+/**
+ *  Mapper
+ * @author YenHex
+ * @date 2023-09-13
+ */
+public interface BmsSupplierTargetMapper extends BaseMapper<BmsSupplierTarget> {
+
+}
+

src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java

@@ -75,8 +75,8 @@ public class SeeYonController {
      * @return
      */
     @GetMapping("pageMyCallback")
-    public R<PageVo<TodoVO>> pageCallbackList(){
+    public R<PageVo<TodoVO>> pageCallbackList(TodoVoQuery todoVoQuery){
-        return R.ok(commonCheckService.pageCallback(new TodoVoQuery()));
+        return R.ok(commonCheckService.pageCallback(todoVoQuery));
     }
 
     /**

src/main/java/com/qs/serve/modules/seeyon/entity/dto/TodoVoQuery.java

@@ -1,6 +1,9 @@
 package com.qs.serve.modules.seeyon.entity.dto;
 
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 /**
  * @author YenHex
@@ -9,6 +12,18 @@ import lombok.Data;
 @Data
 public class TodoVoQuery {
 
+    private String title;
+
+    private String targetType;
+
+    private String targetCode;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDate;
+
     private String userId;
 
     private Integer startRow;

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java

@@ -88,6 +88,12 @@ public class TbsActivitySlottingFeeController {
         List<Long> channelIds = channelList.stream().map(TbsActivityChannel::getChannelId).distinct().collect(Collectors.toList());
         List<Long> pointIds = pointList.stream().map(TbsActivityChannelPoint::getPointId).distinct().collect(Collectors.toList());
         LambdaQueryWrapper<TbsActivitySlottingFee> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.hasText(param.getTargetName()),TbsActivitySlottingFee::getTargetName,param.getTargetName());
+        lqw.like(StringUtils.hasText(param.getTargetCode()),TbsActivitySlottingFee::getTargetCode,param.getTargetCode());
+        lqw.like(StringUtils.hasText(param.getChannelName()),TbsActivitySlottingFee::getChannelName,param.getChannelName());
+        lqw.like(StringUtils.hasText(param.getChannelCode()),TbsActivitySlottingFee::getChannelCode,param.getChannelCode());
+        lqw.like(StringUtils.hasText(param.getPointName()),TbsActivitySlottingFee::getPointName,param.getPointName());
+        lqw.like(StringUtils.hasText(param.getPointCode()),TbsActivitySlottingFee::getPointCode,param.getPointCode());
         if (goodsIds.size() > 0) {
             lqw.in(TbsActivitySlottingFee::getTargetId, goodsIds);
             lqw.eq(TbsActivitySlottingFee::getTargetType, "spu");

src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsContractCostSubItem.java

@@ -52,4 +52,25 @@ public class TbsContractCostSubItem {
 
     }
 
+    @Data
+    public static class CusCenterRate{
+        // 季度客户所属成本中心费用金额
+        private String qtdCusCenterCost;
+        // 季度客户所属成本中心发货金额
+        private String qtdCusCenterSend;
+        // 季度客户所属成本中心费用率
+        private String qtdCusCenterExpenseRate;
+        // 季度客户所属成本中心目标费用率
+        private String qtdCusCenterTargetExpenseRate;
+
+        // 年度客户所属成本中心费用金额
+        private String ytdCusCenterCost;
+        // 年度客户所属成本中心发货金额
+        private String ytdCusCenterSend;
+        // 年度客户所属成本中心费用率
+        private String ytdCusCenterExpenseRate;
+        // 年度客户所属成本中心目标费用率
+        private String ytdCusCenterTargetExpenseRate;
+    }
+
 }

src/main/java/com/qs/serve/modules/tbs/entity/so/TbsBudgetSo.java

@@ -34,6 +34,9 @@ public class TbsBudgetSo implements Serializable {
     /** 预算编码 */
     private String budgetNumber;
 
+    /** 审批流程状态 */
+    private Integer budgetCheckState;
+
     /** 科目编码搜索值 */
     private String subjectValue;
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java

@@ -47,7 +47,7 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic
 
     @Override
     public void doCommitBacked(String targetId) {
-        AsyncFactory.submitBudgetApply(targetId);
+        AsyncManager.me().execute(AsyncFactory.submitBudgetApply(targetId));
     }
 
     @Override

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -10,22 +10,23 @@ import com.qs.serve.common.framework.manager.AsyncManager;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.MonthValues;
 import com.qs.serve.common.util.*;
 import com.qs.serve.common.util.model.DateFormatString;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
+import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
 import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo;
 import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper;
 import com.qs.serve.modules.bir.mapper.BirBaseActivityMapper;
+import com.qs.serve.modules.bir.mapper.BirRoiRateMapper;
 import com.qs.serve.modules.bir.service.BirCenterRateService;
 import com.qs.serve.modules.bir.service.BirRoiRateService;
-import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.*;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
-import com.qs.serve.modules.bms.entity.BmsSubject;
-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.BmsSupplierTargetMapper;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo;
@@ -112,6 +113,11 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private BirCenterRateService centerRateService;
     private BirActivityCenterGoodsMapper birActivityCenterGoodsMapper;
     private BirBaseActivityMapper birBaseActivityMapper;
+    private BirRoiRateMapper birRoiRateMapper;
+    private final ErpDispatchDataMapper dispatchDataMapper;
+    private TbsScheduleItemMapper tbsScheduleItemMapper;
+
+    private BmsSupplierTargetMapper bmsSupplierTargetMapper;
 
     private TbsBudgetMatchApplication tbsBudgetMatchApplication;
 
@@ -572,6 +578,94 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         List<TbsCostContract> contracts = costContractMapper.selectList(lqw);
 
         if(contracts.size()>0){
+            //构建合同DATA
+            buildContractSeeyonData(id, data, contracts);
+        }else {
+            Assert.throwEx("请补充合同信息");
+        }
+
+        //创建子表数据
+        List<Object> subList = new ArrayList<>();
+
+        //活动明细
+        buildActivityCenterGoodsSeeyonData(id, tbsCostApply, activityList, subList);
+        // 付款条件
+        for (TbsActivityPayCondition payCondition : payConditions) {
+//            TbsActivity currActivity = null;
+//            for (TbsActivity activity : activityList) {
+//                if(payCondition.getActivityId().equals(activity.getId())){
+//                    currActivity = activity;
+//                    break;
+//                }
+//            }
+            TbsContractCostSubItem.Payment subPayment = new TbsContractCostSubItem.Payment();
+            subPayment.setPayItem(payCondition.getTitle());
+            subPayment.setPayCondition(payCondition.getConditionMsg());
+            subPayment.setPayMoney(payCondition.getPaymentPrice());
+            subPayment.setPayDate(payCondition.getPreNotifyTime()!=null?payCondition.getPreNotifyTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")):null);
+            subPayment.setActualPayDate(null);
+            String stateMsg = payCondition.getFinishedFlag().equals(1)?"已完成":"未处理";
+            subPayment.setPayCompleteState(stateMsg);
+            subPayment.setPayRemark(payCondition.getRemark());
+            subPayment.setPayCode(payCondition.getCode());
+            subList.add(subPayment);
+        }
+
+        // 协议条款
+        LambdaQueryWrapper<TbsCostTodo> todoLqw = new LambdaQueryWrapper<>();
+        todoLqw.eq(TbsCostTodo::getCostApplyId, tbsCostApply.getId());
+        List<TbsCostTodo> costTodoList = tbsCostTodoMapper.selectList(todoLqw);
+        for (TbsCostTodo costTodo : costTodoList) {
+            TbsContractCostSubItem.ToDoItem toDoItem = new TbsContractCostSubItem.ToDoItem();
+            toDoItem.setServiceDescription(costTodo.getDescr());
+            toDoItem.setDeliveryStandard(costTodo.getPayMsg());
+            toDoItem.setDeliveryDate(costTodo.getPrePayDate()==null?null : costTodo.getPrePayDate().toString());
+            toDoItem.setAgreeRemark(costTodo.getRemark());
+            toDoItem.setAgreeCompleteState(costTodo.getFinishedFlag().equals(1)?"已完成":"未完成");
+            subList.add(toDoItem);
+        }
+        //构造客户维度的 年度、季度合计
+        try {
+            List<TbsContractCostSubItem.CusCenterRate> cusCenterRateList = buildCusRateMain(supplier);
+            subList.addAll(cusCenterRateList);
+        } catch (Exception e) {
+            log.error("[构造客户维度的 年度、季度合计]异常:{}",e.getMessage());
+        }
+        //关联
+        data.put("sub", subList);
+    }
+
+    private void buildActivityCenterGoodsSeeyonData(String id, TbsCostApply tbsCostApply, List<TbsActivity> activityList, List<Object> subList) {
+        LambdaQueryWrapper<TbsActivityCenterGoods> actCgLqw = new LambdaQueryWrapper<>();
+        actCgLqw.eq(TbsActivityCenterGoods::getCostApplyId, id);
+        List<TbsActivityCenterGoods> activityCenterGoodsList = tbsActivityCenterGoodsMapper.selectList(actCgLqw);
+        for (TbsActivityCenterGoods centerGoods : activityCenterGoodsList) {
+            TbsActivity currActivity = null;
+            for (TbsActivity activity : activityList) {
+                if(centerGoods.getActivityId().equals(activity.getId())){
+                    currActivity = activity;
+                    break;
+                }
+            }
+            TbsContractCostSubItem.Activity dataActivity = new TbsContractCostSubItem.Activity();
+            dataActivity.setActivityCode(currActivity.getActivityCode());
+            dataActivity.setActivityPurpose(currActivity.getActTitle());
+            dataActivity.setCostCode(tbsCostApply.getCode());
+            dataActivity.setStartDate(currActivity.getActStartDate()==null?null:currActivity.getActStartDate().toString());
+            dataActivity.setEndDate(currActivity.getActEndDate()==null?null:currActivity.getActEndDate().toString());
+            dataActivity.setWriteOffDate(currActivity.getPreCheckDate()==null?null:currActivity.getPreCheckDate().toString());
+            dataActivity.setProductType(GoodsType.getName(centerGoods.getTargetType()));
+            dataActivity.setProduct(centerGoods.getTargetName());
+            dataActivity.setActivityAccountCode(centerGoods.getSubjectCode());
+            dataActivity.setActivityAccountName(centerGoods.getSubjectName());
+            dataActivity.setActivityCostCenterNo(centerGoods.getCenterCode());
+            dataActivity.setActivityCostCenterName(centerGoods.getCenterName()+"("+centerGoods.getCenterType()+")");
+            dataActivity.setMoney(centerGoods.getCenterGoodsAmount());
+            subList.add(dataActivity);
+        }
+    }
+
+    private void buildContractSeeyonData(String id, Map<String, Object> data, List<TbsCostContract> contracts) {
         //活动的科目和成本中心
         List<TbsActivityCenter> tbsActivityCenters = tbsActivityCenterService.listByCostApplyId(Long.parseLong(id));
         String concatCenterCodes = tbsActivityCenters.stream().map(TbsActivityCenter::getCenterCode).collect(Collectors.joining(","));
@@ -627,78 +721,141 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
             }).collect(Collectors.joining(" , "));
         }
         data.put("contractFile",urls);
-        }else {
-            Assert.throwEx("请补充合同信息");
     }
 
-        //创建子表数据
+    @NotNull
-        List<Object> subList = new ArrayList<>();
+    private List<TbsContractCostSubItem.CusCenterRate> buildCusRateMain(BmsSupplier supplier) {
+        List<BmsSupplierTarget> supplierTargetList = bmsSupplierTargetMapper.selectList(
+                new LambdaQueryWrapper<BmsSupplierTarget>()
+                        .eq(BmsSupplierTarget::getSupplierId, supplier.getId())
+        );
+        List<Long> scheduleItemIds = supplierTargetList.stream().map(BmsSupplierTarget::getScheduleItemId).collect(Collectors.toList());
+        List<Long> scheduleIds = supplierTargetList.stream().map(BmsSupplierTarget::getScheduleId).collect(Collectors.toList());
+        List<TbsScheduleItem> scheduleItems = null;
+        if(scheduleItemIds.size()>0&&scheduleIds.size()>0){
+            LambdaQueryWrapper<TbsScheduleItem> scheduleItemsLqw = new LambdaQueryWrapper<>();
+            scheduleItemsLqw.in(TbsScheduleItem::getId,scheduleItemIds);
+            scheduleItemsLqw.in(TbsScheduleItem::getScheduleId,scheduleIds);
+            scheduleItems = tbsScheduleItemMapper.selectList(scheduleItemsLqw);
+        }
+        //最近12个月
+        LocalDate currMonth = LocalDate.now();
 
-        //活动明细
+        int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue();
-        LambdaQueryWrapper<TbsActivityCenterGoods> actCgLqw = new LambdaQueryWrapper<>();
+        LocalDate startMonth = currMonth.plusMonths(-12);
-        actCgLqw.eq(TbsActivityCenterGoods::getCostApplyId, id);
+        int startMonthNum = startMonth.getYear()*100 + startMonth.getMonthValue();
-        List<TbsActivityCenterGoods> activityCenterGoodsList = tbsActivityCenterGoodsMapper.selectList(actCgLqw);
+
-        for (TbsActivityCenterGoods centerGoods : activityCenterGoodsList) {
+        //发货金额
-            TbsActivity currActivity = null;
+        List<ErpDispatchSumVo> dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,Arrays.asList(supplier.getCode()));
-            for (TbsActivity activity : activityList) {
+        //客户核销金额
-                if(centerGoods.getActivityId().equals(activity.getId())){
+        BirRoiCostDTO costDTO = new BirRoiCostDTO();
-                    currActivity = activity;
+        costDTO.setStartMonthNum(startMonthNum);
-                    break;
+        costDTO.setEndMonthNum(currMonthNum);
+        costDTO.setSupplierId(supplier.getId());
+        List<BirRoiCostItemVo> costItemVoList = birRoiRateMapper.queryRoiCostItems(costDTO);
+        //用户季度费率
+        List<TbsContractCostSubItem.CusCenterRate> cusCenterRateList =
+                this.buildCusCenterRate(supplierTargetList, scheduleItems, currMonth, startMonth, dispatchSumVos, costItemVoList);
+        //用户年费率
+        this.buildCusCenterYearRate(supplierTargetList, dispatchSumVos, costItemVoList, cusCenterRateList);
+        return cusCenterRateList;
     }
+
+    /**
+     * 用户年费率
+     * @param supplierTargetList
+     * @param dispatchSumVos
+     * @param costItemVoList
+     * @param cusCenterRateList
+     */
+    private void buildCusCenterYearRate(List<BmsSupplierTarget> supplierTargetList, List<ErpDispatchSumVo> dispatchSumVos, List<BirRoiCostItemVo> costItemVoList, List<TbsContractCostSubItem.CusCenterRate> cusCenterRateList) {
+        BigDecimal dispatchAmt = BigDecimal.ZERO;
+        BigDecimal totalCost = BigDecimal.ZERO;
+        BigDecimal cusDispatch = BigDecimal.ZERO;
+        BigDecimal cusCost = BigDecimal.ZERO;
+        for (ErpDispatchSumVo dispatchSumVo : dispatchSumVos) {
+            dispatchAmt = dispatchAmt.add(dispatchSumVo.getDispatchSumCost());
+        }
+        for (BirRoiCostItemVo itemVo : costItemVoList) {
+            totalCost = totalCost.add(itemVo.getCostRealAmt());
+        }
+        for (BmsSupplierTarget supplierTarget : supplierTargetList) {
+            cusDispatch = cusDispatch.add(supplierTarget.getTargetCostAmount());
+            cusCost = cusCost.add(supplierTarget.getTargetCostAmount());
+        }
+        for (TbsContractCostSubItem.CusCenterRate centerRate : cusCenterRateList) {
+            centerRate.setYtdCusCenterCost(totalCost.toString());
+            centerRate.setYtdCusCenterSend(dispatchAmt.toString());
+            centerRate.setYtdCusCenterExpenseRate(totalCost.divide(dispatchAmt, RoundingMode.DOWN).toString());
+            if(cusCost.compareTo(BigDecimal.ZERO)!=0&&cusDispatch.compareTo(BigDecimal.ZERO)!=0){
+                centerRate.setYtdCusCenterTargetExpenseRate(cusCost.divide(cusDispatch,RoundingMode.DOWN).toString());
             }
-            TbsContractCostSubItem.Activity dataActivity = new TbsContractCostSubItem.Activity();
-            dataActivity.setActivityCode(currActivity.getActivityCode());
-            dataActivity.setActivityPurpose(currActivity.getActTitle());
-            dataActivity.setCostCode(tbsCostApply.getCode());
-            dataActivity.setStartDate(currActivity.getActStartDate()==null?null:currActivity.getActStartDate().toString());
-            dataActivity.setEndDate(currActivity.getActEndDate()==null?null:currActivity.getActEndDate().toString());
-            dataActivity.setWriteOffDate(currActivity.getPreCheckDate()==null?null:currActivity.getPreCheckDate().toString());
-            dataActivity.setProductType(GoodsType.getName(centerGoods.getTargetType()));
-            dataActivity.setProduct(centerGoods.getTargetName());
-            dataActivity.setActivityAccountCode(centerGoods.getSubjectCode());
-            dataActivity.setActivityAccountName(centerGoods.getSubjectName());
-            dataActivity.setActivityCostCenterNo(centerGoods.getCenterCode());
-            dataActivity.setActivityCostCenterName(centerGoods.getCenterName()+"("+centerGoods.getCenterType()+")");
-            dataActivity.setMoney(centerGoods.getCenterGoodsAmount());
-            subList.add(dataActivity);
         }
-        // 付款条件
-        for (TbsActivityPayCondition payCondition : payConditions) {
-//            TbsActivity currActivity = null;
-//            for (TbsActivity activity : activityList) {
-//                if(payCondition.getActivityId().equals(activity.getId())){
-//                    currActivity = activity;
-//                    break;
-//                }
-//            }
-            TbsContractCostSubItem.Payment subPayment = new TbsContractCostSubItem.Payment();
-            subPayment.setPayItem(payCondition.getTitle());
-            subPayment.setPayCondition(payCondition.getConditionMsg());
-            subPayment.setPayMoney(payCondition.getPaymentPrice());
-            subPayment.setPayDate(payCondition.getPreNotifyTime()!=null?payCondition.getPreNotifyTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")):null);
-            subPayment.setActualPayDate(null);
-            String stateMsg = payCondition.getFinishedFlag().equals(1)?"已完成":"未处理";
-            subPayment.setPayCompleteState(stateMsg);
-            subPayment.setPayRemark(payCondition.getRemark());
-            subPayment.setPayCode(payCondition.getCode());
-            subList.add(subPayment);
     }
 
-        // 协议条款
+    /**
-        LambdaQueryWrapper<TbsCostTodo> todoLqw = new LambdaQueryWrapper<>();
+     * 创建客户维度的季度费率
-        todoLqw.eq(TbsCostTodo::getCostApplyId, tbsCostApply.getId());
+     * @param supplierTargetList
-        List<TbsCostTodo> costTodoList = tbsCostTodoMapper.selectList(todoLqw);
+     * @param scheduleItems
-        for (TbsCostTodo costTodo : costTodoList) {
+     * @param currMonth
-            TbsContractCostSubItem.ToDoItem toDoItem = new TbsContractCostSubItem.ToDoItem();
+     * @param startMonth
-            toDoItem.setServiceDescription(costTodo.getDescr());
+     * @param dispatchSumVos
-            toDoItem.setDeliveryStandard(costTodo.getPayMsg());
+     * @param costItemVoList
-            toDoItem.setDeliveryDate(costTodo.getPrePayDate()==null?null : costTodo.getPrePayDate().toString());
+     */
-            toDoItem.setAgreeRemark(costTodo.getRemark());
+    private List<TbsContractCostSubItem.CusCenterRate> buildCusCenterRate(List<BmsSupplierTarget> supplierTargetList,
-            toDoItem.setAgreeCompleteState(costTodo.getFinishedFlag().equals(1)?"已完成":"未完成");
+                                                                          List<TbsScheduleItem> scheduleItems,
-            subList.add(toDoItem);
+                                                                          LocalDate currMonth, LocalDate startMonth,
+                                                                          List<ErpDispatchSumVo> dispatchSumVos,
+                                                                          List<BirRoiCostItemVo> costItemVoList) {
+        List<TbsContractCostSubItem.CusCenterRate> cusCenterRateList = new ArrayList<>();
+        int[] currQ = MonthValues.getQArr(startMonth.getMonthValue());
+        if(currQ!=null){
+            BigDecimal dispatchAmt = BigDecimal.ZERO;
+            BigDecimal totalCost = BigDecimal.ZERO;
+            BigDecimal cusDispatch = BigDecimal.ZERO;
+            BigDecimal cusCost = BigDecimal.ZERO;
+            for (int monthVal : currQ) {
+                int monthNum = currMonth.getYear()*100 + monthVal;
+                if(dispatchSumVos !=null){
+                    for (ErpDispatchSumVo dispatchSumVo : dispatchSumVos) {
+                        if(dispatchSumVo.getYearMonth().equals(monthNum)){
+                            dispatchAmt = dispatchAmt.add(dispatchSumVo.getDispatchSumCost());
+                            break;
+                        }
+                    }
+                }
+                for (BirRoiCostItemVo itemVo : costItemVoList) {
+                    if(itemVo.getYearMonth().equals(monthNum)){
+                        totalCost = totalCost.add(itemVo.getCostRealAmt());
+                    }
+                }
+                if(scheduleItems !=null){
+                    for (BmsSupplierTarget supplierTarget : supplierTargetList) {
+                        for (TbsScheduleItem item : scheduleItems) {
+                            //匹配条件
+                            if(supplierTarget.getScheduleItemId().equals(item.getId())){
+                                //匹配时间
+                                int itemMonth = item.getStartDate().getMonthValue();
+                                if(itemMonth==monthVal){
+                                    cusDispatch = cusDispatch.add(supplierTarget.getTargetCostAmount());
+                                    cusCost = cusCost.add(supplierTarget.getTargetCostAmount());
+                                    break;
+                                }
+                            }
                         }
-        //关联
+                    }
-        data.put("sub", subList);
+                }
+            }
+            TbsContractCostSubItem.CusCenterRate centerRate = new TbsContractCostSubItem.CusCenterRate();
+            centerRate.setQtdCusCenterCost(totalCost.toString());
+            centerRate.setQtdCusCenterSend(dispatchAmt.toString());
+            centerRate.setQtdCusCenterExpenseRate(totalCost.divide(dispatchAmt, RoundingMode.DOWN).toString());
+            if(cusCost.compareTo(BigDecimal.ZERO)!=0&&cusDispatch.compareTo(BigDecimal.ZERO)!=0){
+                centerRate.setQtdCusCenterTargetExpenseRate(cusCost.divide(cusDispatch,RoundingMode.DOWN).toString());
+            }
+            cusCenterRateList.add(centerRate);
+        }
+        return cusCenterRateList;
     }
 
     private void buildCommonApplyData(String id, TbsCostApply tbsCostApply, List<TbsActivity> activityList, BmsSupplier supplier ,SysUser sysUser, Map<String, Object> data) {
@@ -753,7 +910,14 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         try {
             this.buildSubList(tbsActivityCenters, subjectNames, subList);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("【费用申请，创建子表数据】：{}",e.getMessage());
+        }
+        //构造客户维度的 年度、季度合计
+        try {
+            List<TbsContractCostSubItem.CusCenterRate> cusCenterRateList = buildCusRateMain(supplier);
+            subList.addAll(cusCenterRateList);
+        } catch (Exception e) {
+            log.error("【费用申请，创建客户维度费率数据】：{}",e.getMessage());
         }
         //创建商品抬头列表
         List<TbsActivityGoods> tbsActivityGoods = tbsActivityGoodsService.listByCostApplyId(Long.parseLong(id));
@@ -827,7 +991,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         //成本中心去重
         Map<String,List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a->a.getCenterType()+"-"+a.getCenterId()));
         List<TbsActivityCenter> centerList = centerMapList.values().stream().map(a->a.get(0)).collect(Collectors.toList());
-
+        // TODO 有异常
         for(TbsActivityCenter center : centerList){
             TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName());
             subList.add(costCenter);

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -5,8 +5,10 @@ import com.qs.serve.common.config.properties.ProjectApisProperties;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.ResultFlag;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bms.entity.BmsCostCenter;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.service.BmsCostCenterService;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
@@ -77,6 +79,7 @@ public class PortalOfCostApplication {
 
     private BmsSupplierService supplierService;
     private BmsSubjectService subjectService;
+    private BmsCostCenterService costCenterService;
 
     private SysUserService userService;
 
@@ -140,7 +143,6 @@ public class PortalOfCostApplication {
         //保存核销申请
         VtbVerification verification = new VtbVerification();
         verification.setVerificationCode("HX"+ IdUtil.timeStampId());
-        verification.setVerificationMainCode(verification.getVerificationCode());
         verification.setFinishedTime(nowTime);
         verification.setVerificationState(VtbVerificationState.Finished.getCode());
         verification.setPolicyItemId(policyItem.getId());
@@ -417,7 +419,6 @@ public class PortalOfCostApplication {
         //保存核销申请
         VtbVerification verification = new VtbVerification();
         verification.setVerificationCode("HX"+ IdUtil.timeStampId());
-        verification.setVerificationMainCode(verification.getVerificationCode());
         verification.setFinishedTime(nowTime);
         verification.setVerificationState(VtbVerificationState.Finished.getCode());
         verification.setActivityId(activity.getId());
@@ -540,6 +541,8 @@ public class PortalOfCostApplication {
         if(supplier==null){Assert.throwEx("客户不存在，请重新编辑");}
         BmsSubject subject = subjectService.getByCode(createBo.getSubjectCode());
         if(subject==null){Assert.throwEx("科目不存在，请重新编辑");}
+        BmsCostCenter costCenter = costCenterService.getByCode(createBo.getCenterCode());
+        if(costCenter==null){Assert.throwEx("成本中心不存在，请重新编辑");}
         //发票号
         String billNumber = createBo.getBillNumber();
         String disNumber = createBo.getErpCode();
@@ -567,7 +570,7 @@ public class PortalOfCostApplication {
         List<GoodsSku> skuList = this.initSkuListOfProcess(invCodeList);
         //常用参数
         final String GOODS_TYPE = "sku";
-        final String CENTER_TYPE = "customer";
+        final String CENTER_TYPE = "center";
         final BigDecimal OneHundred = new BigDecimal("100");
         LocalDateTime nowTime = LocalDateTime.now();
         LocalDate nowDate = LocalDate.now();
@@ -579,6 +582,10 @@ public class PortalOfCostApplication {
 
         String activityCode = costCode;
 
+        if(StringUtils.hasText(activityCode)){
+            activityCode = CodeGenUtil.generate(CodeGenUtil.SourceKey.Activity);
+        }
+
         String activityTitle = createBo.getActivityTitle();
         if(!StringUtils.hasText(activityTitle)){
             activityTitle = "由核销API生成的活动";
@@ -586,6 +593,7 @@ public class PortalOfCostApplication {
         //构建费用申请
         TbsCostApply costApply = new TbsCostApply();
         costApply.setCode(costCode);
+        costApply.setMatchType(1);
         costApply.setChargeTheme(costTheme);
         costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
         costApply.setSupplierId(supplierId);
@@ -632,9 +640,9 @@ public class PortalOfCostApplication {
         activityCenter.setCenterAmount(totalAmount);
         activityCenter.setCenterRate(OneHundred);
         activityCenter.setCenterType(CENTER_TYPE);
-        activityCenter.setCenterId(supplier.getId());
+        activityCenter.setCenterId(costCenter.getId()+"");
-        activityCenter.setCenterName(supplier.getName());
+        activityCenter.setCenterName(costCenter.getName());
-        activityCenter.setCenterCode(supplier.getCode());
+        activityCenter.setCenterCode(costCenter.getCode());
         activityCenter.setUsedAmount(totalAmount);
 
         //活动-商品
@@ -665,9 +673,9 @@ public class PortalOfCostApplication {
             centerGoods.setSupplierName(supplier.getName());
             //设置成本中心
             centerGoods.setCenterType(CENTER_TYPE);
-            centerGoods.setCenterId(supplier.getId());
+            centerGoods.setCenterId(costCenter.getId()+"");
-            centerGoods.setCenterCode(supplier.getCode());
+            centerGoods.setCenterCode(costCenter.getCode());
-            centerGoods.setCenterName(supplier.getName());
+            centerGoods.setCenterName(costCenter.getName());
             centerGoods.setCenterRate(OneHundred);
             centerGoods.setCenterAmount(totalAmount);
             //设置科目
@@ -727,7 +735,7 @@ public class PortalOfCostApplication {
                 Arrays.asList(activity),
                 Arrays.asList(activitySubject),
                 activityCenterGoodsList,
-                Arrays.asList(activityCenter),true,false,false);
+                Arrays.asList(activityCenter),false,false,false);
 
         //不匹配的商品，保存到无预算表
         List<TbsBudgetCostItem> unMatchBudgetItem =  budgetCostResult.getBudgetUnMatchList();
@@ -763,8 +771,7 @@ public class PortalOfCostApplication {
 
         //保存核销申请
         VtbVerification verification = new VtbVerification();
-        verification.setVerificationCode("HX"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
+        verification.setVerificationCode("MHX"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification));
-        verification.setVerificationMainCode(verification.getVerificationCode());
         verification.setCostApplyId(costApply.getId());
         verification.setFinishedTime(nowTime);
         verification.setVerificationState(VtbVerificationState.Finished.getCode());
@@ -804,7 +811,7 @@ public class PortalOfCostApplication {
 
         ThirtyVerification tv = new ThirtyVerification();
         tv.setId(IdUtil.getSnowFlakeId()+"");
-        tv.setVerificationCode(verification.getVerificationMainCode());
+        tv.setVerificationCode(verificationSubject.getVerificationSubCode());
         tv.setActivityTitle(activityTitle);
         //tv.setActivityCode(activityCode);
         tv.setCreateDate(timeString);
@@ -815,17 +822,17 @@ public class PortalOfCostApplication {
         tv.setMoney(totalAmount);
         //tv.setCreateUser();
         tv.setCreateTime(timeString);
-        tv.setCheckUser(user.getName());
+        //tv.setCheckUser(user.getName());
         tv.setCheckTime(timeString);
         tv.setCusCode(supplier.getCode());
         tv.setCusName(supplier.getName());
-        tv.setRecId(verificationSubject.getVerificationMainCode());
+        tv.setRecId(verificationSubject.getVerificationSubCode());
         String COST_TO_PAY_API = projectApisProperties.getCostToPay();
         String json = JsonUtil.objectToJson(tv);
-        log.info("COST_TO_PAY_API 支付单信息:{} 数据：{}",verification.getVerificationMainCode(),json);
+        log.info("COST_TO_PAY_API 支付单信息:{} 数据：{}",verificationSubject.getVerificationSubCode(),json);
         String rs = HttpUtil.doPost(COST_TO_PAY_API,json,null);
         if(rs==null||!rs.contains("200")){
-            log.error("COST_TO_PAY_API \n 请求参数：{}，\n 支付单信息：{},\n 结果：{}",json,verification.getVerificationMainCode(),rs);
+            log.error("COST_TO_PAY_API \n 请求参数：{}，\n 支付单信息：{},\n 结果：{}",json,verificationSubject.getVerificationSubCode(),rs);
             //核销调度接口事务补偿
             costApplyService.removeById(costApply.getId());
             activityService.removeById(activity.getId());

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

@@ -66,11 +66,14 @@
         bms_channel_point.`update_by`    </sql>
 
     <select id="selectChannelPointList" parameterType="com.qs.serve.modules.bms.entity.BmsChannelPoint" resultMap="bmsChannelPointMap">
-        SELECT <include refid="bmsChannelPointSql"/>
+        SELECT
+            <include refid="bmsChannelPointSql"/>,
+            bms_channel.channel_type
         FROM `bms_channel_point` `bms_channel_point`
         <if test="query.supplierId!=null and query.supplierId!=''">
             LEFT JOIN bms_supplier_channel ON bms_supplier_channel.`channel_id` = `bms_channel_point`.`channel_id`
         </if>
+            LEFT JOIN bms_channel ON bms_channel.`id` = `bms_channel_point`.`channel_id`
         <where>
             and `bms_channel_point`.`del_flag` = 0
             <if test="query.supplierId!=null and query.supplierId!=''">
@@ -84,7 +87,9 @@
             </if>
             <if test="query.id != null"> and `bms_channel_point`.`id` = #{query.id}</if>
             <if test="query.channelId != null"> and `bms_channel_point`.`channel_id` = #{query.channelId}</if>
+            <if test="query.channelType != null and query.channelType != ''"> and `bms_channel`.`channel_type` like concat('%',#{query.channelType},'%') </if>
             <if test="query.channelName != null and query.channelName != ''"> and `bms_channel_point`.`channel_name` like concat('%',#{query.channelName},'%') </if>
+            <if test="query.channelCode != null and query.channelCode != ''"> and `bms_channel_point`.`channel_code` like concat('%',#{query.channelCode},'%') </if>
             <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
             <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
             <if test="query.shopArea != null and query.shopArea != ''"> and `bms_channel_point`.`shop_area` = #{query.shopArea}</if>

src/main/resources/mapper/seeyon/CommonCheckMapper.xml

@@ -5,13 +5,139 @@
 <mapper namespace="com.qs.serve.modules.seeyon.mapper.CommonCheckMapper">
 
     <select id="pageCallbackList" resultType="com.qs.serve.modules.seeyon.entity.vo.TodoVO">
+        <if test="query.targetType == 'CostBill'">
             select
             'CostBill' as target_type,
             cost.id as target_id,
             cost.`code` as target_code,
             cost.charge_theme as title,
-            cost.submit_time
+            cost.submit_time as `time`
             from tbs_cost_apply cost where cost.charge_state = 4 and cost.user_id = #{query.userId} and cost.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and cost.charge_theme like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and cost.code like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and cost.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and cost.submit_time &lt;= #{query.endDate}
+            </if>
+        </if>
+        <if test="query.targetType == 'ReleasePolicy'">
+            select
+            'ReleasePolicy' as target_type,
+            policy.id as target_id,
+            policy.policy_code as target_code,
+            policy.title,
+            policy.submit_time as `time`
+            from tzc_policy policy where policy.policy_status = 4 and policy.user_id = #{query.userId} and policy.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and policy.title like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and policy.policy_code like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and policy.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and policy.submit_time &lt;= #{query.endDate}
+            </if>
+        </if>
+
+        <if test="query.targetType == 'CheckCost'">
+            select
+            'CheckCost' as target_type,
+            vtb.id as target_id,
+            vtb.`verification_code` as target_code,
+            act.act_title as title,
+            vtb.create_time as `time`
+            from vtb_verification vtb
+            left join tbs_activity act on vtb.activity_id = act.id
+            where vtb.verification_state = 3 and vtb.user_id = #{query.userId} and act.del_flag = 0 and vtb.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and act.act_title like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and vtb.`verification_code` like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and vtb.create_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and vtb.create_time &lt;= #{query.endDate}
+            </if>
+        </if>
+
+        <if test="query.targetType == 'budgetAdjust'">
+            select
+            'budgetAdjust' as target_type,
+            budget.id as target_id,
+            budget.budget_number as target_code,
+            budget.budget_code as title,
+            budget.submit_time as `time`
+            from tbs_budget budget
+            where budget.budget_check_state = 3 and budget.user_id = #{query.userId} and budget.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and budget.budget_code like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and budget.budget_number like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and budget.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and budget.submit_time &lt;= #{query.endDate}
+            </if>
+        </if>
+
+        <if test="query.targetType == 'budgetAdjust2'">
+            select
+            'budgetAdjust2' as target_type,
+            budget_change.id as target_id,
+            budget_change.change_code as target_code,
+            budget_change.budget_title as title,
+            budget_change.submit_time as `time`
+            from tbs_budget_change budget_change
+            where budget_change.budget_check_state = 3 and budget_change.user_id = #{query.userId} and budget_change.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and budget_change.budget_title like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and budget_change.change_code  like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and budget_change.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and budget_change.submit_time &lt;= #{query.endDate}
+            </if>
+        </if>
+
+        <if test="query.targetType == null ">
+            select
+                'CostBill' as target_type,
+                cost.id as target_id,
+                cost.`code` as target_code,
+                cost.charge_theme as title,
+                cost.submit_time as `time`
+            from tbs_cost_apply cost where cost.charge_state = 4 and cost.user_id = #{query.userId} and cost.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and cost.charge_theme like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and cost.code like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and cost.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and cost.submit_time &lt;= #{query.endDate}
+            </if>
             UNION
             select
                 'ReleasePolicy' as target_type,
@@ -20,67 +146,240 @@
                 policy.title,
                 policy.submit_time
             from tzc_policy policy where policy.policy_status = 4 and policy.user_id = #{query.userId} and policy.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and policy.title like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and policy.policy_code  like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and policy.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and policy.submit_time &lt;= #{query.endDate}
+            </if>
             UNION
             select
                 'CheckCost' as target_type,
                 vtb.id as target_id,
                 vtb.`verification_code` as target_code,
                 act.act_title as title,
-            vtb.create_time as submit_time
+                vtb.create_time as `time`
             from vtb_verification vtb
                      left join tbs_activity act on vtb.activity_id = act.id
             where vtb.verification_state = 3 and vtb.user_id = #{query.userId} and act.del_flag = 0 and vtb.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and act.act_title like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and vtb.`verification_code` like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and vtb.create_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and vtb.create_time &lt;= #{query.endDate}
+            </if>
             UNION
             select
                 'budgetAdjust' as target_type,
                 budget.id as target_id,
                 budget.budget_number as target_code,
                 budget.budget_code as title,
-            budget.submit_time
+                budget.submit_time as `time`
             from tbs_budget budget
             where budget.budget_check_state = 3 and budget.user_id = #{query.userId} and budget.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and budget.budget_code like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and budget.budget_number like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and budget.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and budget.submit_time &lt;= #{query.endDate}
+            </if>
             UNION
             select
                 'budgetAdjust2' as target_type,
                 budget_change.id as target_id,
                 budget_change.change_code as target_code,
                 budget_change.budget_title as title,
-            budget_change.submit_time
+                budget_change.submit_time as `time`
             from tbs_budget_change budget_change
             where budget_change.budget_check_state = 3 and budget_change.user_id = #{query.userId} and budget_change.del_flag = 0
+            <if test="query.title !=null and query.title != ''">
+                and budget_change.budget_title like concat('%',#{query.title},'%')
+            </if>
+            <if test="query.targetCode !=null and query.targetCode != ''">
+                and budget_change.change_code like concat('%',#{query.targetCode},'%')
+            </if>
+            <if test="query.startDate !=null">
+                and budget_change.submit_time &gt;= #{query.startDate}
+            </if>
+            <if test="query.endDate !=null">
+                and budget_change.submit_time &lt;= #{query.endDate}
+            </if>
+        </if>
         limit #{query.startRow},#{query.pageSize}
     </select>
 
     <select id="countCallback" resultType="java.lang.Long">
         select count(0) from (
+            <if test="query.targetType == 'CostBill'">
                 select
                 'CostBill' as target_type,
                 cost.id as target_id
                 from tbs_cost_apply cost where cost.charge_state = 4 and cost.user_id = #{query.userId} and cost.del_flag = 0
-             UNION
+                <if test="query.title !=null and query.title != ''">
+                    and cost.charge_theme like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and cost.code like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and cost.submit_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and cost.submit_time &lt;= #{query.endDate}
+                </if>
+            </if>
+            <if test="query.targetType == 'ReleasePolicy'">
                 select
                 'ReleasePolicy' as target_type,
                 policy.id as target_id
                 from tzc_policy policy where policy.policy_status = 4 and policy.user_id = #{query.userId} and policy.del_flag = 0
-             UNION
+                <if test="query.title !=null and query.title != ''">
+                    and policy.title like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and policy.policy_code like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and policy.submit_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and policy.submit_time &lt;= #{query.endDate}
+                </if>
+            </if>
+            <if test="query.targetType == 'CheckCost'">
                 select
                 'CheckCost' as target_type,
                 vtb.id as target_id
                 from vtb_verification vtb
                 left join tbs_activity act on vtb.activity_id = act.id
                 where vtb.verification_state = 3 and vtb.user_id = #{query.userId} and vtb.del_flag = 0
-             UNION
+
+            </if>
+            <if test="query.targetType == 'budgetAdjust'">
                 select
                 'budgetAdjust' as target_type,
                 budget.id as target_id
                 from tbs_budget budget
                 where budget.budget_check_state = 3 and budget.user_id = #{query.userId} and budget.del_flag = 0
-             UNION
+            </if>
+            <if test="query.targetType == 'budgetAdjust2'">
+                select
+                'budgetAdjust2' as target_type,
+                budget_change.id as target_id
+                from tbs_budget_change budget_change
+                where budget_change.budget_check_state = 3 and budget_change.user_id = #{query.userId} and budget_change.del_flag = 0
+            </if>
+            <if test="query.targetType == null ">
+                select
+                'CostBill' as target_type,
+                cost.id as target_id
+                from tbs_cost_apply cost where cost.charge_state = 4 and cost.user_id = #{query.userId} and cost.del_flag = 0
+                <if test="query.title !=null and query.title != ''">
+                    and cost.charge_theme like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and cost.code like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and cost.submit_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and cost.submit_time &lt;= #{query.endDate}
+                </if>
+
+                union
+                select
+                'ReleasePolicy' as target_type,
+                policy.id as target_id
+                from tzc_policy policy where policy.policy_status = 4 and policy.user_id = #{query.userId} and policy.del_flag = 0
+                <if test="query.title !=null and query.title != ''">
+                    and policy.title like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and policy.policy_code like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and policy.submit_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and policy.submit_time &lt;= #{query.endDate}
+                </if>
+
+                union
+                select
+                'CheckCost' as target_type,
+                vtb.id as target_id
+                from vtb_verification vtb
+                left join tbs_activity act on vtb.activity_id = act.id
+                where vtb.verification_state = 3 and vtb.user_id = #{query.userId} and vtb.del_flag = 0
+                <if test="query.title !=null and query.title != ''">
+                    and act.act_title like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and vtb.`verification_code` like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and vtb.create_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and vtb.create_time &lt;= #{query.endDate}
+                </if>
+
+                union
+                select
+                'budgetAdjust' as target_type,
+                budget.id as target_id
+                from tbs_budget budget
+                where budget.budget_check_state = 3 and budget.user_id = #{query.userId} and budget.del_flag = 0
+                <if test="query.title !=null and query.title != ''">
+                    and budget.budget_code like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and budget.budget_number like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and budget.submit_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and budget.submit_time &lt;= #{query.endDate}
+                </if>
+                union
                 select
                 'budgetAdjust2' as target_type,
                 budget_change.id as target_id
                 from tbs_budget_change budget_change
                 where budget_change.budget_check_state = 3 and budget_change.user_id = #{query.userId} and budget_change.del_flag = 0
+                <if test="query.title !=null and query.title != ''">
+                    and budget_change.budget_title like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and budget_change.change_code  like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and budget_change.submit_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and budget_change.submit_time &lt;= #{query.endDate}
+                </if>
+            </if>
         ) tmp_tb
     </select>
 

src/main/resources/mapper/tbs/TbsBudgetMapper.xml

@@ -79,8 +79,9 @@
                     #{selectId}
                 </foreach>
             </if>
-            <if test="query.budgetNumber !=null "> and `tbs_budget`.`budget_number` like concat('%',#{query.budgetNumber},'%')</if>
+            <if test="query.budgetNumber !=null and query.budgetNumber !='' "> and `tbs_budget`.`budget_number` like concat('%',#{query.budgetNumber},'%')</if>
             <if test="query.budgetState !=null "> and `tbs_budget`.`budget_state` = #{query.budgetState}</if>
+            <if test="query.budgetCheckState !=null "> and `tbs_budget`.`budget_check_state` = #{query.budgetCheckState}</if>
             <if test="query.budgetCode != null and query.budgetCode != ''"> and `tbs_budget`.`budget_code` like concat('%',#{query.budgetCode},'%')</if>
             <if test="query.subjectValue != null and query.subjectValue != ''">
                 and (
@@ -98,7 +99,7 @@
             </if>
             <if test="query.scheduleId != null"> and `tbs_budget`.`schedule_id` = #{query.scheduleId}</if>
             <if test="query.scheduleCode != null and query.scheduleCode != ''"> and `tbs_budget`.`schedule_code` = #{query.scheduleCode}</if>
-            <if test="query.scheduleName != null and query.scheduleName != ''"> and `tbs_budget`.`schedule_name` = #{query.scheduleName}</if>
+            <if test="query.scheduleName != null and query.scheduleName != ''"> and `tbs_budget`.`schedule_name` like concat('%',#{query.scheduleName},'%') </if>
             <if test="query.brandValue != null and query.brandValue != ''">
                 and (
                     `tbs_budget_condition`.`target_type` = 'brand'

src/main/resources/mapper/tbs/TbsCostApplyMapper.xml

@@ -51,6 +51,7 @@
         tbs_cost_apply.`supplier_biz_region_second_name`,
         tbs_cost_apply.`supplier_biz_region_third_name`,
         tbs_cost_apply.`charge_state`,
+        tbs_cost_apply.`check_state`,
         tbs_cost_apply.`submit_time`,
         tbs_cost_apply.`pass_time`,
         tbs_cost_apply.`remark`,
@@ -142,6 +143,7 @@
 
 
     <sql id="baseWhere4CostApply">
+        <if test="query.checkState != null"> and `tbs_cost_apply`.`check_state` = #{query.checkState}</if>
         <if test="query.id != null"> and `tbs_cost_apply`.`id` = #{query.id}</if>
         <if test="query.code != null and query.code != ''"> and `tbs_cost_apply`.`code` like concat('%', #{query.code},'%')</if>
         <if test="query.chargeTheme != null and query.chargeTheme != ''"> and `tbs_cost_apply`.`charge_theme` like concat('%', #{query.chargeTheme},'%')</if>