From 18ee460bc42b8ab6b212929dc12ce7328fb8d558 Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 12 Dec 2025 16:38:26 +0800 Subject: [PATCH] 1 --- .../cst/driver/mapper/DriverMapper.java | 11 +++++-- .../cst/driver/pojo/entity/DriverEntity.java | 4 +++ .../service/impl/DriverServiceImpl.java | 11 ++++--- .../dispose/goods/contant/BizType.java | 28 ++++++++++++++++ .../pojo/entity/GoodsCategoryEntity.java | 19 +++++++++++ .../mapper/cst/driver/DriverMapper.xml | 33 +++++++++---------- .../mapper/cst/project/ProjectMapper.xml | 16 +-------- .../mapper/cst/station/StationMapper.xml | 15 +-------- .../mapper/cst/truck/TruckMapper.xml | 16 +-------- .../mapper/finance/bill/BillMapper.xml | 15 +-------- .../finance/expenseItem/ExpenseItemMapper.xml | 15 +-------- .../moneyAccount/MoneyAccountMapper.xml | 15 +-------- .../finance/moneyFlow/MoneyFlowMapper.xml | 14 +------- .../mapper/goods/goods/GoodsMapper.xml | 6 ++-- .../goodsCategory/GoodsCategoryMapper.xml | 6 ++-- 15 files changed, 95 insertions(+), 129 deletions(-) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/contant/BizType.java diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java index 1c8dc9d..3eb8c3d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java @@ -1,15 +1,22 @@ package com.njzscloud.dispose.cst.driver.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 司机 + * * @author ljw */ @Mapper public interface DriverMapper extends BaseMapper { + + Page paging(Page page, @Param("ew") QueryWrapper ew); + + DriverEntity getById(Long id); + } - - diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java index a023b9c..a438819 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java @@ -1,5 +1,6 @@ package com.njzscloud.dispose.cst.driver.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; import lombok.Setter; @@ -35,6 +36,9 @@ public class DriverEntity extends BaseEntity { */ private Long orgId; + @TableField(exist = false) + private String orgName; + /** * 驾驶证编号 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java index 5a9a5ee..fc0c33a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java @@ -1,6 +1,8 @@ package com.njzscloud.dispose.cst.driver.service.impl; +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; @@ -16,6 +18,7 @@ import java.util.List; /** * 司机 + * * @author ljw */ @Slf4j @@ -41,13 +44,13 @@ public class DriverServiceImpl extends ServiceImpl i @Override public DriverEntity detail(Long id) { - return this.getById(id); + return baseMapper.getById(id); } @Override public PageResult paging(PageParam pageParam, DriverEntity driverEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(driverEntity))); + Page page = pageParam.toPage(); + page.addOrder(OrderItem.desc("cd.create_time")); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query(driverEntity))); } } - - diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/contant/BizType.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/contant/BizType.java new file mode 100644 index 0000000..4d369c4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/contant/BizType.java @@ -0,0 +1,28 @@ +package com.njzscloud.dispose.goods.contant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * 字典代码:biz_type + * 字典名称:业务类型 + * + * @author ljw + */ +@Getter +@RequiredArgsConstructor +public enum BizType implements DictStr { + ZaiShengPin("ZaiShengPin", "再生品"), + + HuiShouPin("HuiShouPin", "回收品"), + + QiTa("QiTa", "其他"), + + ; + private final String val; + + private final String txt; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java index 0991528..d2f7ae4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java @@ -1,7 +1,9 @@ package com.njzscloud.dispose.goods.goodscategory.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.goods.contant.BizType; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -23,6 +25,9 @@ public class GoodsCategoryEntity extends BaseEntity { */ private String bizType; + @TableField(exist = false) + private String bizTypeName; + /** * 分类名称 */ @@ -37,6 +42,20 @@ public class GoodsCategoryEntity extends BaseEntity { * 排序 */ private Integer sort; + + public String getBizTypeName() { + if (bizType == null) { + return null; + } + for (BizType type : BizType.values()) { + if (type.getVal().equals(bizType)) { + bizTypeName = type.getTxt(); + break; + } + } + return bizTypeName; + } + } 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 e023d4f..8b53589 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml @@ -7,6 +7,7 @@ + @@ -22,31 +23,27 @@ - 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 + cd.id, cd.user_id, cd.customer_id, cd.org_id, co.org_name, cd.driving_licence_no, cd.driver_name, cd.phone, + cd.driving_licence, cd.licence_start_time, cd.licence_end_time, cd.busy, + cd.creator_id, cd.modifier_id, cd.create_time, cd.modify_time, cd.deleted - SELECT - FROM cst_driver - WHERE id = #{id} + FROM cst_driver cd + left join cst_org co on cd.org_id = co.id + WHERE cd.id = #{id} - SELECT - FROM cst_driver - - AND user_id = #{userId} - AND customer_id = #{customerId} - AND org_id = #{orgId} - AND driver_name = #{driverName} - AND phone = #{phone} - AND busy = #{busy} - AND deleted = #{deleted} - - ORDER BY create_time DESC + FROM cst_driver cd + left join cst_org co on cd.org_id = co.id + + ${ew.customSqlSegment} + + 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 f1bbe2b..3e41d5a 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml @@ -37,24 +37,10 @@ contract_start_date, contract_end_date, creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM cst_project WHERE id = #{id} - 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 37129ea..e2329e6 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml @@ -30,23 +30,10 @@ creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM cst_station WHERE id = #{id} - 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 73324b9..e51ce5f 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml @@ -33,25 +33,11 @@ creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM cst_truck WHERE id = #{id} - diff --git a/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml index 6dcfef3..4cfb742 100644 --- a/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml @@ -30,25 +30,12 @@ creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM fin_bill WHERE id = #{id} - diff --git a/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml index 6a4fbc8..6e9d7c7 100644 --- a/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml @@ -32,25 +32,12 @@ goods_scope, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM fin_expense_item WHERE id = #{id} - diff --git a/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml index c1ea83f..0db8027 100644 --- a/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml @@ -23,25 +23,12 @@ creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM fin_money_account WHERE id = #{id} - diff --git a/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml index 818e6f0..ad03524 100644 --- a/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml @@ -25,24 +25,12 @@ money_change_category, memo, creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM fin_money_flow WHERE id = #{id} - diff --git a/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml b/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml index e2a3404..d91b61f 100644 --- a/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml @@ -28,13 +28,13 @@ fg, sfg, rg, sort, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted - SELECT FROM gds_goods WHERE id = #{id} - + -