From d6d8767ad7acbfc67be82876dd5164ebf9e52382 Mon Sep 17 00:00:00 2001
From: ljw <ljw@jszsyinfo.com>
Date: Thu, 11 Dec 2025 09:45:56 +0800
Subject: [PATCH] 1

---
 .../mapper/cst/driver/DriverMapper.xml        | 58 ++---------------
 .../mapper/cst/project/ProjectMapper.xml      | 64 -------------------
 .../mapper/cst/station/StationMapper.xml      | 54 ----------------
 .../mapper/cst/truck/TruckMapper.xml          |  8 +--
 4 files changed, 8 insertions(+), 176 deletions(-)

diff --git a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml
index 5fb58b9..e023d4f 100644
--- a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml
@@ -28,13 +28,15 @@
     </sql>
 
     <select id="selectById" resultMap="DriverResultMap">
-        SELECT <include refid="Base_Column_List"/>
+        SELECT
+        <include refid="Base_Column_List"/>
         FROM cst_driver
         WHERE id = #{id}
     </select>
 
     <select id="selectList" resultMap="DriverResultMap">
-        SELECT <include refid="Base_Column_List"/>
+        SELECT
+        <include refid="Base_Column_List"/>
         FROM cst_driver
         <where>
             <if test="userId != null">AND user_id = #{userId}</if>
@@ -48,55 +50,3 @@
         ORDER BY create_time DESC
     </select>
 </mapper>
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njzscloud.dispose.cst.driver.mapper.DriverMapper">
-
-    <resultMap id="DriverResultMap" type="com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity">
-        <id column="id" property="id"/>
-        <result column="user_id" property="userId"/>
-        <result column="customer_id" property="customerId"/>
-        <result column="org_id" property="orgId"/>
-        <result column="driving_licence_no" property="drivingLicenceNo"/>
-        <result column="driver_name" property="driverName"/>
-        <result column="phone" property="phone"/>
-        <result column="driving_licence" property="drivingLicence"/>
-        <result column="licence_start_time" property="licenceStartTime"/>
-        <result column="licence_end_time" property="licenceEndTime"/>
-        <result column="busy" property="busy"/>
-        <result column="creator_id" property="creatorId"/>
-        <result column="modifier_id" property="modifierId"/>
-        <result column="create_time" property="createTime"/>
-        <result column="modify_time" property="modifyTime"/>
-        <result column="deleted" property="deleted"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id, user_id, customer_id, org_id, driving_licence_no, driver_name, phone, driving_licence,
-        licence_start_time, licence_end_time, busy, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="selectById" resultMap="DriverResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_driver
-        WHERE id = #{id}
-    </select>
-
-    <select id="selectList" resultMap="DriverResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_driver
-        <where>
-            <if test="userId != null">AND user_id = #{userId}</if>
-            <if test="customerId != null">AND customer_id = #{customerId}</if>
-            <if test="orgId != null">AND org_id = #{orgId}</if>
-            <if test="driverName != null and driverName != ''">AND driver_name = #{driverName}</if>
-            <if test="phone != null and phone != ''">AND phone = #{phone}</if>
-            <if test="busy != null">AND busy = #{busy}</if>
-            <if test="deleted != null">AND deleted = #{deleted}</if>
-        </where>
-        ORDER BY create_time DESC
-    </select>
-</mapper>
-
-
diff --git a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml
index f735c0c..f1bbe2b 100644
--- a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml
@@ -58,67 +58,3 @@
         ORDER BY create_time DESC
     </select>
 </mapper>
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njzscloud.dispose.cst.project.mapper.ProjectMapper">
-
-    <resultMap id="ProjectResultMap" type="com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity">
-        <id column="id" property="id"/>
-        <result column="project_name" property="projectName"/>
-        <result column="contract_picture" property="contractPicture"/>
-        <result column="trans_customer_id" property="transCustomerId"/>
-        <result column="trans_org_id" property="transOrgId"/>
-        <result column="fringe_customer_id" property="fringeCustomerId"/>
-        <result column="fringe_org_id" property="fringeOrgId"/>
-        <result column="province" property="province"/>
-        <result column="city" property="city"/>
-        <result column="area" property="area"/>
-        <result column="town" property="town"/>
-        <result column="province_name" property="provinceName"/>
-        <result column="city_name" property="cityName"/>
-        <result column="area_name" property="areaName"/>
-        <result column="town_name" property="townName"/>
-        <result column="address" property="address"/>
-        <result column="lng" property="lng"/>
-        <result column="lat" property="lat"/>
-        <result column="contract_start_date" property="contractStartDate"/>
-        <result column="contract_end_date" property="contractEndDate"/>
-        <result column="creator_id" property="creatorId"/>
-        <result column="modifier_id" property="modifierId"/>
-        <result column="create_time" property="createTime"/>
-        <result column="modify_time" property="modifyTime"/>
-        <result column="deleted" property="deleted"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id, project_name, contract_picture, trans_customer_id, trans_org_id, fringe_customer_id, fringe_org_id,
-        province, city, area, town, province_name, city_name, area_name, town_name, address, lng, lat,
-        contract_start_date, contract_end_date, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="selectById" resultMap="ProjectResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_project
-        WHERE id = #{id}
-    </select>
-
-    <select id="selectList" resultMap="ProjectResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_project
-        <where>
-            <if test="projectName != null and projectName != ''">AND project_name = #{projectName}</if>
-            <if test="transCustomerId != null">AND trans_customer_id = #{transCustomerId}</if>
-            <if test="transOrgId != null">AND trans_org_id = #{transOrgId}</if>
-            <if test="fringeCustomerId != null">AND fringe_customer_id = #{fringeCustomerId}</if>
-            <if test="fringeOrgId != null">AND fringe_org_id = #{fringeOrgId}</if>
-            <if test="province != null and province != ''">AND province = #{province}</if>
-            <if test="city != null and city != ''">AND city = #{city}</if>
-            <if test="area != null and area != ''">AND area = #{area}</if>
-            <if test="deleted != null">AND deleted = #{deleted}</if>
-        </where>
-        ORDER BY create_time DESC
-    </select>
-</mapper>
-
-
diff --git a/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml
index d25901b..37129ea 100644
--- a/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml
@@ -50,57 +50,3 @@
         ORDER BY create_time DESC
     </select>
 </mapper>
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njzscloud.dispose.cst.station.mapper.StationMapper">
-
-    <resultMap id="StationResultMap" type="com.njzscloud.dispose.cst.station.pojo.entity.StationEntity">
-        <id column="id" property="id"/>
-        <result column="org_id" property="orgId"/>
-        <result column="station_name" property="stationName"/>
-        <result column="province" property="province"/>
-        <result column="city" property="city"/>
-        <result column="area" property="area"/>
-        <result column="town" property="town"/>
-        <result column="province_name" property="provinceName"/>
-        <result column="city_name" property="cityName"/>
-        <result column="area_name" property="areaName"/>
-        <result column="town_name" property="townName"/>
-        <result column="address" property="address"/>
-        <result column="lng" property="lng"/>
-        <result column="lat" property="lat"/>
-        <result column="creator_id" property="creatorId"/>
-        <result column="modifier_id" property="modifierId"/>
-        <result column="create_time" property="createTime"/>
-        <result column="modify_time" property="modifyTime"/>
-        <result column="deleted" property="deleted"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id, org_id, station_name, province, city, area, town, province_name, city_name, area_name, town_name,
-        address, lng, lat, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="selectById" resultMap="StationResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_station
-        WHERE id = #{id}
-    </select>
-
-    <select id="selectList" resultMap="StationResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_station
-        <where>
-            <if test="orgId != null">AND org_id = #{orgId}</if>
-            <if test="stationName != null and stationName != ''">AND station_name = #{stationName}</if>
-            <if test="province != null and province != ''">AND province = #{province}</if>
-            <if test="city != null and city != ''">AND city = #{city}</if>
-            <if test="area != null and area != ''">AND area = #{area}</if>
-            <if test="deleted != null">AND deleted = #{deleted}</if>
-        </where>
-        ORDER BY create_time DESC
-    </select>
-</mapper>
-
-
diff --git a/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml
index 898860d..73324b9 100644
--- a/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml
@@ -34,13 +34,15 @@
     </sql>
 
     <select id="selectById" resultMap="TruckResultMap">
-        SELECT <include refid="Base_Column_List"/>
+        SELECT
+        <include refid="Base_Column_List"/>
         FROM cst_truck
         WHERE id = #{id}
     </select>
 
     <select id="selectList" resultMap="TruckResultMap">
-        SELECT <include refid="Base_Column_List"/>
+        SELECT
+        <include refid="Base_Column_List"/>
         FROM cst_truck
         <where>
             <if test="customerId != null">AND customer_id = #{customerId}</if>
@@ -53,5 +55,3 @@
         ORDER BY create_time DESC
     </select>
 </mapper>
-
-