修改运费结算列表筛选有误问题

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementLogisticsService.java

@@ -147,6 +147,12 @@ public class KwpSettlementLogisticsService {
         if (StringUtils.isNotBlank(settlementReq.getEndCreateTime())) {
             settlementReq.setEndCreateTime(StringTimeUtil.fillEnd(settlementReq.getEndCreateTime()));
         }
+        if (StringUtils.isNotBlank(settlementReq.getStartReceiptTime())) {
+            settlementReq.setStartCreateTime(StringTimeUtil.fillStart(settlementReq.getStartReceiptTime()));
+        }
+        if (StringUtils.isNotBlank(settlementReq.getEndReceiptTime())) {
+            settlementReq.setEndCreateTime(StringTimeUtil.fillEnd(settlementReq.getEndReceiptTime()));
+        }
         //加上当前登录者顶级企业id用于过滤数据
         settlementReq.setEntId(LoginUserHolder.getEntId());
     }

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -123,12 +123,13 @@
         </if>
 
         <if test="settlementReq.keywords != null and settlementReq.keywords != ''">
-            and l.name like concat('%'
-            , #{settlementReq.keywords}
+            and ( and l.name like concat('%'
+            , #{settlementReq.keywords,jdbcType=VARCHAR}
             , '%')
-                and lu.firm_name like concat('%'
-            , #{settlementReq.keywords}
+                or lu2.firm_name like concat('%'
+            , #{settlementReq.keywords,jdbcType=VARCHAR}
             , '%')
+                )
         </if>
     </sql>
 
@@ -207,6 +208,7 @@
             l.del_flag = 0
               and s.del_flag = 0
               and lu.del_flag = 0
+              and lu2.del_flag = 0
             <include refid="settlementLogisticsSelectWhere"/>
             <if test="ids != null and ids.size() > 0">
                 and s.id in