1

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java

@@ -18,7 +18,7 @@ import java.time.LocalDate;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("cst_driver")
+@TableName(value = "cst_driver", autoResultMap = true)
 public class DriverEntity extends BaseEntity {
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderCargoPlaceController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.cst.orderCargoPlace.controller;
+package com.njzscloud.dispose.cst.order.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderCargoPlaceEntity;
-import com.njzscloud.dispose.cst.orderCargoPlace.service.OrderCargoPlaceService;
+import com.njzscloud.dispose.cst.order.service.OrderCargoPlaceService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderExpenseDetailController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.cst.orderExpenseDetail.controller;
+package com.njzscloud.dispose.cst.order.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity;
-import com.njzscloud.dispose.cst.orderExpenseDetail.service.OrderExpenseDetailService;
+import com.njzscloud.dispose.cst.order.service.OrderExpenseDetailService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderExpenseItemsController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.cst.orderExpenseItems.controller;
+package com.njzscloud.dispose.cst.order.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseItemsEntity;
-import com.njzscloud.dispose.cst.orderExpenseItems.service.OrderExpenseItemsService;
+import com.njzscloud.dispose.cst.order.service.OrderExpenseItemsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderTransController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.dispose.cst.orderTrans.controller;
+package com.njzscloud.dispose.cst.order.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderTransEntity;
-import com.njzscloud.dispose.cst.orderTrans.service.OrderTransService;
+import com.njzscloud.dispose.cst.order.service.OrderTransService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderCargoPlaceMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.cst.orderCargoPlace.mapper;
+package com.njzscloud.dispose.cst.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderCargoPlaceEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderExpenseDetailMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.cst.orderExpenseDetail.mapper;
+package com.njzscloud.dispose.cst.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderExpenseItemsMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.cst.orderExpenseItems.mapper;
+package com.njzscloud.dispose.cst.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseItemsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderTransMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.dispose.cst.orderTrans.mapper;
+package com.njzscloud.dispose.cst.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderTransEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderCargoPlaceEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity;
+package com.njzscloud.dispose.cst.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseDetailEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity;
+package com.njzscloud.dispose.cst.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity;
+package com.njzscloud.dispose.cst.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.dispose.cst.orderTrans.pojo.entity;
+package com.njzscloud.dispose.cst.order.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.dispose.common.pojo.entity.BaseEntity;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderCargoPlaceService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.cst.orderCargoPlace.service;
+package com.njzscloud.dispose.cst.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderCargoPlaceEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderExpenseDetailService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.cst.orderExpenseDetail.service;
+package com.njzscloud.dispose.cst.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderExpenseItemsService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.cst.orderExpenseItems.service;
+package com.njzscloud.dispose.cst.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseItemsEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderTransService.java

@@ -1,9 +1,9 @@
-package com.njzscloud.dispose.cst.orderTrans.service;
+package com.njzscloud.dispose.cst.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderTransEntity;
 
 import java.util.List;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderCargoPlaceServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.cst.orderCargoPlace.service.impl;
+package com.njzscloud.dispose.cst.order.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderCargoPlace.mapper.OrderCargoPlaceMapper;
+import com.njzscloud.dispose.cst.order.mapper.OrderCargoPlaceMapper;
-import com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderCargoPlaceEntity;
-import com.njzscloud.dispose.cst.orderCargoPlace.service.OrderCargoPlaceService;
+import com.njzscloud.dispose.cst.order.service.OrderCargoPlaceService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderExpenseDetailServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.cst.orderExpenseDetail.service.impl;
+package com.njzscloud.dispose.cst.order.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderExpenseDetail.mapper.OrderExpenseDetailMapper;
+import com.njzscloud.dispose.cst.order.mapper.OrderExpenseDetailMapper;
-import com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity;
-import com.njzscloud.dispose.cst.orderExpenseDetail.service.OrderExpenseDetailService;
+import com.njzscloud.dispose.cst.order.service.OrderExpenseDetailService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderExpenseItemsServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.cst.orderExpenseItems.service.impl;
+package com.njzscloud.dispose.cst.order.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderExpenseItems.mapper.OrderExpenseItemsMapper;
+import com.njzscloud.dispose.cst.order.mapper.OrderExpenseItemsMapper;
-import com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseItemsEntity;
-import com.njzscloud.dispose.cst.orderExpenseItems.service.OrderExpenseItemsService;
+import com.njzscloud.dispose.cst.order.service.OrderExpenseItemsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderTransServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njzscloud.dispose.cst.orderTrans.service.impl;
+package com.njzscloud.dispose.cst.order.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.dispose.cst.orderTrans.mapper.OrderTransMapper;
+import com.njzscloud.dispose.cst.order.mapper.OrderTransMapper;
-import com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity;
+import com.njzscloud.dispose.cst.order.pojo.entity.OrderTransEntity;
-import com.njzscloud.dispose.cst.orderTrans.service.OrderTransService;
+import com.njzscloud.dispose.cst.order.service.OrderTransService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java

@@ -72,7 +72,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
 
         // 直接调用自定义分页 SQL（项目名称 & 运输公司名称均为模糊查询）
         Page<ProjectEntity> page = pageParam.toPage();
-        page.addOrder(OrderItem.desc("p.create_time"), OrderItem.desc("p.id"));
+        page.addOrder(OrderItem.desc("p.create_time"));
         Page<ProjectEntity> paging = baseMapper.paging(page, ew);
 
         if (CollUtil.isNotEmpty(paging.getRecords())) {

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java

@@ -1,5 +1,8 @@
 package com.njzscloud.dispose.cst.station.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
@@ -71,7 +74,14 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, StationEntity
 
     @Override
     public PageResult<StationEntity> paging(PageParam pageParam, StationEntity stationEntity) {
-        PageResult<StationEntity> page = PageResult.of(this.page(pageParam.toPage(), Wrappers.query(stationEntity)));
+        QueryWrapper<StationEntity> ew = Wrappers.<StationEntity>query().eq("deleted", 0);
+        if (stationEntity != null) {
+            String stationName = stationEntity.getStationName();
+            // 添加站点名称的模糊查询，并判空
+            ew.like(StrUtil.isNotBlank(stationName), "station_name", stationName);
+        }
+        pageParam.toPage().addOrder(OrderItem.desc("create_time"));
+        PageResult<StationEntity> page = PageResult.of(this.page(pageParam.toPage(), ew));
         List<StationEntity> records = page.getRecords();
         if (records.isEmpty()) {
             return page;

njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml

@@ -1,8 +1,8 @@
 <?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.orderCargoPlace.mapper.OrderCargoPlaceMapper">
+<mapper namespace="com.njzscloud.dispose.cst.order.mapper.OrderCargoPlaceMapper">
 
-    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.orderCargoPlace.pojo.entity.OrderCargoPlaceEntity">
+    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.order.pojo.entity.OrderCargoPlaceEntity">
         <id column="id" property="id"/>
         <result column="order_id" property="orderId"/>
         <result column="cargo_place" property="cargoPlace"/>

njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml

@@ -1,8 +1,8 @@
 <?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.orderExpenseDetail.mapper.OrderExpenseDetailMapper">
+<mapper namespace="com.njzscloud.dispose.cst.order.mapper.OrderExpenseDetailMapper">
 
-    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.orderExpenseDetail.pojo.entity.OrderExpenseDetailEntity">
+    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseDetailEntity">
         <id column="id" property="id"/>
         <result column="trans_id" property="transId"/>
         <result column="train_num" property="trainNum"/>

njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml

@@ -1,8 +1,8 @@
 <?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.orderExpenseItems.mapper.OrderExpenseItemsMapper">
+<mapper namespace="com.njzscloud.dispose.cst.order.mapper.OrderExpenseItemsMapper">
 
-    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.orderExpenseItems.pojo.entity.OrderExpenseItemsEntity">
+    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.order.pojo.entity.OrderExpenseItemsEntity">
         <id column="id" property="id"/>
         <result column="order_id" property="orderId"/>
         <result column="expense_item_category" property="expenseItemCategory"/>

njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml

@@ -1,8 +1,8 @@
 <?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.orderTrans.mapper.OrderTransMapper">
+<mapper namespace="com.njzscloud.dispose.cst.order.mapper.OrderTransMapper">
 
-    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.orderTrans.pojo.entity.OrderTransEntity">
+    <resultMap id="BaseResultMap" type="com.njzscloud.dispose.cst.order.pojo.entity.OrderTransEntity">
         <id column="id" property="id"/>
         <result column="train_num" property="trainNum"/>
         <result column="order_id" property="orderId"/>

njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml

@@ -1,39 +0,0 @@
-<?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="getById" resultMap="StationResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM cst_station
-        WHERE id = #{id}
-    </select>
-
-</mapper>

njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml

@@ -1,43 +0,0 @@
-<?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.truck.mapper.TruckMapper">
-
-    <resultMap id="TruckResultMap" autoMapping="true" type="com.njzscloud.dispose.cst.truck.pojo.entity.TruckEntity">
-        <id column="id" property="id"/>
-        <result column="customer_id" property="customerId"/>
-        <result column="org_id" property="orgId"/>
-        <result column="license_plate" property="licensePlate"/>
-        <result column="truck_license" property="truckLicense" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
-        <result column="vn_code" property="vnCode"/>
-        <result column="qualification" property="qualification" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
-        <result column="carrying_capacity" property="carryingCapacity"/>
-        <result column="tare_weight" property="tareWeight"/>
-        <result column="license_start_date" property="licenseStartDate"/>
-        <result column="license_end_date" property="licenseEndDate"/>
-        <result column="qualification_start_date" property="qualificationStartDate"/>
-        <result column="qualification_end_date" property="qualificationEndDate"/>
-        <result column="truck_category" property="truckCategory" typeHandler="com.njzscloud.common.mp.support.handler.j.DictItemTypeHandler"/>
-        <result column="picture" property="picture"/>
-        <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, customer_id, org_id, license_plate, truck_license, vn_code, qualification,
-        carrying_capacity, tare_weight, license_start_date, license_end_date,
-        qualification_start_date, qualification_end_date, truck_category, picture, busy,
-        creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="TruckResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM cst_truck
-        WHERE id = #{id}
-    </select>
-
-</mapper>

njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml

@@ -1,41 +0,0 @@
-<?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.finance.bill.mapper.BillMapper">
-
-    <resultMap id="BillResultMap" type="com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity">
-        <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="account_type" property="accountType"/>
-        <result column="bill_period" property="billPeriod"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="order_count" property="orderCount"/>
-        <result column="car_count" property="carCount"/>
-        <result column="total_weight" property="totalWeight"/>
-        <result column="discount_money" property="discountMoney"/>
-        <result column="total_money" property="totalMoney"/>
-        <result column="memo" property="memo"/>
-        <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, account_type, bill_period, start_time, end_time,
-        order_count, car_count, total_weight, discount_money, total_money, memo,
-        creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="BillResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM fin_bill
-        WHERE id = #{id}
-    </select>
-
-</mapper>
-
-

njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml

@@ -1,44 +0,0 @@
-<?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.finance.expenseItem.mapper.ExpenseItemMapper">
-
-    <resultMap id="ExpenseItemResultMap" type="com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity">
-        <id column="id" property="id"/>
-        <result column="expense_item_category" property="expenseItemCategory"/>
-        <result column="expense_item_name" property="expenseItemName"/>
-        <result column="expense_strategy" property="expenseStrategy"/>
-        <result column="unit" property="unit"/>
-        <result column="tax_rate" property="taxRate"/>
-        <result column="payer" property="payer"/>
-        <result column="unit_price" property="unitPrice"/>
-        <result column="initial_price" property="initialPrice"/>
-        <result column="initial_quantity" property="initialQuantity"/>
-        <result column="every_quantity" property="everyQuantity"/>
-        <result column="user_scope" property="userScope"/>
-        <result column="station_scope" property="stationScope"/>
-        <result column="goods_scope" property="goodsScope"/>
-        <result column="canuse" property="canuse"/>
-        <result column="memo" property="memo"/>
-        <result column="goods_id" property="goodsId"/>
-        <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, expense_item_category, expense_item_name, expense_strategy, unit, tax_rate, payer,
-        unit_price, initial_price, initial_quantity, every_quantity, user_scope, station_scope,
-        goods_scope, canuse, memo, goods_id, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="ExpenseItemResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM fin_expense_item
-        WHERE id = #{id}
-    </select>
-
-</mapper>
-
-

njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml

@@ -1,34 +0,0 @@
-<?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.finance.moneyAccount.mapper.MoneyAccountMapper">
-
-    <resultMap id="MoneyAccountResultMap" type="com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity">
-        <id column="id" property="id"/>
-        <result column="sn" property="sn"/>
-        <result column="account_type" property="accountType"/>
-        <result column="user_id" property="userId"/>
-        <result column="customer_id" property="customerId"/>
-        <result column="org_id" property="orgId"/>
-        <result column="revenue" property="revenue"/>
-        <result column="recharge" property="recharge"/>
-        <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, sn, account_type, user_id, customer_id, org_id, revenue, recharge,
-        creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="MoneyAccountResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM fin_money_account
-        WHERE id = #{id}
-    </select>
-
-</mapper>
-
-

njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml

@@ -1,36 +0,0 @@
-<?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.finance.moneyFlow.mapper.MoneyFlowMapper">
-
-    <resultMap id="MoneyFlowResultMap" type="com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity">
-        <id column="id" property="id"/>
-        <result column="order_id" property="orderId"/>
-        <result column="order_sn" property="orderSn"/>
-        <result column="train_num" property="trainNum"/>
-        <result column="money_account_id" property="moneyAccountId"/>
-        <result column="before_balance" property="beforeBalance"/>
-        <result column="delta" property="delta"/>
-        <result column="after_balance" property="afterBalance"/>
-        <result column="money_change_category" property="moneyChangeCategory"/>
-        <result column="memo" property="memo"/>
-        <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, order_id, order_sn, train_num, money_account_id, before_balance, delta, after_balance,
-        money_change_category, memo, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="MoneyFlowResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM fin_money_flow
-        WHERE id = #{id}
-    </select>
-
-</mapper>
-
-

njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml

@@ -1,55 +0,0 @@
-<?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.goods.goods.mapper.GoodsMapper">
-
-    <resultMap id="GoodsResultMap" type="com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity">
-        <id column="id" property="id"/>
-        <result column="goods_category_id" property="goodsCategoryId"/>
-        <result column="sn" property="sn"/>
-        <result column="goods_name" property="goodsName"/>
-        <result column="spec_params" property="specParams"/>
-        <result column="picture" property="picture"/>
-        <result column="unit" property="unit"/>
-        <result column="fg" property="fg"/>
-        <result column="sfg" property="sfg"/>
-        <result column="rg" property="rg"/>
-        <result column="sort" property="sort"/>
-        <result column="canuse" property="canuse"/>
-        <result column="memo" property="memo"/>
-        <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, goods_category_id, sn, goods_name, spec_params, picture, unit,
-        fg, sfg, rg, sort, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="GoodsResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM gds_goods
-        WHERE id = #{id}
-    </select>
-
-    <!--<select id="selectList" resultMap="GoodsResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM gds_goods
-        <where>
-            <if test="goodsCategoryId != null">AND goods_category_id = #{goodsCategoryId}</if>
-            <if test="sn != null and sn != ''">AND sn = #{sn}</if>
-            <if test="goodsName != null and goodsName != ''">AND goods_name = #{goodsName}</if>
-            <if test="unit != null and unit != ''">AND unit = #{unit}</if>
-            <if test="fg != null">AND fg = #{fg}</if>
-            <if test="sfg != null">AND sfg = #{sfg}</if>
-            <if test="rg != null">AND rg = #{rg}</if>
-            <if test="canuse != null">AND canuse = #{canuse}</if>
-            <if test="deleted != null">AND deleted = #{deleted}</if>
-        </where>
-        ORDER BY sort ASC, create_time DESC
-    </select>-->
-</mapper>
-
-

njzscloud-svr/src/main/resources/mapper/goods/goodsCategory/GoodsCategoryMapper.xml

@@ -1,40 +0,0 @@
-<?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.goods.goodscategory.mapper.GoodsCategoryMapper">
-
-    <resultMap id="GoodsCategoryResultMap" type="com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity">
-        <id column="id" property="id"/>
-        <result column="biz_type" property="bizType"/>
-        <result column="category_name" property="categoryName"/>
-        <result column="picture" property="picture"/>
-        <result column="sort" property="sort"/>
-        <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, biz_type, category_name, picture, sort, creator_id, modifier_id, create_time, modify_time, deleted
-    </sql>
-
-    <select id="getById" resultMap="GoodsCategoryResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM gds_goods_category
-        WHERE id = #{id}
-    </select>
-
-    <!--<select id="selectList" resultMap="GoodsCategoryResultMap">
-        SELECT <include refid="Base_Column_List"/>
-        FROM gds_goods_category
-        <where>
-            <if test="bizType != null and bizType != ''">AND biz_type = #{bizType}</if>
-            <if test="categoryName != null and categoryName != ''">AND category_name = #{categoryName}</if>
-            <if test="deleted != null">AND deleted = #{deleted}</if>
-        </where>
-        ORDER BY sort ASC, create_time DESC
-    </select>-->
-</mapper>
-
-