From 08cfaa9665537d4a95b809b5b1d89d2fd3ad4ae1 Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 17 Dec 2025 17:20:27 +0800 Subject: [PATCH] 1 --- .../cst/order/controller/OrderController.java | 1 + .../dispose/cst/order/mapper/OrderMapper.java | 1 + .../cst/order/pojo/entity/OrderEntity.java | 1 + .../cst/order/service/OrderService.java | 1 + .../order/service/impl/OrderServiceImpl.java | 1 + .../controller/OrderCargoPlaceController.java | 1 + .../mapper/OrderCargoPlaceMapper.java | 1 + .../pojo/entity/OrderCargoPlaceEntity.java | 1 + .../service/OrderCargoPlaceService.java | 1 + .../impl/OrderCargoPlaceServiceImpl.java | 1 + .../OrderExpenseDetailController.java | 1 + .../mapper/OrderExpenseDetailMapper.java | 1 + .../pojo/entity/OrderExpenseDetailEntity.java | 1 + .../service/OrderExpenseDetailService.java | 1 + .../impl/OrderExpenseDetailServiceImpl.java | 1 + .../OrderExpenseItemsController.java | 1 + .../mapper/OrderExpenseItemsMapper.java | 1 + .../pojo/entity/OrderExpenseItemsEntity.java | 1 + .../service/OrderExpenseItemsService.java | 1 + .../impl/OrderExpenseItemsServiceImpl.java | 1 + .../controller/OrderTransController.java | 1 + .../orderTrans/mapper/OrderTransMapper.java | 1 + .../pojo/entity/OrderTransEntity.java | 1 + .../orderTrans/service/OrderTransService.java | 1 + .../service/impl/OrderTransServiceImpl.java | 1 + .../project/controller/ProjectController.java | 1 + .../cst/project/mapper/ProjectMapper.java | 6 ++ .../project/pojo/entity/ProjectEntity.java | 30 +++++++ .../service/impl/ProjectServiceImpl.java | 80 ++++++++++++++++++- .../mapper/cst/order/OrderMapper.xml | 1 + .../orderCargoPlace/OrderCargoPlaceMapper.xml | 1 + .../OrderExpenseDetailMapper.xml | 1 + .../OrderExpenseItemsMapper.xml | 1 + .../cst/orderTrans/OrderTransMapper.xml | 1 + .../mapper/cst/project/ProjectMapper.xml | 22 +++-- 35 files changed, 160 insertions(+), 9 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java index 3da4a86..e6c6286 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java @@ -67,3 +67,4 @@ public class OrderController { } } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java index 8fd2e60..056d11a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/mapper/OrderMapper.java @@ -12,3 +12,4 @@ import org.apache.ibatis.annotations.Mapper; public interface OrderMapper extends BaseMapper { } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java index 8abc8e6..0955163 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderEntity.java @@ -132,3 +132,4 @@ public class OrderEntity extends BaseEntity { private String customerMemo; } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java index 6b7390a..20e7c25 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java @@ -24,3 +24,4 @@ public interface OrderService extends IService { PageResult paging(PageParam pageParam, OrderEntity orderEntity); } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java index 8eab6ca..39868b0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/impl/OrderServiceImpl.java @@ -52,3 +52,4 @@ public class OrderServiceImpl extends ServiceImpl impl } } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java index a436f7e..32175cb 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/controller/OrderCargoPlaceController.java @@ -67,3 +67,4 @@ public class OrderCargoPlaceController { } } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java index 3940608..9e4adf6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/mapper/OrderCargoPlaceMapper.java @@ -12,3 +12,4 @@ import org.apache.ibatis.annotations.Mapper; public interface OrderCargoPlaceMapper extends BaseMapper { } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java index d19d130..8803916 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/pojo/entity/OrderCargoPlaceEntity.java @@ -84,3 +84,4 @@ public class OrderCargoPlaceEntity extends BaseEntity { private Double lat; } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java index ed49c0d..14fbd32 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/OrderCargoPlaceService.java @@ -24,3 +24,4 @@ public interface OrderCargoPlaceService extends IService PageResult paging(PageParam pageParam, OrderCargoPlaceEntity orderCargoPlaceEntity); } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java index c3f55f8..b33ee69 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderCargoPlace/service/impl/OrderCargoPlaceServiceImpl.java @@ -52,3 +52,4 @@ public class OrderCargoPlaceServiceImpl extends ServiceImpl { } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java index 14c6f01..5e9b2a0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/pojo/entity/OrderExpenseDetailEntity.java @@ -96,3 +96,4 @@ public class OrderExpenseDetailEntity extends BaseEntity { private Long payerMoneyAccount; } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/OrderExpenseDetailService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/OrderExpenseDetailService.java index 588a43c..a2ec57e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/OrderExpenseDetailService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/OrderExpenseDetailService.java @@ -24,3 +24,4 @@ public interface OrderExpenseDetailService extends IService paging(PageParam pageParam, OrderExpenseDetailEntity orderExpenseDetailEntity); } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java index 3305602..66e07ff 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseDetail/service/impl/OrderExpenseDetailServiceImpl.java @@ -52,3 +52,4 @@ public class OrderExpenseDetailServiceImpl extends ServiceImpl { } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java index f7b83c0..72949c6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/pojo/entity/OrderExpenseItemsEntity.java @@ -100,3 +100,4 @@ public class OrderExpenseItemsEntity extends BaseEntity { private String goodsScope; } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java index c0b5fea..2881555 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/OrderExpenseItemsService.java @@ -24,3 +24,4 @@ public interface OrderExpenseItemsService extends IService paging(PageParam pageParam, OrderExpenseItemsEntity orderExpenseItemsEntity); } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java index 1d9a888..f3756f2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderExpenseItems/service/impl/OrderExpenseItemsServiceImpl.java @@ -52,3 +52,4 @@ public class OrderExpenseItemsServiceImpl extends ServiceImpl { } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java index 736feee..9911b0d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/pojo/entity/OrderTransEntity.java @@ -181,3 +181,4 @@ public class OrderTransEntity extends BaseEntity { private LocalDateTime outTime; } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java index 7a6dedf..b258180 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/OrderTransService.java @@ -24,3 +24,4 @@ public interface OrderTransService extends IService { PageResult paging(PageParam pageParam, OrderTransEntity orderTransEntity); } + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java index 1cd11a9..fa7c871 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/orderTrans/service/impl/OrderTransServiceImpl.java @@ -52,3 +52,4 @@ public class OrderTransServiceImpl extends ServiceImpl { + + Page paging(Page page, @Param("ew") QueryWrapper ew); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java index c7c7072..98c4328 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java @@ -1,7 +1,10 @@ package com.njzscloud.dispose.cst.project.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -35,21 +38,48 @@ public class ProjectEntity extends BaseEntity { */ private Long transCustomerId; + /** + * 运输方客户信息 + */ + @TableField(exist = false) + private CustomerEntity transCustomerInfo; + /** * 运输方组织 Id */ private Long transOrgId; + @TableField(exist = false) + private String transOrgName; + + /** + * 运输方组织信息 + */ + @TableField(exist = false) + private OrgEntity transOrgInfo; + /** * 产废方/购买方客户 Id */ private Long fringeCustomerId; + /** + * 产废方/购买方客户信息 + */ + @TableField(exist = false) + private CustomerEntity fringeCustomerInfo; + /** * 产废方/购买方组织 Id */ private Long fringeOrgId; + /** + * 产废方/购买方组织信息 + */ + @TableField(exist = false) + private OrgEntity fringeOrgInfo; + /** * 省；代码 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java index ce540cf..c4c9462 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java @@ -1,9 +1,17 @@ package com.njzscloud.dispose.cst.project.service.impl; +import cn.hutool.core.collection.CollUtil; +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.plugins.pagination.Page; 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.customer.pojo.entity.CustomerEntity; +import com.njzscloud.dispose.cst.customer.service.CustomerService; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import com.njzscloud.dispose.cst.org.service.OrgService; import com.njzscloud.dispose.cst.project.mapper.ProjectMapper; import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; import com.njzscloud.dispose.cst.project.service.ProjectService; @@ -12,10 +20,12 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * 项目信息 + * * @author ljw */ @Slf4j @@ -23,6 +33,9 @@ import java.util.List; @RequiredArgsConstructor public class ProjectServiceImpl extends ServiceImpl implements ProjectService { + private final CustomerService customerService; + private final OrgService orgService; + @Override public void add(ProjectEntity projectEntity) { this.save(projectEntity); @@ -41,12 +54,73 @@ public class ProjectServiceImpl extends ServiceImpl paging(PageParam pageParam, ProjectEntity projectEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(projectEntity))); + QueryWrapper ew = Wrappers.query().eq("p.deleted", 0); + if (projectEntity != null) { + String projectName = projectEntity.getProjectName(); + String transOrgName = projectEntity.getTransOrgName(); + ew.like(projectName != null, "p.project_name", projectName).like(transOrgName != null, "o.org_name", transOrgName); + } + + // 直接调用自定义分页 SQL（项目名称 & 运输公司名称均为模糊查询） + Page page = pageParam.toPage(); + page.addOrder(OrderItem.desc("p.create_time"), OrderItem.desc("p.id")); + Page paging = baseMapper.paging(page, ew); + + if (CollUtil.isNotEmpty(paging.getRecords())) { + fillCustomerAndOrgInfo(paging.getRecords()); + } + + return PageResult.of(paging); + } + + /** + * 批量填充运输方 / 产废方（购买方）的客户与组织信息 + */ + private void fillCustomerAndOrgInfo(List records) { + // 收集所有需要的 ID + Set transCustomerIds = records.stream().map(ProjectEntity::getTransCustomerId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set fringeCustomerIds = records.stream().map(ProjectEntity::getFringeCustomerId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set transOrgIds = records.stream().map(ProjectEntity::getTransOrgId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set fringeOrgIds = records.stream().map(ProjectEntity::getFringeOrgId).filter(Objects::nonNull).collect(Collectors.toSet()); + + Set allCustomerIds = new HashSet<>(transCustomerIds); + allCustomerIds.addAll(fringeCustomerIds); + Set allOrgIds = new HashSet<>(transOrgIds); + allOrgIds.addAll(fringeOrgIds); + + Map customerMap = Collections.emptyMap(); + Map orgMap = Collections.emptyMap(); + + if (!allCustomerIds.isEmpty()) { + customerMap = customerService.listByIds(allCustomerIds).stream().collect(Collectors.toMap(CustomerEntity::getId, it -> it)); + } + if (!allOrgIds.isEmpty()) { + orgMap = orgService.listByIds(allOrgIds).stream().collect(Collectors.toMap(OrgEntity::getId, it -> it)); + } + + for (ProjectEntity item : records) { + if (item.getTransCustomerId() != null) { + item.setTransCustomerInfo(customerMap.get(item.getTransCustomerId())); + } + if (item.getFringeCustomerId() != null) { + item.setFringeCustomerInfo(customerMap.get(item.getFringeCustomerId())); + } + if (item.getTransOrgId() != null) { + item.setTransOrgInfo(orgMap.get(item.getTransOrgId())); + } + if (item.getFringeOrgId() != null) { + item.setFringeOrgInfo(orgMap.get(item.getFringeOrgId())); + } + } } } diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml index 04ec4fb..085f7af 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml @@ -70,3 +70,4 @@ + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml index 75560d7..25e1949 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderCargoPlace/OrderCargoPlaceMapper.xml @@ -32,3 +32,4 @@ + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml index ab61bba..a0b2fe6 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseDetail/OrderExpenseDetailMapper.xml @@ -28,3 +28,4 @@ + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml index ee831a6..c6bfe7b 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderExpenseItems/OrderExpenseItemsMapper.xml @@ -34,3 +34,4 @@ + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml index f7dde3e..3725b4b 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/orderTrans/OrderTransMapper.xml @@ -56,3 +56,4 @@ + 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 3e41d5a..095cfd0 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml @@ -31,16 +31,26 @@ - 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 + p.id, p.project_name, p.contract_picture, p.trans_customer_id, p.trans_org_id, + p.fringe_customer_id, p.fringe_org_id, p.province, p.city, p.area, p.town, + p.province_name, p.city_name, p.area_name, p.town_name, p.address, p.lng, p.lat, + p.contract_start_date, p.contract_end_date, p.creator_id, p.modifier_id, p.create_time, p.modify_time, p.deleted + + +