【update】订单详情、申请单基础类新增，后台管理部分业务替换

src/main/java/com/chint/infrastructure/repository/jdbc/JdbcOrderDetailRepository.java

@@ -33,40 +33,4 @@ public interface JdbcOrderDetailRepository extends CrudRepository<OrderDetail, L
     List<OrderDetail> findByCreateTimeBetweenAndProductType(LocalDateTime createTime, LocalDateTime createTime2, Integer productType);
     List<OrderDetail> findByCreateTimeBetweenAndProductTypeAndOrderNoContaining(LocalDateTime createTime, LocalDateTime createTime2, Integer productType, String orderNo);
     List<OrderDetail> findByUpdateTimeBetween(LocalDateTime createTime, LocalDateTime createTime2);
-
-    @Query("SELECT order_no FROM order_detail " +
-            "WHERE route_id IN (:#{#routeIds})")
-    List<String> findAllOrderNo(@Param("routeIds") List<Long> routeIds);
-
-    @Query("SELECT order_id FROM order_detail " +
-            "WHERE route_id IN (:#{#routeIds})")
-    List<Long> findAllOrderId(@Param("routeIds") List<Long> routeIds);
-
-    @Query("SELECT order_no FROM order_detail " )
-    List<String> findAllOrderNo();
-
-    @Query("SELECT order_id FROM order_detail ")
-    List<Long> findAllOrderId();
-
-
-    @Query("SELECT * FROM order_detail " +
-//            "WHERE route_id IN (:#{#dto.routeIds}) " +
-            "WHERE 1=1 " +
-            "AND (:#{#dto.orderNo} ='' OR order_no LIKE :#{#dto.orderNo}) " +
-            "AND (:#{#dto.startTime} IS NULL OR :#{#dto.endTime} IS NULL OR order_date BETWEEN :#{#dto.startTime} AND :#{#dto.endTime}) " +
-            "AND (:#{#dto.productType} ='' OR product_type = :#{#dto.productType}) " +
-            "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) " +
-            "AND (:#{#dto.employeeNosEmpty} = TRUE OR employee_no IN (:#{#dto.employeeNos}))" +
-            "LIMIT :#{#pageRequest.pageSize} OFFSET :#{#pageRequest.pageNumber}")
-    List<OrderDetail> listByCondition(@Param("dto") OrderPageQuery dto, @Param("pageRequest")PageRequest pageRequest);
-
-    @Query("SELECT COUNT(*) FROM order_detail " +
-//            "WHERE  route_id IN (:#{#dto.routeIds})  " +
-            "WHERE 1=1 " +
-            "AND (:#{#dto.orderNo} ='' OR order_no LIKE :#{#dto.orderNo}) " +
-            "AND (:#{#dto.startTime} IS NULL OR :#{#dto.endTime} IS NULL OR order_date BETWEEN :#{#dto.startTime} AND :#{#dto.endTime} ) " +
-            "AND (:#{#dto.productType} ='' OR product_type = :#{#dto.productType}) "+
-            "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) " +
-            "AND (:#{#dto.employeeNosEmpty} = TRUE OR employee_no IN (:#{#dto.employeeNos}))")
-    Integer countByCondition(@Param("dto") OrderPageQuery dto);
 }

src/main/java/com/chint/manage/entity/OrderDetailBasic.java

@@ -0,0 +1,79 @@
+package com.chint.manage.entity;
+
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * @author xx OrderDetailBasic.java
+ *
+ **/
+@Data
+@Table("order_detail")
+public class OrderDetailBasic implements Serializable {
+	@Serial
+	private static final long serialVersionUID = 1L;
+	@Id
+	private Long orderId;
+
+	/****/
+	private Long routeId;
+
+	/****/
+	private Long routeOrderKey;
+
+	/****/
+	private String orderNo;
+
+	/****/
+	private LocalDateTime startTime;
+
+	/****/
+	private LocalDateTime endTime;
+
+	/****/
+	private Long originId;
+
+	/****/
+	private Long destinationId;
+
+	/****/
+	private String supplierName;
+
+	/**商品类型 0-火车 1飞机 2酒店 3打车 4其他**/
+	private Integer productType;
+
+	/****/
+	private String price;
+
+	/****/
+	private LocalDateTime updateTime;
+
+	/****/
+	private LocalDateTime createTime;
+
+	/****/
+	private String currencyType;
+
+	/****/
+	private LocalDateTime orderDate;
+
+	/****/
+	private Long legId;
+
+	/****/
+	private Integer quantity;
+
+	/****/
+	private String employeeNo;
+
+	/****/
+	private Integer ifOrigin;
+
+
+}

src/main/java/com/chint/manage/entity/RouteOrderBasic.java

@@ -1,92 +0,0 @@
-package com.chint.manage.entity;
-
-import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.relational.core.mapping.Table;
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 
- * @author xx RouteOrderBasic.java
- * 
- **/
-@Data
-@Table("route_order")
-public class RouteOrderBasic implements Serializable {
-@Serial
-private static final long serialVersionUID = 1L;
-	@Id
-	private Long routeId;
-
-	/****/
-	private java.util.Date bookingTime;
-
-	/****/
-	private String userId;
-
-	/****/
-	private java.util.Date createTime;
-
-	/****/
-	private String createUser;
-
-	/****/
-	private Integer sort;
-
-	/****/
-	private Integer status;
-
-	/****/
-	private java.util.Date updateTime;
-
-	/****/
-	private String updateUser;
-
-	/****/
-	private String fakeOrderNo;
-
-	/****/
-	private String actualOrderNo;
-
-	/**差旅订单号**/
-	private String routeOrderNo;
-
-	/****/
-	private String supplierName;
-
-	/****/
-	private String accountCompany;
-
-	/****/
-	private String sysCode;
-
-	/****/
-	private String instructions;
-
-	/****/
-	private String standardLevel;
-
-	/****/
-	private String creator;
-
-	/****/
-	private String accountCompanyName;
-
-	/**入账公司64位编码**/
-	private String accountCompanyCode;
-
-	/****/
-	private String projectName;
-
-	/****/
-	private String costCenter;
-
-	/****/
-	private java.util.Date startTime;
-
-	/****/
-	private java.util.Date endTime;
-
-
-}

src/main/java/com/chint/manage/entity/RouteOrderExtensionFieldBasic.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  **/
 @Data
 @Table("route_order_extension_field")
-public class RouteOrderExtensionField implements Serializable {
+public class RouteOrderExtensionFieldBasic implements Serializable {
 @Serial
 private static final long serialVersionUID = 1L;
 	/****/

src/main/java/com/chint/manage/mapper/JdbcOrderDetailBasicRepository.java

@@ -0,0 +1,59 @@
+package com.chint.manage.mapper;
+import com.chint.domain.aggregates.order.OrderDetail;
+import com.chint.manage.entity.OrderDetailBasic;
+import com.chint.manage.entity.query.OrderPageQuery;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * 
+ * @author xx JdbcOrderDetailBasicRepository数据库操作接口类
+ * 
+ **/
+@Repository
+public interface JdbcOrderDetailBasicRepository extends CrudRepository<OrderDetailBasic,Long> {
+
+    List<OrderDetailBasic> findByRouteIdIn(List<Long> routeIds);
+
+    @Query("SELECT order_no FROM order_detail " +
+            "WHERE route_id IN (:#{#routeIds})")
+    List<String> findAllOrderNo(@Param("routeIds") List<Long> routeIds);
+
+    @Query("SELECT order_id FROM order_detail " +
+            "WHERE route_id IN (:#{#routeIds})")
+    List<Long> findAllOrderId(@Param("routeIds") List<Long> routeIds);
+
+    @Query("SELECT order_no FROM order_detail " )
+    List<String> findAllOrderNo();
+
+    @Query("SELECT order_id FROM order_detail ")
+    List<Long> findAllOrderId();
+
+
+    @Query("SELECT * FROM order_detail " +
+//            "WHERE route_id IN (:#{#dto.routeIds}) " +
+            "WHERE 1=1 " +
+            "AND (:#{#dto.orderNo} ='' OR order_no LIKE :#{#dto.orderNo}) " +
+            "AND (:#{#dto.startTime} IS NULL OR :#{#dto.endTime} IS NULL OR order_date BETWEEN :#{#dto.startTime} AND :#{#dto.endTime}) " +
+            "AND (:#{#dto.productType} ='' OR product_type = :#{#dto.productType}) " +
+            "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) " +
+            "AND (:#{#dto.employeeNosEmpty} = TRUE OR employee_no IN (:#{#dto.employeeNos}))" +
+            "LIMIT :#{#pageRequest.pageSize} OFFSET :#{#pageRequest.pageNumber}")
+    List<OrderDetailBasic> listByCondition(@Param("dto") OrderPageQuery dto, @Param("pageRequest") PageRequest pageRequest);
+
+    @Query("SELECT COUNT(*) FROM order_detail " +
+//            "WHERE  route_id IN (:#{#dto.routeIds})  " +
+            "WHERE 1=1 " +
+            "AND (:#{#dto.orderNo} ='' OR order_no LIKE :#{#dto.orderNo}) " +
+            "AND (:#{#dto.startTime} IS NULL OR :#{#dto.endTime} IS NULL OR order_date BETWEEN :#{#dto.startTime} AND :#{#dto.endTime} ) " +
+            "AND (:#{#dto.productType} ='' OR product_type = :#{#dto.productType}) "+
+            "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) " +
+            "AND (:#{#dto.employeeNosEmpty} = TRUE OR employee_no IN (:#{#dto.employeeNos}))")
+    Integer countByCondition(@Param("dto") OrderPageQuery dto);
+}

src/main/java/com/chint/manage/mapper/JdbcRouteOrderBasicRepository.java

@@ -1,20 +0,0 @@
-package com.chint.manage.mapper;
-import com.chint.domain.aggregates.order.RouteOrder;
-import com.chint.manage.entity.RouteOrderBasic;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-/**
- * 
- * @author xx JdbcRouteOrderBasicRepository数据库操作接口类
- * 
- **/
-@Repository
-public interface JdbcRouteOrderBasicRepository extends CrudRepository<RouteOrderBasic,Long> {
-
-    List<RouteOrderBasic> findByRouteIdIn(List<Long> routeIds);
-
-}

src/main/java/com/chint/manage/mapper/JdbcRouteOrderExtensionFieldBasicRepository.java

@@ -0,0 +1,20 @@
+package com.chint.manage.mapper;
+import com.chint.manage.entity.RouteOrderExtensionFieldBasic;
+import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * 
+ * @author xx JdbcRouteOrderExtensionFieldRepository数据库操作接口类
+ * 
+ **/
+@Repository
+public interface JdbcRouteOrderExtensionFieldBasicRepository extends CrudRepository<RouteOrderExtensionFieldBasic,Long> {
+
+    List<RouteOrderExtensionFieldBasic> findAllByBelongDeptCodeIn(@Param("belongDeptCode") List<String> belongDeptCode);
+}

src/main/java/com/chint/manage/mapper/JdbcRouteOrderExtensionFieldRepository.java

@@ -1,22 +0,0 @@
-package com.chint.manage.mapper;
-import com.chint.manage.entity.RouteOrderExtensionField;
-import org.springframework.data.jdbc.repository.query.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-/**
- * 
- * @author xx JdbcRouteOrderExtensionFieldRepository数据库操作接口类
- * 
- **/
-@Repository
-public interface JdbcRouteOrderExtensionFieldRepository extends CrudRepository<RouteOrderExtensionField,Long> {
-
-    @Query("SELECT * FROM route_order_extension_field " +
-            "WHERE belong_dept_code IN (:#{#belongDeptCode})")
-    List<RouteOrderExtensionField> findByCondition(@Param("belongDeptCode") List<String> belongDeptCode);
-}

src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java

@@ -84,8 +84,6 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
 //        if (orderIds==null||orderIds.isEmpty()) {
 //            return PageResult.totalPageNum(0, new ArrayList<>());
 //        }
-
-        List<Long> orderIds=jdbcOrderDetailRepository.findAllOrderId();
         Page<? extends BaseExcel> data=new PageImpl<>(Collections.emptyList());
         //申请单查询
         if (!dto.getActualOrderNo().isEmpty()){

src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java

@@ -7,14 +7,14 @@ import com.chint.domain.exceptions.CommandException;
 import com.chint.domain.repository.UserRepository;
 import com.chint.domain.service.LegDomainService;
 import com.chint.infrastructure.repository.jdbc.JdbcLocationRepository;
-import com.chint.infrastructure.repository.jdbc.JdbcOrderDetailRepository;
 import com.chint.infrastructure.repository.jdbc.JdbcRouteRepository;
 import com.chint.infrastructure.repository.jdbc.JdbcUserRepository;
 import com.chint.infrastructure.util.BaseContext;
 import com.chint.infrastructure.util.PageResult;
+import com.chint.manage.entity.OrderDetailBasic;
 import com.chint.manage.entity.OrderDownloadRecord;
 import com.chint.manage.entity.OrderExceedStandard;
-import com.chint.manage.entity.RouteOrderExtensionField;
+import com.chint.manage.entity.RouteOrderExtensionFieldBasic;
 import com.chint.manage.entity.dto.ItineraryPageDto;
 import com.chint.manage.entity.excel.OrderPageExcel;
 import com.chint.manage.entity.excel.BaseExcel;
@@ -67,11 +67,11 @@ public class ManageServiceImpl implements ManageService {
     @Autowired
     private BaseUtil baseUtil;
     @Autowired
-    private JdbcOrderDetailRepository jdbcOrderDetailRepository;
+    private JdbcOrderDetailBasicRepository jdbcOrderDetailBasicRepository;
     @Autowired
     private JdbcLocationRepository locationRepository;
     @Autowired
-    private JdbcRouteOrderExtensionFieldRepository jdbcRouteOrderExtensionFieldRepository;
+    private JdbcRouteOrderExtensionFieldBasicRepository jdbcRouteOrderExtensionFieldBasicRepository;
     @Autowired
     private JdbcTrainOrderDetailRepository jdbcTrainOrderDetailRepository;
     @Autowired
@@ -211,12 +211,12 @@ public class ManageServiceImpl implements ManageService {
         }
         //部门
         if (dto.getBelongDeptCode() != null && !dto.getBelongDeptCode().isEmpty()) {
-            List<RouteOrderExtensionField> routeOrderExtensionFields = jdbcRouteOrderExtensionFieldRepository.findByCondition(dto.getBelongDeptCode());
+            List<RouteOrderExtensionFieldBasic> routeOrderExtensionFieldBasics = jdbcRouteOrderExtensionFieldBasicRepository.findByCondition(dto.getBelongDeptCode());
-            if (routeOrderExtensionFields == null || routeOrderExtensionFields.isEmpty()) {
+            if (routeOrderExtensionFieldBasics == null || routeOrderExtensionFieldBasics.isEmpty()) {
                 return PageResult.totalPageNum(0, new ArrayList<>());
             }
-            List<Long> routeOrderExtensionFieldIds = routeOrderExtensionFields.stream()
+            List<Long> routeOrderExtensionFieldIds = routeOrderExtensionFieldBasics.stream()
-                    .map(RouteOrderExtensionField::getRouteId)
+                    .map(RouteOrderExtensionFieldBasic::getRouteId)
                     .collect(Collectors.toList());
             List<Long> updatedRouteIds = dto.getRouteIds() == null
                     ? routeOrderExtensionFieldIds
@@ -234,18 +234,18 @@ public class ManageServiceImpl implements ManageService {
             dto.setApplicant("%"+dto.getApplicant()+"%");
         }
 
-        List<OrderDetail> list=jdbcOrderDetailRepository.listByCondition(dto,dto.getPageResult());
+        List<OrderDetailBasic> list=jdbcOrderDetailBasicRepository.listByCondition(dto,dto.getPageResult());
         //处理地点信息
-        List<Long> locationIds = new ArrayList<>(list.stream().map(OrderDetail::getOriginId).toList());
+        List<Long> locationIds = new ArrayList<>(list.stream().map(OrderDetailBasic::getOriginId).toList());
-        locationIds.addAll(list.stream().map(OrderDetail::getDestinationId).toList());
+        locationIds.addAll(list.stream().map(OrderDetailBasic::getDestinationId).toList());
         locationIds=locationIds.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList());
         List<Location> locations=locationRepository.findByLocationIdIn(locationIds);
         //根据类型处理出行订单信息
         Map<Long, OrderPageExcel> orderPageDtoMap=new HashMap<>();
-        Map<Integer, List<OrderDetail>> collect = list.stream().collect(Collectors.groupingBy(OrderDetail::getProductType));
+        Map<Integer, List<OrderDetailBasic>> collect = list.stream().collect(Collectors.groupingBy(OrderDetailBasic::getProductType));
-        for (Map.Entry<Integer, List<OrderDetail>> entry : collect.entrySet()) {
+        for (Map.Entry<Integer, List<OrderDetailBasic>> entry : collect.entrySet()) {
             int type = entry.getKey();
-            List<OrderDetail> details = entry.getValue();
+            List<OrderDetailBasic> details = entry.getValue();
             switch (type) {
                 case LEG_TYPE_TRAIN -> dealOrderTrainRecord(details,orderPageDtoMap);
                 case LEG_TYPE_AIRPLANE -> dealOrderFlightRecord(details,orderPageDtoMap);
@@ -254,11 +254,11 @@ public class ManageServiceImpl implements ManageService {
             }
         }
         //处理行程单信息
-        List<Long> routeIds=list.stream().map(OrderDetail::getRouteId).toList();
+        List<Long> routeIds=list.stream().map(OrderDetailBasic::getRouteId).toList();
         routeIds=routeIds.stream().distinct().filter(Objects::nonNull).collect(Collectors.toList());
         List<RouteOrder> routeOrders=jdbcRouteRepository.findByRouteIdIn(routeIds);
 
-        List<User> users=jdbcUserRepository.findAllByEmployeeNoIn(list.stream().map(OrderDetail::getEmployeeNo).collect(Collectors.toList()));
+        List<User> users=jdbcUserRepository.findAllByEmployeeNoIn(list.stream().map(OrderDetailBasic::getEmployeeNo).collect(Collectors.toList()));
 
         List<OrderPageExcel> result = list.stream().map(temp -> {
             OrderPageExcel obj = orderPageDtoMap.get(temp.getOrderId());
@@ -286,7 +286,7 @@ public class ManageServiceImpl implements ManageService {
             }
             return finalObj;
         }).toList();
-        Integer count=jdbcOrderDetailRepository.countByCondition(dto);
+        Integer count=jdbcOrderDetailBasicRepository.countByCondition(dto);
         return PageResult.totalPageNum(count, result);
     }
 
@@ -299,9 +299,9 @@ public class ManageServiceImpl implements ManageService {
         return ExcelUtil.exportReport(orderPageQuery(dto).getRecords());
     }
 
-    private void dealOrderTrainRecord(List<OrderDetail> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
+    private void dealOrderTrainRecord(List<OrderDetailBasic> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
         if (entry!=null&&!entry.isEmpty()){
-            List<TrainOrderDetail> trainOrderDetails=jdbcTrainOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetail::getOrderId).toList());
+            List<TrainOrderDetail> trainOrderDetails=jdbcTrainOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetailBasic::getOrderId).toList());
             for (TrainOrderDetail trainOrderDetail : trainOrderDetails) {
                 OrderPageExcel orderPageDto=new OrderPageExcel();
                 orderPageDto.setStatus(trainOrderDetail.getOrderStatus());
@@ -311,9 +311,9 @@ public class ManageServiceImpl implements ManageService {
         }
     }
 
-    private void dealOrderFlightRecord(List<OrderDetail> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
+    private void dealOrderFlightRecord(List<OrderDetailBasic> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
         if (entry!=null&&!entry.isEmpty()){
-            List<FlightOrderDetail> flightOrderDetails=jdbcFlightOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetail::getOrderId).toList());
+            List<FlightOrderDetail> flightOrderDetails=jdbcFlightOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetailBasic::getOrderId).toList());
             for (FlightOrderDetail flightOrderDetail : flightOrderDetails) {
                 OrderPageExcel orderPageDto=new OrderPageExcel();
                 orderPageDto.setStatus(flightOrderDetail.getOrderStatus());
@@ -323,9 +323,9 @@ public class ManageServiceImpl implements ManageService {
         }
     }
 
-    private void dealOrderHotelRecord(List<OrderDetail> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
+    private void dealOrderHotelRecord(List<OrderDetailBasic> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
         if (entry!=null&&!entry.isEmpty()){
-            List<HotelOrderDetail> hotelOrderDetails=jdbcHotelOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetail::getOrderId).toList());
+            List<HotelOrderDetail> hotelOrderDetails=jdbcHotelOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetailBasic::getOrderId).toList());
             for (HotelOrderDetail hotelOrderDetail : hotelOrderDetails) {
                 OrderPageExcel orderPageDto=new OrderPageExcel();
                 orderPageDto.setStatus(hotelOrderDetail.getOrderStatus());
@@ -338,9 +338,9 @@ public class ManageServiceImpl implements ManageService {
         }
     }
 
-    private void dealOrderCarRecord(List<OrderDetail> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
+    private void dealOrderCarRecord(List<OrderDetailBasic> entry,Map<Long, OrderPageExcel> orderPageDtoMap){
         if (entry!=null&&!entry.isEmpty()){
-            List<CarOrderDetail> carOrderDetails=jdbcCarOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetail::getOrderId).toList());
+            List<CarOrderDetail> carOrderDetails=jdbcCarOrderDetailRepository.findAllByOrderIdIn(entry.stream().map(OrderDetailBasic::getOrderId).toList());
             for (CarOrderDetail carOrderDetail : carOrderDetails) {
                 OrderPageExcel orderPageDto=new OrderPageExcel();
                 orderPageDto.setStatus(carOrderDetail.getOrderStatus());

src/main/java/com/chint/manage/util/BaseUtil.java

@@ -1,12 +1,11 @@
 package com.chint.manage.util;
 
-import com.chint.domain.aggregates.order.OrderDetail;
 import com.chint.domain.aggregates.user.User;
 import com.chint.domain.value_object.system.SystemOrganizationVO;
-import com.chint.infrastructure.repository.jdbc.JdbcOrderDetailRepository;
 import com.chint.infrastructure.util.BaseContext;
-import com.chint.manage.entity.RouteOrderExtensionField;
+import com.chint.manage.entity.RouteOrderExtensionFieldBasic;
-import com.chint.manage.mapper.JdbcRouteOrderExtensionFieldRepository;
+import com.chint.manage.mapper.JdbcOrderDetailBasicRepository;
+import com.chint.manage.mapper.JdbcRouteOrderExtensionFieldBasicRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -20,9 +19,9 @@ import java.util.List;
 @Component
 public class BaseUtil {
     @Autowired
-    private JdbcRouteOrderExtensionFieldRepository jdbcRouteOrderExtensionFieldRepository;
+    private JdbcRouteOrderExtensionFieldBasicRepository jdbcRouteOrderExtensionFieldBasicRepository;
     @Autowired
-    private JdbcOrderDetailRepository jdbcOrderDetailRepository;
+    private JdbcOrderDetailBasicRepository jdbcOrderDetailBasicRepository;
 
     public User getCurrentUser() {
         return BaseContext.getCurrentUser();
@@ -31,18 +30,18 @@ public class BaseUtil {
     public List<Long> getRouteIds(){
         List<String> list = BaseContext.getCurrentUser().loadRoleOrg().getRoleOrgList()
                 .stream().filter(s->s.getOrgShortCode()!=null).map(SystemOrganizationVO::getOrgShortCode).toList();
-        List<RouteOrderExtensionField> result=jdbcRouteOrderExtensionFieldRepository.findByCondition(list);
+        List<RouteOrderExtensionFieldBasic> result= jdbcRouteOrderExtensionFieldBasicRepository.findAllByBelongDeptCodeIn(list);
-        return result.stream().map(RouteOrderExtensionField::getRouteId).toList();
+        return result.stream().map(RouteOrderExtensionFieldBasic::getRouteId).toList();
     }
 
     public List<Long> getOrderIds(){
         List<Long> routeIds = getRouteIds();
-        return jdbcOrderDetailRepository.findAllOrderId(routeIds);
+        return jdbcOrderDetailBasicRepository.findAllOrderId(routeIds);
     }
 
     public List<String> getOrderNos(){
         List<Long> routeIds = getRouteIds();
-        return jdbcOrderDetailRepository.findAllOrderNo(routeIds);
+        return jdbcOrderDetailBasicRepository.findAllOrderNo(routeIds);
     }
 
     /**

src/main/java/com/chint/manage/util/DataJdbcCreatorUtil.java

@@ -39,7 +39,7 @@ public class DataJdbcCreatorUtil {
      */
     private List<String> getTables() throws SQLException {
         List<String> tables = new ArrayList<String>();
-        tables.add("route_order");
+        tables.add("order_detail");
         return tables;
     }
 
@@ -179,11 +179,11 @@ public class DataJdbcCreatorUtil {
         } else if (type.indexOf(type_int) > -1) {
             return "java.lang.Integer";
         } else if (type.indexOf(type_date) > -1) {
-            return "java.util.Date";
+            return "java.time.LocalDateTime";
         } else if (type.indexOf(type_text) > -1) {
             return "java.lang.String";
         } else if (type.indexOf(type_timestamp) > -1) {
-            return "java.util.Date";
+            return "java.time.LocalDateTime";
         } else if (type.indexOf(type_bit) > -1) {
             return "java.lang.Boolean";
         } else if (type.indexOf(type_decimal) > -1) {
@@ -203,11 +203,11 @@ public class DataJdbcCreatorUtil {
         } else if (type.indexOf(type_longtext) > -1) {
             return "java.lang.String";
         } else if (type.indexOf(type_datetime) > -1) {
-            return "java.util.Date";
+            return "java.time.LocalDateTime";
         } else if (type.indexOf(type_binary) > -1) {
             return "java.lang.Long";
         } else if (type.indexOf(type_time) > -1) {
-            return "java.util.Date";
+            return "java.time.LocalDateTime";
         }