Merge #40 into master from cc_20251208_visit

fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

* cc_20251208_visit: (25 commits squashed)

  - feat:拜访记录

  - fix:拜访详情接口新增字段

  - fix:新增状态转义字段

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix

  - fix:管理员能查看所有加盟商

  - fix:去掉部分字段非空校验

  - fix:空校验

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

  - fix

  - fix:拜访记录失效延时消息

  - fix:拜访记录统计

  - fix:拜访记录统计新增筛选条件

  - fix:字段转义

  - feat:拜访调整

  - feat:拜访调整_过滤我的

  - feat:拜访调整_过滤我的

  - feat:拜访字段调整

  - feat:拜访字段调整

  - Merge branch 'master' into cc_20251208_visit

  - fix:拜访我的加盟商取消管辖权限过滤

  - Merge branch 'master' into cc_20251208_visit

  - fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段

  - fix:新增字段

  - fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/40

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

@@ -36,6 +36,12 @@ public class VisitRecordQueryRequest extends PageBasicInfo {
 
     @ApiModelProperty("拜访状态，0待签到 1待签退 2已完成 3已失效")
     private Integer status;
+
+    @ApiModelProperty("开新店意愿")
+    private String desire;
+
+    @ApiModelProperty("招商所属大区ID")
+    private Long investRegionId;
     
     @ApiModelProperty(value = "拜访人id", hidden = true)
     private String userId;

coolstore-partner-model/src/main/java/com/cool/store/vo/visit/VisitPartnerListVO.java

@@ -33,4 +33,10 @@ public class VisitPartnerListVO {
     
     @ApiModelProperty("新老加盟商，0新 1老")
     private Integer isVeteran;
+
+    @ApiModelProperty("招商所属大区名称")
+    private String investRegionName;
+
+    @ApiModelProperty("招商经理名称")
+    private String investmentManagerName;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/visit/VisitRecordDetailVO.java

@@ -93,6 +93,12 @@ public class VisitRecordDetailVO {
     @ApiModelProperty("拜访人名称")
     private String userName;
 
+    @ApiModelProperty("招商所属大区名称")
+    private String investRegionName;
+
+    @ApiModelProperty("招商经理名称")
+    private String investmentManagerName;
+
     public String getStatusName() {
         return VisitStatusEnum.getDescByStatus(status);
     }

coolstore-partner-model/src/main/java/com/cool/store/vo/visit/VisitRecordListVO.java

@@ -1,5 +1,6 @@
 package com.cool.store.vo.visit;
 
+import com.cool.store.annotation.DictField;
 import com.cool.store.enums.visit.VisitStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,6 +41,10 @@ public class VisitRecordListVO {
     @ApiModelProperty("开新店意愿")
     private String desire;
 
+    @ApiModelProperty("开新店意愿名称")
+    @DictField
+    private String desireName;
+
     @ApiModelProperty("意向开店城市")
     private String desireCity;
 
@@ -73,6 +78,18 @@ public class VisitRecordListVO {
     @ApiModelProperty("拜访人")
     private String visitUserName;
 
+    @ApiModelProperty("招商所属大区ID")
+    private Long investRegionId;
+
+    @ApiModelProperty("招商所属大区名称")
+    private String investRegionName;
+
+    @ApiModelProperty("招商经理")
+    public String investmentManager;
+    
+    @ApiModelProperty("招商经理名称")
+    private String investmentManagerName;
+
     public String getStatusName() {
         return VisitStatusEnum.getDescByStatus(status);
     }