添加逾期

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -16,12 +16,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import com.qs.serve.modules.bir.entity.BirRoiRate;
 import com.qs.serve.modules.bir.service.BirRoiRateService;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -43,9 +39,9 @@ public class BirRoiRateController {
      * @return
      */
     @GetMapping("/test")
-    public R<PageVo<BirRoiRate>> getPage(){
+    public R<?> getPage(){
         //移除当年所有
-        Integer year = 2023;
+        int year = 2023;
         LambdaQueryWrapper<BirBaseActivity> rmLqw = new LambdaQueryWrapper<>();
         rmLqw.likeRight(BirBaseActivity::getKeyNum,year);
         activityService.remove(rmLqw);

src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java

@@ -39,6 +39,8 @@ public class BirBaseActivity implements Serializable {
     @NotNull(message = "活动id不能为空")
     private Long activityId;
 
+    private Long costApplyId;
+
     /** 活动金额(费用投入金额) */
     @NotNull(message = "活动金额(费用投入金额)不能为空")
     private BigDecimal activityAmt;
@@ -51,6 +53,8 @@ public class BirBaseActivity implements Serializable {
     @NotNull(message = "核销金额不能为空")
     private BigDecimal verificationAmt;
 
+    private Long preActQuantity;
+
     /** 客户id */
     @NotNull(message = "客户id不能为空")
     private Long supplierId;

src/main/java/com/qs/serve/modules/bir/entity/BirRoiRate.java

@@ -107,28 +107,28 @@ public class BirRoiRate implements Serializable {
     private String delFlag;
 
 
-	public static BirRoiRate toNewObject(BirRoiRate source){
-		BirRoiRate roiRate = new BirRoiRate();
-		roiRate.setId(source.getId());
-		roiRate.setKeyNum(source.getKeyNum());
-		roiRate.setActivityAmt(source.getActivityAmt());
-		roiRate.setVerificationAmt(source.getVerificationAmt());
-		roiRate.setActivityState(source.getActivityState());
-		roiRate.setShipmentType(source.getShipmentType());
-		roiRate.setShipmentQty(source.getShipmentQty());
-		roiRate.setShipmentAmt(source.getShipmentAmt());
-		roiRate.setSupplierId(source.getSupplierId());
-		roiRate.setSupplierCode(source.getSupplierCode());
-		roiRate.setSupplierName(source.getSupplierName());
-		roiRate.setUserId(source.getUserId());
-		roiRate.setUserCode(source.getUserCode());
-		roiRate.setUserName(source.getUserName());
-		roiRate.setCreateTime(source.getCreateTime());
-		roiRate.setUpdateTime(source.getUpdateTime());
-		roiRate.setTenantId(source.getTenantId());
-		roiRate.setDelFlag(source.getDelFlag());
-		return roiRate;
-	}
+//	public static BirRoiRate toNewObject(BirRoiRate source){
+//		BirRoiRate roiRate = new BirRoiRate();
+//		roiRate.setId(source.getId());
+//		roiRate.setKeyNum(source.getKeyNum());
+//		roiRate.setActivityAmt(source.getActivityAmt());
+//		roiRate.setVerificationAmt(source.getVerificationAmt());
+//		roiRate.setActivityState(source.getActivityState());
+//		roiRate.setShipmentType(source.getShipmentType());
+//		roiRate.setShipmentQty(source.getShipmentQty());
+//		roiRate.setShipmentAmt(source.getShipmentAmt());
+//		roiRate.setSupplierId(source.getSupplierId());
+//		roiRate.setSupplierCode(source.getSupplierCode());
+//		roiRate.setSupplierName(source.getSupplierName());
+//		roiRate.setUserId(source.getUserId());
+//		roiRate.setUserCode(source.getUserCode());
+//		roiRate.setUserName(source.getUserName());
+//		roiRate.setCreateTime(source.getCreateTime());
+//		roiRate.setUpdateTime(source.getUpdateTime());
+//		roiRate.setTenantId(source.getTenantId());
+//		roiRate.setDelFlag(source.getDelFlag());
+//		return roiRate;
+//	}
 
 }
 

src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java

@@ -16,6 +16,10 @@ import java.util.List;
  */
 public interface BirRoiRateMapper extends BaseMapper<BirRoiRate> {
 
+
+    @InterceptorIgnore(tenantLine = "1")
+    List<BirRoiCostItemVo> queryForecastRoiCostItems(@Param("query") BirRoiCostDTO param);
+
     @InterceptorIgnore(tenantLine = "1")
     List<BirRoiCostItemVo> queryRoiCostItems(@Param("query") BirRoiCostDTO param);
 

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

@@ -38,7 +38,6 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
 
     private final TbsActivityMapper activityMapper;
     private final TbsCostApplyMapper costApplyMapper;
-    private final SysUserMapper userMapper;
 
     @Override
     public void buildReport(int year, int month) {
@@ -111,9 +110,11 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
             TbsCostApply costApply = costApplyMapper.selectById(activity.getCostApplyId());
             baseActivity.setKeyNum(yearMonth);
             baseActivity.setActivityId(activity.getId());
+            baseActivity.setCostApplyId(costApply.getId());
             baseActivity.setActivityAmt(currentAmount);
             baseActivity.setActivityTotalAmt(activity.getTotalAmount());
             baseActivity.setVerificationAmt(currentCheckAmount);
+            baseActivity.setPreActQuantity(activity.getPreActQuantity());
             baseActivity.setSupplierId(activity.getSupplierId());
             baseActivity.setSupplierCode(activity.getSupplierCode());
             baseActivity.setSupplierName(activity.getSupplierName());

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

@@ -48,7 +48,18 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
 
     @Override
     public List<BirRoiCostItemVo> queryRoiCostItems(BirRoiCostDTO param) {
-        return baseMapper.queryRoiCostItems(param);
+        List<BirRoiCostItemVo> realDataList = baseMapper.queryRoiCostItems(param);
+        List<BirRoiCostItemVo> forecastDataList = baseMapper.queryForecastRoiCostItems(param);
+        //合并数据
+        for (BirRoiCostItemVo data1 : realDataList) {
+            for (BirRoiCostItemVo data2 : forecastDataList) {
+                if(data1.getYearMonth().equals(data2.getYearMonth())){
+                    data1.setCostAmt(data1.getCostAmt().add(data2.getCostAmt()));
+                    data1.setCheckAmt(data1.getCheckAmt().add(data2.getCheckAmt()));
+                }
+            }
+        }
+        return realDataList;
     }
 
     @Override

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -111,6 +111,7 @@ public class BmsRegionController {
             List<BmsRegion> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
             List<BmsRegion> list4 = listMap.get(4)==null?new ArrayList<>():listMap.get(4);
 
+            //return allList替换allSelectList代表 返回含该节点下级的数据，当前使用allSelectList
             List<BmsRegion> allList = new ArrayList<>();
             if(CollectionUtil.isNotEmpty(list1)){
                 allList.addAll(list1);
@@ -135,21 +136,22 @@ public class BmsRegionController {
                 }
             }
 
+            List<BmsRegion> allSelectList = new ArrayList<>();
             if(CollectionUtil.isNotEmpty(list2)){
                 List<String> lv02Pids = list2.stream().map(BmsRegion::getId).collect(Collectors.toList());
                 List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
                 if(CollectionUtil.isNotEmpty(level03List)){
-                    allList.addAll(level03List);
+                    allSelectList.addAll(level03List);
                     //list3 去重
                     list3 = removeExistList(list3,level03List);
                     List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
                     List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
                     //list4 去重
                     list4 = removeExistList(list4,level04List);
-                    allList.addAll(level04List);
+                    allSelectList.addAll(level04List);
                 }
                 list2.forEach(a->a.setPid("0"));
-                allList.addAll(list2);
+                allSelectList.addAll(list2);
             }
 
             if(CollectionUtil.isNotEmpty(list3)){
@@ -157,17 +159,17 @@ public class BmsRegionController {
                 List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
                 //list4 去重
                 list4 = removeExistList(list4,level04List);
-                allList.addAll(level04List);
+                allSelectList.addAll(level04List);
                 list3.forEach(a->a.setPid("0"));
-                allList.addAll(list3);
+                allSelectList.addAll(list3);
             }
 
             if(CollectionUtil.isNotEmpty(list4)){
                 //list4 去重
                 list4.forEach(a->a.setPid("0"));
-                allList.addAll(list4);
+                allSelectList.addAll(list4);
             }
-            return toTreeNodeList2(allList);
+            return toTreeNodeList2(allSelectList);
 
         }
         return null;

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

@@ -301,6 +301,7 @@ public class BmsSupplier implements Serializable {
         userSupplier.setBizRegionSecond(this.getRegion2Second());
         userSupplier.setBizRegionThird(this.getRegion2Third());
         userSupplier.setBizRegionFourthly(this.getRegion2Fourthly());
+        userSupplier.setSupplierFlag(this.getSupplierFlag());
         userSupplier.setType(type);
         userSupplier.setCostFlag(this.costFlag);
         return userSupplier;
@@ -325,6 +326,7 @@ public class BmsSupplier implements Serializable {
         userSupplier.setBizRegionSecond(this.getRegion2Second());
         userSupplier.setBizRegionThird(this.getRegion2Third());
         userSupplier.setBizRegionFourthly(this.getRegion2Fourthly());
+        userSupplier.setSupplierFlag(this.getSupplierFlag());
         userSupplier.setType(type);
         userSupplier.setCostFlag(this.costFlag);
         return userSupplier;

src/main/java/com/qs/serve/modules/his/controller/HistTestController.java

@@ -2,6 +2,8 @@ package com.qs.serve.modules.his.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.common.model.consts.RedisCacheKeys;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.PageUtil;
@@ -31,10 +33,12 @@ public class HistTestController {
 
     HisUserChannelPointService hisUserChannelPointService;
     HisTask hisTask;
+    RedisService redisService;
 
     @GetMapping("/initSupplier")
     public R<?> initSupplier(){
         if(DevEnvironmentConfig.isDev()){
+            redisService.set(RedisCacheKeys.HIS_UPDATE,1);
             hisTask.buildTempTable();
         }
         return R.ok();

src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java

@@ -105,6 +105,9 @@ public class HisUserSupplier implements Serializable {
 
     private Integer costFlag;
 
+    /** 是否供应商 */
+    private Integer supplierFlag;
+
     @TableField(exist = false)
     private String queryAddress;
 

src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java

@@ -75,6 +75,9 @@ public class HisUserSupplierTemp implements Serializable {
     @NotNull(message = "主要负责人不能为空")
     private Integer masterFlag;
 
+    /** 是否供应商 */
+    private Integer supplierFlag;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java

@@ -43,6 +43,12 @@ public class CtpAffairQo {
      */
     String chargeTheme;
 
+    /**
+     * 记录编码
+     */
+    String recordCode;
+
+
     /**
      * 申请人名称
      */

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -157,7 +157,9 @@ public interface SeeYonOperationService extends SeeYonBaseService{
      * @return
      */
     default R<PageVo<CtpAffairVo>> pageMemberAffair(CtpAffairQo param){
-        param.setTitle(param.getChargeTheme());
+        if(param.getChargeTheme()!=null){
+            param.setTitle(param.getChargeTheme());
+        }
         if(param.getUserName()!=null){
             param.setApplyUserName(param.getUserName());
         }

src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java

@@ -16,6 +16,19 @@ import java.time.LocalDate;
  */
 public class TbsActivityUtil {
 
+    public static Integer getSysConfOfWarningDays(){
+        int sysConfOfWarningDays = 0;
+        try {
+            SysConfigService configService = SpringUtils.getBean(SysConfigService.class);
+            SysConfig config = configService.getByKey("ExpenseApplicationActivityWriteOffOverdueWarningDays");
+            String val = config.getConfigValue();
+            sysConfOfWarningDays = Integer.parseInt(val);
+        } catch (BeansException | NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return sysConfOfWarningDays;
+    }
+
     public static void buildOverdue(LambdaQueryWrapper<TbsActivity> lqw,Integer queryState){
         if(queryState!=null){
             if(queryState.equals(0)){
@@ -24,15 +37,7 @@ public class TbsActivityUtil {
                 lqw.le(TbsActivity::getActEndDate, LocalDate.now());
             }else if(queryState.equals(2)){
                 LocalDate now = LocalDate.now();
-                int sysConfOfWarningDays = 0;
-                try {
-                    SysConfigService configService = SpringUtils.getBean(SysConfigService.class);
-                    SysConfig config = configService.getByKey("ExpenseApplicationActivityWriteOffOverdueWarningDays");
-                    String val = config.getConfigValue();
-                    sysConfOfWarningDays = Integer.parseInt(val);
-                } catch (BeansException | NumberFormatException e) {
-                    e.printStackTrace();
-                }
+                int sysConfOfWarningDays = getSysConfOfWarningDays();
                 LocalDate startNow = now.plusDays( - sysConfOfWarningDays );
                 lqw.between(TbsActivity::getActEndDate,startNow , now);
             }else {

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

@@ -99,6 +99,7 @@ public class TbsActivityController {
         LambdaQueryWrapper<TbsActivity> lqw = new LambdaQueryWrapper<>(entity);
         TbsActivityUtil.buildOverdue(lqw,param.getOverdueState());
         List<TbsActivity> list = tbsActivityService.list(lqw);
+        int overflowDays = TbsActivityUtil.getSysConfOfWarningDays();
         for (TbsActivity activity : list) {
             QueryWrapper qw = new QueryWrapper<>();
             qw.eq("activity_id",activity.getId());
@@ -111,6 +112,7 @@ public class TbsActivityController {
             List<TbsActivitySubject> activitySubjects = activitySubjectService.list(qw);
             activity.setSubjectCenterList(activitySubjects);
             this.buildDetailVo(activity);
+            activity.initWarningDay(overflowDays);
         }
         return R.ok(list);
     }
@@ -135,6 +137,7 @@ public class TbsActivityController {
         lqw.orderByDesc(TbsActivity::getId);
         PageUtil.startPage();
         List<TbsActivity> listObjects = tbsActivityService.list(lqw);
+        int overflowDays = TbsActivityUtil.getSysConfOfWarningDays();
         if(listObjects.size()>0){
             List<Long> listIds = listObjects.stream().map(a->a.getId()).collect(Collectors.toList());
             List<TbsActivity> list = tbsActivityService.listByIds(listIds);
@@ -144,6 +147,7 @@ public class TbsActivityController {
             }
             List<SysUser> sysUsers = sysUserService.listByIds(userIds);
             for (TbsActivity activity : list) {
+                activity.initWarningDay(overflowDays);
                 if(activity.getCreateBy()==null){
                     continue;
                 }

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
+import java.time.Period;
 import java.util.List;
 /**
  * 费用活动 实体类
@@ -142,6 +143,8 @@ public class TbsActivity implements Serializable {
     @TableField(fill = FieldFill.UPDATE)
     private LocalDateTime finishedTime;
 
+    private Integer preActFlag;
+
     /** 预计活动销量 */
     private Long preActQuantity;
 
@@ -231,14 +234,38 @@ public class TbsActivity implements Serializable {
     @TableField(exist = false)
     private Integer expenseApplicationActivityWriteOffOverdueWarningDays;
 
+    /**
+     * overdueState【0=>未逾期、1=>已逾期、2=>即将逾期】
+     */
+    @TableField(exist = false)
+    private Integer overdueState;
+
     /**
      * 处理预警时间
      * @param preDays
      */
     public void initWarningDay(int preDays){
-        if(this.getActivityState().equals(1)){
-            Duration duration = Duration.between(this.getActEndDate(),LocalDate.now());
-            overdueWarningDays = duration.toDays();
+        overdueWarningDays = 0L;
+        if(     !this.getActivityState().equals(2)
+                &&!this.getActivityState().equals(5)
+                &&this.getActEndDate()!=null){
+            try {
+                LocalDate now = LocalDate.now();
+                LocalDate end = this.getActEndDate();
+                Period duration;
+                duration = Period.between(now,end);
+                overdueWarningDays = (long)duration.getDays();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        expenseApplicationActivityWriteOffOverdueWarningDays = preDays;
+        if(overdueWarningDays >= expenseApplicationActivityWriteOffOverdueWarningDays){
+            overdueState = 0;
+        }else if(overdueWarningDays<0){
+            overdueState = 1;
+        }else {
+            overdueState = 2;
         }
     }
 

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java

@@ -62,6 +62,11 @@ public class TbsActivityBo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate preCheckDate;
 
+    /**
+     * 预算销量标识
+     */
+    private Integer preActFlag;
+
     /** 预计活动销量 */
     private Long preActQuantity;
 

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

@@ -131,8 +131,14 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
         activity.setSupplierId(Long.parseLong(supplier.getId()));
         activity.setSupplierCode(supplier.getCode());
         activity.setSupplierName(supplier.getName());
-        activity.setPreActQuantity(activityBo.getPreActQuantity());
-        activity.setPreNotActQuantity(activityBo.getPreNotActQuantity());
+        activity.setPreActFlag(activityBo.getPreActFlag());
+        if(activityBo.getPreActFlag()==null||activityBo.getPreActFlag().equals(0)){
+            activity.setPreActQuantity(0L);
+            activity.setPreNotActQuantity(0L);
+        }else {
+            activity.setPreActQuantity(activityBo.getPreActQuantity());
+            activity.setPreNotActQuantity(activityBo.getPreNotActQuantity());
+        }
         activity.setPreRoiRate(activityBo.getPreRoiRate());
         boolean isUpdate = activity.getId()!=null;
         activity.setTotalAmount(totalAmount);

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

@@ -163,6 +163,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         this.releaseCost(tbsCostApply.getId(),0);
         Map<String, Object> data = new HashMap<>(10);
         String actTitles = activityList.stream().map(TbsActivity::getActTitle).collect(Collectors.joining("; "));
+        data.put("costApplyCode",tbsCostApply.getCode());
         data.put("applyUserCode",sysUser.getCode());
         data.put("applyUserName",sysUser.getName());
         data.put("supplierName",tbsCostApply.getSupplierName());

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@@ -262,7 +262,9 @@ public class TzcPolicyController {
      * @return
      */
     @GetMapping("/pageMemberAffair")
-    public R<PageVo<CtpAffairVo>> pageMemberAffair(CtpAffairQo param){
+    public R<PageVo<CtpAffairVo>> pageMemberAffair(CtpAffairQo param,
+                                                   String policyCode){
+        param.setRecordCode(policyCode);
         return tzcPolicyOperationService.pageMemberAffair(param);
 //        param.setTitle(param.getChargeTheme());
 //        param.setApplyUserName(param.getUserName());

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -162,6 +162,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         sysUser.checkSyAccount();
         Map<String, Object> data = new HashMap<>(10);
+        data.put("exsp3",tzcPolicy.getPolicyCode());
         data.put("applyUserCode",sysUser.getCode());
         data.put("applyUserName",sysUser.getName());
         data.put("supplierName",tzcPolicy.getSupplierName());

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -358,6 +358,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
      */
     private void commitSy(String actTitle,SysUser sysUser,VtbVerification verification,String saleRegionNames,String bizRegionNames){
         Map<String, Object> data = new HashMap<>(20);
+        data.put("costApplyCode",verification.getVerificationCode());
         data.put("applyUserCode",sysUser.getCode());
         data.put("applyUserName",sysUser.getName());
         data.put("supplierName",verification.getSupplierName());

src/main/java/com/qs/serve/task/HisTask.java

@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Component
 @AllArgsConstructor
-@ConditionalOnProperty(value = "project.task", havingValue = "true")
+//@ConditionalOnProperty(value = "project.task", havingValue = "true")
 public class HisTask {
 
     RedisService redisService;

src/main/resources/mapper/bir/BirRoiRateMapper.xml

@@ -46,6 +46,44 @@
         <result property="checkAmt"  column="check_amt"/>
     </resultMap>
 
+    <select id="queryForecastRoiCostItems" resultType="com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo" resultMap="BirRoiCostItemVoMap">
+        SELECT
+        key_num AS `year_month`,
+        min( start_date ) AS year_month_date,
+        sum(bir_base_activity.pre_act_quantity) as cost_amt,
+        sum(bir_base_activity.verification_amt) as check_amt
+        FROM
+        `bir_base_activity` left join `tbs_cost_apply` on `bir_base_activity`.cost_apply_id = `tbs_cost_apply`.id
+        <where>
+             tbs_cost_apply.charge_state in (1,2)
+            and bir_base_activity.key_num &gt;= #{query.startMonthNum}
+            and bir_base_activity.key_num &lt;= #{query.endMonthNum}
+            <if test="query.supplierId!=null and query.supplierId!=''">
+                and bir_base_activity.supplier_id = #{query.supplierId}
+            </if>
+            <if test="query.userId!=null and query.userId!=''">
+                and bir_base_activity.supplier_id != #{query.notSupplierId}
+                and bir_base_activity.user_id = #{query.userId}
+            </if>
+            <if test="query.supplierIds!=null and query.supplierIds.size > 0">
+                and bir_base_activity.supplier_id in
+                <foreach collection="query.supplierIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
+            <if test="query.userIds!=null and query.userIds.size > 0">
+                and bir_base_activity.user_id in
+                <foreach collection="query.userIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY
+        `year_month`
+        ORDER BY
+        `year_month` desc
+    </select>
+
 
     <select id="queryRoiCostItems" resultType="com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo" resultMap="BirRoiCostItemVoMap">
         SELECT
@@ -54,25 +92,26 @@
             sum(bir_base_activity.activity_total_amt) as cost_amt,
             sum(bir_base_activity.verification_amt) as check_amt
         FROM
-            `bir_base_activity`
+            `bir_base_activity` left join `tbs_cost_apply` on `bir_base_activity`.cost_apply_id = `tbs_cost_apply`.id
         <where>
+             tbs_cost_apply.charge_state = 3
             and bir_base_activity.key_num &gt;= #{query.startMonthNum}
             and bir_base_activity.key_num &lt;= #{query.endMonthNum}
             <if test="query.supplierId!=null and query.supplierId!=''">
-                and supplier_id = #{query.supplierId}
+                and bir_base_activity.supplier_id = #{query.supplierId}
             </if>
             <if test="query.userId!=null and query.userId!=''">
-                and supplier_id != #{query.notSupplierId}
-                and user_id = #{query.userId}
+                and bir_base_activity.supplier_id != #{query.notSupplierId}
+                and bir_base_activity.user_id = #{query.userId}
             </if>
             <if test="query.supplierIds!=null and query.supplierIds.size > 0">
-                and supplier_id in
+                and bir_base_activity.supplier_id in
                 <foreach collection="query.supplierIds" item ="selectId" index="i" open="(" close=")" separator=",">
                     #{selectId}
                 </foreach>
             </if>
             <if test="query.userIds!=null and query.userIds.size > 0">
-                and user_id in
+                and bir_base_activity.user_id in
                 <foreach collection="query.userIds" item ="selectId" index="i" open="(" close=")" separator=",">
                     #{selectId}
                 </foreach>

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

@@ -105,6 +105,9 @@
                 #{selectId}
             </foreach>
         </if>
+
+        order by tbs_cost_apply.`create_time` DESC
+
     </select>