1.订单整体时效逻辑优化

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -497,9 +497,12 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 
 								}
 
-
 								carsLoadScanEntity.setScanStatus("2");
 								carsLoadScanEntity.setUnloadNum(carsLoadScanEntity.getUnloadNum()+enterNum);
+								carsLoadScanEntity.setUnloadNodeId(warehouseId);
+								carsLoadScanEntity.setUnloadNodeName(warehouseEntity.getName());
+								carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
+								carsLoadScanEntity.setUnloadTime(new Date());
 								trunklineCarsLoadScanClient.updateEntity(carsLoadScanEntity);
 
 								String waybillNo = carsLoadScanEntity.getWaybillNo();

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -66,7 +66,6 @@ import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.User;
 import org.springblade.system.feign.ISysClient;
-import org.springblade.system.feign.IUserClient;
 import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -2896,9 +2895,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if (!withinOneMonth) {
 				throw new ServiceException("日期范伟不能超过两个月");
 			}
-		} else {
-				throw new ServiceException("导出时日期必填");
-
 		}
 		List<AftersalesWorkOrderVO> exportData = baseMapper.getBasicExportData(workOrderDTO, ids, warehouseIds);
 		return exportData;

blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java

@@ -40,4 +40,11 @@ public class ReportTimeDTO implements Serializable {
 	private String trainNumber;
 	private String loadCode;
 
+
+	private String openTimeStartStr;
+	private String openTimeEndStr;
+
+	private Date openTimeStart;
+	private Date openTimeEnd;
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.java

@@ -2,7 +2,6 @@ package com.logpm.report.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.report.dto.ReportTimeDTO;
-import com.logpm.report.entity.ReportConfigOrderAllEntity;
 import com.logpm.report.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,5 +46,5 @@ public interface ReportTimeMapper {
 
 	IPage<ReportOrderAllTimeVO> orderAllTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
 
-	List<ReportConfigOrderAllEntity> orderAllTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+	List<ReportOrderAllTimeVO> orderAllTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml

@@ -1391,12 +1391,6 @@
         where ltad.waybill_id is not null
         and ltad.create_time > '2024-10-22 00:00:00'
         and lww.departure_warehouse_id != lww.destination_warehouse_id
-        <if test="param.startTime != null ">
-            and ltad.create_time &gt;= #{param.startTime}
-        </if>
-        <if test="param.endTime != null ">
-            and ltad.create_time &lt;= #{param.endTime}
-        </if>
         <if test="param.brandList != null and param.brandList.size() > 0">
             and lww.brand in
             <foreach collection="param.brandList" item="item" open="(" separator="," close=")">
@@ -1436,13 +1430,6 @@
         <if test="param.destinationWarehouseName != null and param.destinationWarehouseName !='' ">
             and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
         </if>
-        <if test="param.trainNumber != null and param.trainNumber !='' ">
-            and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%')
-            GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode,
-        </if>
-        <if test="param.loadCode != null and param.loadCode !='' ">
-            and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
-        </if>
         group by ltad.order_code,
         ltad.waybill_no,
         ltad.brand,
@@ -1451,6 +1438,26 @@
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
         oat.day_time
+        <trim prefix="HAVING" prefixOverrides="AND">
+            <if test="param.trainNumber != null and param.trainNumber !='' ">
+                and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%')
+            </if>
+            <if test="param.loadCode != null and param.loadCode !='' ">
+                and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
+            </if>
+            <if test="param.startTime != null ">
+                and min(ltad.create_time) &gt;= #{param.startTime}
+            </if>
+            <if test="param.endTime != null ">
+                and min(ltad.create_time) &lt;= #{param.endTime}
+            </if>
+            <if test="param.openTimeStart != null ">
+                and min(lww.create_time) &gt;= #{param.openTimeStart}
+            </if>
+            <if test="param.openTimeEnd != null ">
+                and min(lww.create_time) &lt;= #{param.openTimeEnd}
+            </if>
+        </trim>
     </select>
 
 
@@ -1498,12 +1505,6 @@
         where ltad.waybill_id is not null
         and ltad.create_time > '2024-10-22 00:00:00'
         and lww.departure_warehouse_id != lww.destination_warehouse_id
-        <if test="param.startTime != null ">
-            and ltad.create_time &gt;= #{param.startTime}
-        </if>
-        <if test="param.endTime != null ">
-            and ltad.create_time &lt;= #{param.endTime}
-        </if>
         <if test="param.brandList != null and param.brandList.size() > 0">
             and lww.brand in
             <foreach collection="param.brandList" item="item" open="(" separator="," close=")">
@@ -1545,7 +1546,6 @@
         </if>
         <if test="param.trainNumber != null and param.trainNumber !='' ">
             and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%')
-            GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode,
         </if>
         <if test="param.loadCode != null and param.loadCode !='' ">
             and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
@@ -1558,6 +1558,27 @@
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
         oat.day_time
+        <trim prefix="HAVING" prefixOverrides="AND">
+            <if test="param.trainNumber != null and param.trainNumber !='' ">
+                and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%')
+                GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode,
+            </if>
+            <if test="param.loadCode != null and param.loadCode !='' ">
+                and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
+            </if>
+            <if test="param.startTime != null ">
+                and min(ltad.create_time) &gt;= #{param.startTime}
+            </if>
+            <if test="param.endTime != null ">
+                and min(ltad.create_time) &lt;= #{param.endTime}
+            </if>
+            <if test="param.openTimeStart != null ">
+                and min(lww.create_time) &gt;= #{param.openTimeStart}
+            </if>
+            <if test="param.openTimeEnd != null ">
+                and min(lww.create_time) &lt;= #{param.openTimeEnd}
+            </if>
+        </trim>
     </select>
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java

@@ -415,6 +415,8 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 
 		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
 		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+		reportTimeDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(reportTimeDTO.getOpenTimeStartStr()));
+		reportTimeDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(reportTimeDTO.getOpenTimeEndStr()));
 
 		reportTimeDTO.setDayTime(0);
 
@@ -447,9 +449,9 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 			reportTimeDTO.setDayTime(orderAllEntity.getDayTime());
 		}
 
-		List<ReportConfigOrderAllEntity> list = reportTimeMapper.orderAllTimeExport(reportTimeDTO);
+		List<ReportOrderAllTimeVO> list = reportTimeMapper.orderAllTimeExport(reportTimeDTO);
 
 		//导出ls
-		ExcelUtil.export(response, "订单整体时效报表导出", "订单整体时效报表导出", list, ReportConfigOrderAllEntity.class);
+		ExcelUtil.export(response, "订单整体时效报表导出", "订单整体时效报表导出", list, ReportOrderAllTimeVO.class);
 	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -9043,7 +9043,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(warehouseId);
 		if(!Objects.isNull(warehouseConfig)){
 			Integer isTrunklineLoadingPhoto = warehouseConfig.getIsTrunklineLoadingPhoto();
-			if(NumberUtil.equals(isTrunklineLoadingPhoto,1)){
+			if(!Objects.isNull(isTrunklineLoadingPhoto) && NumberUtil.equals(isTrunklineLoadingPhoto,1)){
 				//限制装车之前上传图片
 				Integer isLoadingPhoto = loadLineEntity.getIsLoadingPhoto();
 				if(NumberUtil.equals(isLoadingPhoto,0)){