Merge branch 'cc20240703_prefried' into 'master'

Cc20240703 prefried

See merge request hangzhou/java/custom_zxjp!127

coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java

@@ -1,5 +1,8 @@
 package com.cool.store.dto.pre.fry;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,25 +15,71 @@ import java.util.Date;
  */
 @Data
 public class ApplyManagementDTO {
-
+    @ExcelIgnore
     private Long id;
+
+    @ExcelProperty(value = "门店编号",order = 3)
     @ApiModelProperty("门店Code")
+    @ColumnWidth(30)
     private String storeCode;
+
+    @ExcelProperty(value = "门店名称",order = 2)
     @ApiModelProperty("门店名称")
+    @ColumnWidth(30)
     private String storeName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "申请单号",order = 1)
     @ApiModelProperty("申请单号")
     private String applyCode;
+
+    @ExcelIgnore
     @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜 ")
     private Integer applyType;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "申请类型",order =4)
+    private String applyTypeName;
+
+    @ExcelIgnore
     @ApiModelProperty("申请人ID")
     private String createUserId;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "申请人",order = 5)
     @ApiModelProperty("申请人名称")
     private String createUserName;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "申请人手机号",order =6)
     @ApiModelProperty("申请人手机号")
     private String createUserMobile;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "申请时间",order = 7)
+    private String createTimeStr;
+
+    @ExcelIgnore
     @ApiModelProperty("申请时间")
     private Date createTime;
+
+    @ColumnWidth(30)
+    @ExcelProperty(value = "审核状态",order =8)
+    private String auditStatusName;
+
+    @ExcelIgnore
     @ApiModelProperty("审核状态：0-审批中，1-审核通过，2-审核不通过")
     private Integer auditStatus;
 
+    @ExcelIgnore
+    @ApiModelProperty("所属大区")
+    private String regionName;
+    @ExcelIgnore
+    private Long regionId;
+    @ExcelIgnore
+    private String investmentManagerId;
+    @ExcelIgnore
+    @ApiModelProperty("督导")
+    private String investmentManagerName;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementQueryDTO.java

@@ -4,6 +4,7 @@ import com.cool.store.common.PageBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class ApplyManagementQueryDTO extends PageBasicInfo {
@@ -25,4 +26,8 @@ public class ApplyManagementQueryDTO extends PageBasicInfo {
     private Date createTimeEnd;
     @ApiModelProperty("申请编号")
     private String applyCode;
+    @ApiModelProperty("所属大区")
+    private List<Long> regionIds;
+    @ApiModelProperty("所属督导")
+    private String investmentManagerId;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java

@@ -33,7 +33,6 @@ public class AddBranchShopRequest {
 
     @NotNull
     @Min(1)
-    @Max(5)
     @ApiModelProperty(" 加盟模式//'1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店',4-强加盟")
     private Integer joinMode;
     @NotBlank

coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java

@@ -22,7 +22,7 @@ public class AddLineRequest {
 
     @NotNull
     @Min(1)
-    @Max(5)
+
     //'1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店',
     private Integer joinMode;
 

coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java

@@ -24,7 +24,6 @@ public class BranchShopDetailRequest {
     private Long regionId;
     @NotNull
     @Min(1)
-    @Max(5)
     @ApiModelProperty("加盟模式 1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店 4- 强加盟")
     private Integer joinMode;
     @NotBlank