Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1631,6 +1631,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
         qw.eq("onceCheckState", 0);
+        qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                .or().isNull("uploadDate")
+        );
         qw.orderByDesc("createTime");
         List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
         for (OneExcelVo oneExcelVo : oneExcelVos) {
@@ -1698,8 +1701,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.ne("adjustmentState", 0);
+        qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
+        qw.ne("uploadDate", "");
         qw.isNotNull("uploadDate");
         qw.orderByDesc("createTime");
         List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -524,6 +524,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
         qw.eq("onceCheckState", 0);
+        qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                .or().isNull("uploadDate")
+        );
         qw.orderByDesc("createTime");
         List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw);
         for (OneExcelVo oneExcelVo : oneExcelVos) {
@@ -600,8 +603,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.ne("adjustmentState", 0);
+        qw.eq("adjustmentState", 0);
         qw.eq("state", 2);
+        qw.ne("uploadDate", "");
         qw.isNotNull("uploadDate");
         qw.orderByDesc("createTime");
         List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw);