Merge #43 into master from cc_20251208_visit
拜访记录和铺位导出
* cc_20251208_visit: (37 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:新老加盟商判断逻辑修复；统计接口新增筛选条件
- fix:过滤未分配招商经理的线索
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
- Merge branch 'master' into cc_20251208_visit
- Merge branch 'master' into cc_20251208_visit
- fix:拜访记录导出
- fix:拜访记录导出限制
- fix:拜访记录导出限制
- fix:铺位导出
- fix:铺位及拜访记录导出加锁时机修改
- 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/43
This commit is contained in:
王非凡
@@ -40,6 +40,8 @@ public class CommonConstants {
|
||||
|
||||
public static final int MAX_EXPORT_SIZE = 10000;
|
||||
|
||||
public static final int MAX_EXPORT_SIZE_PRO = 100000;
|
||||
|
||||
public static final int INT_MAX_VALUE = 2147483647;
|
||||
/**
|
||||
* 跟进任务通知缓存时间 1小时
|
||||
|
||||
@@ -341,4 +341,14 @@ public class RedisConstant {
|
||||
* 十二分导入锁
|
||||
*/
|
||||
public static final String TP_PENALTY_APPLY_IMPORT_LOCK = "tp_penalty_apply_import_lock";
|
||||
|
||||
/**
|
||||
* 拜访记录导出锁
|
||||
*/
|
||||
public static final String VISIT_RECORD_EXPORT_LOCK = "visit_record_export_lock";
|
||||
|
||||
/**
|
||||
* 全部铺位导出锁
|
||||
*/
|
||||
public static final String POINT_EXPORT_LOCK = "point_export_lock";
|
||||
}
|
||||
|
||||
@@ -271,6 +271,7 @@ public enum ErrorCodeEnum {
|
||||
|
||||
BANK_EXIST(151007,"当前银行已存在，请直接选择！",null),
|
||||
EXPORT_LIMIT_5000(151008,"导出数据不能超过5000条，请增加筛选条件，减少导出数量",null),
|
||||
EXPORT_LIMIT_100000(151009, "导出数据超过10w条，请增加筛选条件，减少导出数量", null),
|
||||
REGION_INTERSECTION_IS_NULL(151011,"所选所属大区/分公司，不在所选集团下",null),
|
||||
CHECK_PAYER_ERROR(151012,"缴费人必须是签约人,请重新填写！",null),
|
||||
STORE_INFO_INSUFFICIENT(151013,"门店信息不全，无法前往猎聘注册门店！",null),
|
||||
@@ -379,6 +380,7 @@ public enum ErrorCodeEnum {
|
||||
VISIT_RECORD_INVALID(1820003, "拜访记录已失效", null),
|
||||
VISIT_RECORD_NOT_YOUR_OWN(1820004, "非拜访人，无法操作", null),
|
||||
VISIT_RECORD_COMPLETE(1820005, "已完成拜访", null),
|
||||
EXPORT_TASK_LIMIT(1830006, "导出任务数量达上限，请稍后再试", null),
|
||||
CITY_PLANNING_EXISTS(1820001, "同年份同季度同省市已存在规划，不能重复添加", null),
|
||||
;
|
||||
|
||||
|
||||
@@ -29,6 +29,8 @@ public enum FileTypeEnum {
|
||||
PRE_FRY_QUALIFICATION_APPLY_EXPORT("preFryQualificationApplyExport", "预炸品资质申请导出"),
|
||||
TP_PENALTY_IMPORT("tpPenaltyImport", "十二分惩处申请单导入"),
|
||||
TP_PENALTY_ERROR_EXPORT("tpPenaltyErrorExport", "十二分惩处申请单导入错误列表"),
|
||||
VISIT_RECORD_EXPORT("visitRecordExport", "拜访记录列表"),
|
||||
POINT_EXPORT("pointExport", "铺位管理列表"),
|
||||
;
|
||||
private String fileType;
|
||||
private String desc;
|
||||
|
||||
@@ -33,4 +33,13 @@ public enum PointStatusEnum {
|
||||
public String getDesc() {
|
||||
return desc;
|
||||
}
|
||||
|
||||
public static String getDescByCode(Integer code) {
|
||||
for (PointStatusEnum value : PointStatusEnum.values()) {
|
||||
if (value.getCode().equals(code)) {
|
||||
return value.getDesc();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user