管理后台销量上报添加查询条件

src/main/java/com/wangxiaolu/promotion/config/mysql/MybatisPlusConfig.java

 package com.wangxiaolu.promotion.config.mysql;
 
-import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @author : liqiulin
  * @date : 2024-04-25 13
  * @describe :
  */
-
 @Configuration
-@EnableTransactionManagement
-//@MapperScan( { "com.wangxiaolu.promotion.domain" })
 public class MybatisPlusConfig {
     @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
-        mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
-        return mybatisPlusInterceptor;
+    public MybatisPlusInterceptor mybatisPlusInterceptor(){
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+        return interceptor;
     }
-}
+
+}
\ No newline at end of file

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityReportedDaoImpl.java

@@ -100,7 +100,7 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
     }
 
     /**
-     * 员工查询、
+     * 员工查询
      *
      * @param tw
      * @return
@@ -108,7 +108,7 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
     @Override
     public void findListToEmployeePage(TemporaryActivityWrapper tw, PageInfo pageInfo) {
         LambdaQueryWrapper<TemporaryActivityReportedDO> qw = buildQueryList(tw);
-        qw.orderByDesc(TemporaryActivityReportedDO::getApproveStatus);
+//        qw.orderByDesc(TemporaryActivityReportedDO::getApproveStatus);
         Page<TemporaryActivityReportedDO> page = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize());
         Page<TemporaryActivityReportedDO> temDoPage = temporaryActivityReportedMapper.selectPage(page, qw);
         pageInfo.pageCovert(temDoPage);
@@ -133,6 +133,9 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         if (!StringUtils.isEmpty(tw.getNotApproveStatus())) {
             queryWrapper.ne(TemporaryActivityReportedDO::getApproveStatus, tw.getNotApproveStatus());
         }
+        if (!StringUtils.isEmpty(tw.getTemporaryName())) {
+            queryWrapper.like(TemporaryActivityReportedDO::getTemporaryName, tw.getTemporaryName());
+        }
 
         // 默认创建日期倒序排列
         queryWrapper.orderByDesc(TemporaryActivityReportedDO::getCreateDate);

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryActivityWrapper.java

@@ -20,6 +20,7 @@ public class TemporaryActivityWrapper {
      */
     private Integer temporaryId;
 
+    private String temporaryName;
     /**
      * 创建时间YYYY-MM-DD
      */