客户添加备注

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<CustomStoreEntity> customStoreEntities;

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;
 }

admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java

@@ -22,7 +22,7 @@ public interface CustomMapper extends ExtendMapper<CustomEntity> {
 		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());

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;
 }

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日志

admin/src/main/resources/mapper/CustomMapper.xml

@@ -13,20 +13,22 @@
 		cm.radius,
 		cm.batch_no,
 		cm.enroll_status,
+		cm.remark,
 		cm.create_time
 	</sql>
 
 	<select id="selectByPage" resultType="com.baiye.modules.distribute.vo.CustomVO">
 		SELECT
+		DISTINCT
 		<include refid="Base_Alias_Column_List"/>
 		FROM
-		tb_custom cm JOIN  tb_custom_store s on cm.custom_id = s. custom_id
+		tb_custom cm JOIN  tb_custom_store s on cm.custom_id = s.custom_id
 
 		${ew.customSqlSegment}
 		<if test="storeId != null">
 			and  s.store_id = #{storeId,jdbcType=BIGINT}
 		</if>
-		order by  cm.create_time desc
+		order by  cm.create_time desc, cm.custom_id desc
 	</select>
 
 	<select id="selectMaxBatchNoByCompanyId" resultType="java.lang.String">