From 0a8119461bea9b913819d302b8820f1dc2cf420c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 07 一月 2025 17:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/mapper/xml/MwTransitCarCollectPointMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/xml/MwTransitCarCollectPointMapper.xml b/medicalWaste-system/src/main/java/com/sinata/system/mapper/xml/MwTransitCarCollectPointMapper.xml
index bd6ed4e..797b502 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/xml/MwTransitCarCollectPointMapper.xml
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/xml/MwTransitCarCollectPointMapper.xml
@@ -19,5 +19,38 @@
UPDATE_TIME,
ID, CAR_ID, ROUTE_ID, POINT_LIST, TRANSIT_DATE
</sql>
+ <select id="queryCarListByTreeCode" resultType="com.sinata.system.domain.vo.CarDistributionVO"
+ parameterType="java.lang.String">
+ SELECT MTC.ID,
+ MTC.LICENSE_PLATE_NUMBER,
+ SD.DEPARTMENT_NAME,
+ SUM(MCR.TOTAL_WEIGHT) AS currentLoad
+ FROM MW_TRANSIT_CAR_COLLECT_POINT MTCCP
+ LEFT JOIN MW_TRANSIT_CAR MTC ON MTC.ID = MTCCP.CAR_ID
+ LEFT JOIN SYS_DEPARTMENT SD ON MTC.DEPARTMENT_ID
+ LEFT JOIN MW_CHECKOUT_RECORD MCR ON MCR.CAR_ID = MTCCP.CAR_ID
+ <where>
+ SD.ORG_TYPE = 3 AND MTCCP.TRANSIT_DATE = CURDATE() AND SD.TREE_CODE LIKE CONCAT(#{treeCode}, '%') AND
+ MCR.DEL_FLAG = 0
+ </where>
+ ORDER BY MTC.ID
+ </select>
+ <select id="queryCarDistributionDetail" resultType="com.sinata.system.domain.vo.CarDistributionVO"
+ parameterType="java.lang.Long">
+ SELECT MTC.ID,
+ SD.DEPARTMENT_NAME,
+ MTC.LICENSE_PLATE_NUMBER,MTC.PERSON_IN_CHARGE,MTC.PHONE_NUMBER,MTC.MAXIMUM_LOAD,
+ SUM(MCR.TOTAL_WEIGHT) AS currentLoad,
+ MTCCP.POINT_LIST
+ FROM MW_TRANSIT_CAR_COLLECT_POINT MTCCP
+ LEFT JOIN MW_TRANSIT_CAR MTC ON MTC.ID = MTCCP.CAR_ID
+ LEFT JOIN SYS_DEPARTMENT SD ON MTC.DEPARTMENT_ID
+ LEFT JOIN MW_CHECKOUT_RECORD MCR ON MCR.CAR_ID = MTCCP.CAR_ID
+ <where>
+ SD.ORG_TYPE = 3 AND MTCCP.TRANSIT_DATE = CURDATE() AND
+ MCR.DEL_FLAG = 0 AND MTCCP.CAR_ID = #{carId}
+ </where>
+ ORDER BY MTC.ID
+ </select>
</mapper>
--
Gitblit v1.7.1