From 4e83e3570a2910622e294e71e69d9562fbe9c2af Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 3 Jul 2025 15:30:18 +0800 Subject: [PATCH] =?UTF-8?q?WEB=EF=BC=9A=E5=AE=A2=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fys-admin/src/main/resources/application.yml | 2 +- .../customer/domain/query/UserQueryCriteria.java | 7 ++++--- .../com/fuyuanshen/customer/service/CustomerService.java | 3 --- .../customer/service/impl/CustomerServiceImpl.java | 6 +++--- .../src/main/resources/mapper/customer/CustomerMapper.xml | 8 ++++---- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/fys-admin/src/main/resources/application.yml b/fys-admin/src/main/resources/application.yml index b10ed90..b99b5d2 100644 --- a/fys-admin/src/main/resources/application.yml +++ b/fys-admin/src/main/resources/application.yml @@ -136,7 +136,7 @@ tenant: # https://baomidou.com/config/ mybatis-plus: # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效 - enableLogicDelete: true + enableLogicDelete: false # 多包名使用 例如 com.fuyuanshen.**.mapper,org.xxx.**.mapper mapperPackage: com.fuyuanshen.**.mapper # 对应的 XML 文件位置 diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java index d4b6f5b..c454b4a 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java @@ -15,6 +15,7 @@ */ package com.fuyuanshen.customer.domain.query; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -29,7 +30,7 @@ import java.util.Set; * @date 2018-11-23 */ @Data -public class UserQueryCriteria implements Serializable { +public class UserQueryCriteria extends BaseEntity { @Schema(name = "ID") private Long id; @@ -52,8 +53,8 @@ public class UserQueryCriteria implements Serializable { @Schema(name = "部门ID") private Long deptId; - @Schema(name = "创建时间") - private List createTime; + // @Schema(name = "创建时间") + // // private List createTime; @Schema(name = "页码", example = "1") private Integer pageNum = 1; diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java index 12f4a2c..98ccd3a 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/CustomerService.java @@ -16,7 +16,6 @@ import java.util.Set; */ public interface CustomerService { - /** * 分页查询客户 * @@ -26,7 +25,6 @@ public interface CustomerService { */ TableDataInfo queryCustomers(UserQueryCriteria criteria, Page page); - /** * 查询所有客户 * @@ -58,5 +56,4 @@ public interface CustomerService { void delete(Set ids); - } diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java index bbb27d1..5eb7705 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java @@ -45,7 +45,7 @@ public class CustomerServiceImpl extends ServiceImpl i List consumerVoList = BeanUtil.copyToList(users, ConsumerVo.class); Long total = customerMapper.countCustomers(criteria); // return PageUtil.toPage(consumerVoList, total); - return new TableDataInfo(consumerVoList, total); + return new TableDataInfo(consumerVoList, total); } @@ -94,7 +94,7 @@ public class CustomerServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public void updateCustomer(Customer resources) throws Exception { - + saveOrUpdate(resources); } @@ -106,7 +106,7 @@ public class CustomerServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public void delete(Set ids) { - + customerMapper.deleteByIds(ids); } diff --git a/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml b/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml index eeb2e85..98d2817 100644 --- a/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml @@ -112,8 +112,8 @@ and u.enabled = #{criteria.enabled} - - and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]} + + and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime} order by u.user_id desc @@ -142,8 +142,8 @@ and u.enabled = #{criteria.enabled} - - and u.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]} + + and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}