From f55cdbdb90a15789a618b99baad2ef8a002cebbe Mon Sep 17 00:00:00 2001 From: yqy Date: Fri, 22 Sep 2023 13:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=B7=BB=E5=8A=A0=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/baiye/modules/distribute/dto/CustomDTO.java | 5 +++-- .../com/baiye/modules/distribute/entity/CustomEntity.java | 6 ++---- .../com/baiye/modules/distribute/mapper/CustomMapper.java | 2 +- .../main/java/com/baiye/modules/distribute/vo/CustomVO.java | 3 +++ admin/src/main/resources/application-dev.yml | 2 +- admin/src/main/resources/mapper/CustomMapper.xml | 6 ++++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java index 4425dfd..f301ed4 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/dto/CustomDTO.java @@ -17,7 +17,6 @@ public class CustomDTO { @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) private Long customId; - @Schema(title = "客户名称") @NotNull(message = "客户名称不能为空", groups = { CreateGroup.class }) private String customName; @@ -35,7 +34,6 @@ public class CustomDTO { private String market; @Schema(title = "区") - @NotNull(message = "地址不能为空", groups = { CreateGroup.class }) private String distinguish; @Schema(title = "详细地址") @@ -50,6 +48,9 @@ public class CustomDTO { @NotNull(message = "状态不能为空", groups = { CreateGroup.class }) private Integer enrollStatus; + @Schema(title = "备注") + private String remark; + @Schema(title = "门店信息") @NotEmpty(message = "门店信息不能为空", groups = { CreateGroup.class }) private List customStoreEntities; diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java index 9f935e9..0310169 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java @@ -79,8 +79,6 @@ public class CustomEntity extends BaseEntity { @Schema(description = "分发时间") private Date distributeTime; - - - - + @Schema(title = "备注") + private String remark; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java index 9fac901..2452474 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java @@ -22,7 +22,7 @@ public interface CustomMapper extends ExtendMapper { wrapperX.eqIfPresent(CustomEntity::getCreateBy, qo.getCreateBy()) .likeIfPresent(CustomEntity::getCustomName, qo.getCustomName()) .likeIfPresent(CustomEntity::getBatchNo, qo.getBatchNo()) - .eqIfPresent(CustomEntity::getCustomId,qo.getCompanyId()) + .eqIfPresent(CustomEntity::getCompanyId,qo.getCompanyId()) .eqIfPresent(CustomEntity::getType,qo.getSalesmanType()) .eqIfPresent(CustomEntity::getCustomNid, qo.getCustomNid()) .eqIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus()); diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java index c7b5e55..c2c3df9 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java @@ -54,4 +54,7 @@ public class CustomVO { @Schema(description = "公司id") private Long companyId; + + @Schema(title = "备注") + private String remark; } diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml index af0b90e..46b7b61 100644 --- a/admin/src/main/resources/application-dev.yml +++ b/admin/src/main/resources/application-dev.yml @@ -32,5 +32,5 @@ springdoc: #mybatis plus 设置 mybatis-plus: configuration: - #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志 +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志 log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl #关闭sql日志 diff --git a/admin/src/main/resources/mapper/CustomMapper.xml b/admin/src/main/resources/mapper/CustomMapper.xml index 703b133..2c7f000 100644 --- a/admin/src/main/resources/mapper/CustomMapper.xml +++ b/admin/src/main/resources/mapper/CustomMapper.xml @@ -13,20 +13,22 @@ cm.radius, cm.batch_no, cm.enroll_status, + cm.remark, cm.create_time