Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@@ -59,6 +59,8 @@ public class ScmCollectionRebateQuery implements Query {
     private String brandName;
     @ApiModelProperty("回款方式key")
     private String collectionTypeKey;
+    @ApiModelProperty("厂家回款通路")
+    private String manufaSaleChannelValue;
     @ApiModelProperty("回款开始日期")
     private String collectionStartDate;
     @ApiModelProperty("回款结束日期")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@@ -107,8 +107,7 @@ public class ScmCollectionRebateVo implements Vo {
     @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
     @ApiModelProperty("上传日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date uploadDate; // 上传日期
+    private String uploadDate; // 上传日期
     @ApiModelProperty("上传金额")
     private BigDecimal uploadMoney; // 上传金额
     @ApiModelProperty("调整金额")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -141,6 +141,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
             qw.eq("rebateTypeKey", query.getRebateTypeKey());
         }
+        if (StringUtils.isNotBlank(query.getManufaSaleChannelValue())) {
+            qw.eq("manufaSaleChannelValue", query.getManufaSaleChannelValue());
+        }
         if (StringUtils.isNotBlank(query.getRebateName())) {
             qw.like("rebateName", query.getRebateName());
         }
@@ -158,6 +161,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         qw.apply(StringUtils.isNotEmpty(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("createTime");
         IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmCollectionRebateVo record : pagging.getRecords()) {