Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java

@@ -41,15 +41,11 @@ public class DistributionDeliveryListExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-
-
-
-	private Long id;
 	/**
 	 * 车次
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("车次")
+	@ExcelProperty("车次号")
 	private String trainNumber;
 	/**
 	 * 车次

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -318,7 +318,6 @@
 
     <select id="exportDistributionDeliveryList" resultType="com.logpm.distribution.excel.DistributionDeliveryListExcel">
         SELECT
-        lddl.id id,
         lww.NAME AS warehouseName,
         lddl.train_number trainNumber,
         lddl.warehouse_name warehouseName,
@@ -578,7 +577,7 @@
                 and date_format(lddl.task_time,'%y%m%d%') = date_format(#{param.taskTime},'%y%m%d%')
             </if>
             <if test="param.taskTimeStart!=null and param.taskTimeStart!=''">
-                and date_format(lddl.task_time,'%y%m%d%') BETWEEN #{param.taskTimeStart} AND #{param.taskTimeEnd}
+                and date_format(lddl.task_time,'%y%m%d%') BETWEEN date_format(#{param.taskTimeStart},'%y%m%d%')  AND date_format(#{param.taskTimeEnd},'%y%m%d%')
             </if>
         </where>
         GROUP BY lddl.id ,