Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/dao/IntegralRecordDao.java

@@ -34,4 +34,6 @@ public interface IntegralRecordDao extends BaseDao<IntegraRecordMapper, Integral
                                             @Param("beginTime")String beginTime,
                                             @Param("endTime")String endTime);
 
+    List<IntegralRecord> listByStatisticsDateAndTruckNoList(@Param("statisticsDate") String statisticsDate, @Param("list") List<String> truckNoList);
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/IntegralRecordDaoImpl.java

@@ -60,4 +60,13 @@ public class IntegralRecordDaoImpl extends BaseDaoImpl<IntegraRecordMapper, Inte
 
     }
 
+    @Override
+    public List<IntegralRecord> listByStatisticsDateAndTruckNoList(String statisticsDate, List<String> truckNoList) {
+        return list(lQrWrapper()
+                .eq(IntegralRecord::getStatisticsId, statisticsDate)
+                .in(IntegralRecord::getTruckNo, truckNoList)
+        );
+    }
+
+
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectLineReportSqlProvider.java

@@ -40,7 +40,7 @@ public class CollectLineReportSqlProvider {
             );
             FROM("collect_line_report ");
             WHERE("report_type = 7");
-            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address <= like CONCAT(#{param.sendAddress},'%')");}
+            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
             if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
@@ -69,7 +69,7 @@ public class CollectLineReportSqlProvider {
 
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
-            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveRddress},'%')");}
+            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
             if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}
@@ -102,7 +102,7 @@ public class CollectLineReportSqlProvider {
 
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
-            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveRddress},'%')");}
+            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
 

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckLocationSqlProvider.java

@@ -39,7 +39,7 @@ public class CollectTruckLocationSqlProvider {
                     "date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
             );
             FROM("collect_truck_location ");
-            if (StringUtils.isNotBlank(param.getAddress())) {WHERE("full_address like CONCAT(#{param.sendAddress},'%')");}
+            if (StringUtils.isNotBlank(param.getAddress())) {WHERE("full_address like CONCAT(#{param.address},'%')");}
 
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckRefuelSqlProvider.java

@@ -44,7 +44,7 @@ public class CollectTruckRefuelSqlProvider {
 
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
-            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveRddress},'%')");}
+            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}
             if (StringUtils.isNotBlank(param.getMobile())) {WHERE("mobile = #{param.mobile}");}
             if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no = #{param.truckNo}");}

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckWaitSqlProvider.java

@@ -17,7 +17,7 @@ public class CollectTruckWaitSqlProvider {
                     " address, report_type as reportType, wait_type as waitType, station_in_time as stationInTime, " +
                     " station_in_image as stationInImage, station_out_time as stationOutTime, station_out_image as stationOutImage, " +
                     " date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
-                    " audit_time, " +
+                    " audit_status, " +
                     " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
                     " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
             );
@@ -33,7 +33,7 @@ public class CollectTruckWaitSqlProvider {
                     " address, report_type as reportType, wait_type as waitType, station_in_time as stationInTime, " +
                     " station_in_image as stationInImage, station_out_time as stationOutTime, station_out_image as stationOutImage, " +
                     " date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
-                    " audit_time, " +
+                    " audit_status, " +
                     " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
                     " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
             );