修改

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

@@ -25,7 +25,8 @@
             r.vehModelName,
             r.vehSid,
             r.vinNo,
-            v.salesDate AS saleDate,
+            DATE_FORMAT(v.salesDate, '%Y-%m-%d') AS saleDate,
+            DATE_FORMAT(v.salesDate, '%Y-%m-%d') AS acSaleDate,
             SUM(r.estimateRebate) AS estimateRebate,
             SUM(r.uploadMoney) AS uploadMoney,
             SUM(r.secondaryUploadMoney) AS secondaryUploadMoney,
@@ -47,7 +48,9 @@
                                                          ON o1.sid = o2.psid
             ) AS o
                           ON o.sid = r.useOrgSid
-        GROUP BY r.vehSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
@@ -263,7 +266,7 @@
             r.secondaryUploadDate,
             r.state,
             r.onceCheckState,
-            r.secondCheckState,
+            IF(r.secondaryUploadMoney > 0 AND r.isAdjustment = '是','是','否') AS secondCheckState,
             r.brandName,
             r.useOrgName,
             o.name AS division,

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

@@ -424,6 +424,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
                 );*/
+        qw.groupBy("r.vehSid");
         qw.orderByDesc("r.createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateStatVo> pagging = baseMapper.statistics(page, qw);