Merge #48 into master from cc_2021104_twelve_points

十二分优化 * cc_2021104_twelve_points: (53 commits squashed) - fix:启用禁用规则合并 - Merge branch 'refs/heads/master' into cc_2021104_twelve_points - fix:惩处规则列表新增描述字段 - fix:新增用户管辖门店列表接口 - fix:门店列表接口新增门店积分字段 - fix:查询问题修复；新增草稿状态 - fix:申请单审批补充审批人字段 - fix:修改门店积分限制0-12 - fix:积分流水接口修复；申请单查询接口添加日期筛选 - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选 - fix:惩处单复议申请查询异常修复 - fix:小程序惩处单详情接口字段补充 - fix:查询字段补充 - fix - fix:转义 - fix - fix:新增撤销复议申请单接口 - fix:补充字段 - fix:补充字段 - fix:新增门店分数接口 - fix:申请单新增筛选条件 - fix:门店积分接口返回参数修改 - fix:小程序规则分页查询接口改为Post - fix:问题修复 - fix:十二分导入 - fix:导入状态部分失败改为失败 - fix:字段补充 - fix:异步下Excel导入图片临时文件被清理的问题 - fix:扣分申请导入图片路径修改并使用CDN - fix:导入图片上传oss文件类型修改为图片 - fix:批量审批 - fix:批量审批新增备注字段 - fix:字段补充 - Merge branch 'master' into cc_2021104_twelve_points # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java - fix:字典项新增排序、编辑删除权限、关联字典项 - Merge branch 'master' into cc_2021104_twelve_points - fix:十二分值-扣分列表申请复议截止日期格式 - fix:去除appealEndDate格式校验 - Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2 - Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points - fix:字典回显包含已删除字典项 - Merge branch 'master' into cc_2021104_twelve_points - Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points - fix:去除惩处单审批阶段；复议申请单证明图片非必填 - fix:复议拒绝后惩处单直接生效 - fix:扣分申请单证明图片改为非必填 - fix - fix:字段转义 - fix:惩处待处理包含带生效数据 - fix:字段转义 - fix:警告单金额和积分初始化为0 - 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/48
2026-03-03 10:48:21 +00:00
parent 64192e3a1d
commit 0da8efbeaa
21 changed files with 205 additions and 39 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/dict/SysDictColumnDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/dict/SysDictColumnDO.java
@@ -39,6 +39,12 @@ public class SysDictColumnDO implements Serializable {

    @ApiModelProperty("备注")
    private String remark;
+    
+    @ApiModelProperty("权限标志, 使用二进制，&1不允许编辑 &2不允许删除")
+    private Integer authFlag;
+
+    @ApiModelProperty("排序编号")
+    private Integer sortNum;

    @ApiModelProperty("删除标识")
    private Boolean deleted;
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpApplyFormDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpApplyFormDO.java
@@ -1,5 +1,6 @@
 package com.cool.store.entity.tp;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyRequest.java
@@ -2,6 +2,7 @@ package com.cool.store.request.tp;

 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -46,7 +47,6 @@ public class TpApplyRequest {
    private String applyUserName;

    @ApiModelProperty("证明图片列表，逗号隔开")
-    @NotBlank(message = "证明图片列表不能为空")
    private String proofUrls;

    @ApiModelProperty("分值")
@@ -55,6 +55,6 @@ public class TpApplyRequest {
    @ApiModelProperty("金额")
    private BigDecimal amount;

-    @ApiModelProperty("申请复议截止日期，yyyy-MM-dd")
+    @ApiModelProperty("申请复议截止日期，yyyy-MM-dd HH:mm:ss")
    private Date appealEndDate;
 }
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnSimpleVO.java
@@ -1,8 +1,11 @@
 package com.cool.store.vo.dict;

+import com.cool.store.entity.dict.SysDictColumnDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.List;
+
 /**
 * <p>
 * 字典项简单信息VO
@@ -21,4 +24,15 @@ public class  DictColumnSimpleVO {

    @ApiModelProperty("字典表编码")
    private String tableCode;
+
+    @ApiModelProperty("关联项")
+    private List<DictColumnSimpleVO> relationColumns;
+
+    public static DictColumnSimpleVO of(SysDictColumnDO columnDO, String tableCode) {
+        DictColumnSimpleVO vo = new DictColumnSimpleVO();
+        vo.setColumnName(columnDO.getColumnName());
+        vo.setColumnCode(columnDO.getColumnCode());
+        vo.setTableCode(tableCode);
+        return vo;
+    }
 }
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/dict/DictColumnVO.java
@@ -53,4 +53,10 @@ public class DictColumnVO {

    @ApiModelProperty("更新时间")
    private Date updateTime;
+
+    @ApiModelProperty("权限标志, 使用二进制，&1不允许编辑 &2不允许删除")
+    private Integer authFlag;
+
+    @ApiModelProperty("排序编号")
+    private Integer sortNum;
 }
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyApplyDetailVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyApplyDetailVO.java
@@ -3,6 +3,7 @@ package com.cool.store.vo.tp;
 import com.cool.store.annotation.DictField;
 import com.cool.store.enums.tp.TpFormStatusEnum;
 import com.cool.store.enums.tp.TpFormTypeEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

@@ -53,6 +54,10 @@ public class TpPenaltyApplyDetailVO {
    @ApiModelProperty("项目名称")
    private String projectName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    @ApiModelProperty("分值")
    private BigDecimal score;

--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyApplyListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyApplyListVO.java
@@ -1,5 +1,6 @@
 package com.cool.store.vo.tp;

+import com.cool.store.annotation.DictField;
 import com.cool.store.enums.tp.TpFormTypeEnum;
 import com.cool.store.enums.tp.TpPayStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,6 +38,10 @@ public class TpPenaltyApplyListVO extends TpApplyListBaseVO {
    @ApiModelProperty("缴费状态名称")
    private String payStatusName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    public String getTypeName() {
        return TpFormTypeEnum.getMsgByType(this.type);
    }
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleDetailVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleDetailVO.java
@@ -39,6 +39,10 @@ public class TpPenaltyRuleDetailVO {
    @ApiModelProperty("惩处项目名称")
    private String projectName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    @ApiModelProperty("警告上限次数")
    private Integer warningLimit;

--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleListVO.java
@@ -39,6 +39,10 @@ public class TpPenaltyRuleListVO {
    @ApiModelProperty("惩处项目名称")
    private String projectName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    @ApiModelProperty("警告上限次数")
    private Integer warningLimit;

--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/mini/MiniTpApplyListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/mini/MiniTpApplyListVO.java
@@ -1,5 +1,6 @@
 package com.cool.store.vo.tp.mini;

+import com.cool.store.annotation.DictField;
 import com.cool.store.enums.tp.TpFormStatusEnum;
 import com.cool.store.enums.tp.TpFormTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,6 +31,10 @@ public class MiniTpApplyListVO {
    @ApiModelProperty("项目名称")
    private String projectName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    @ApiModelProperty("创建时间")
    private Date createTime;

--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/mini/MiniTpPenaltyApplyVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/mini/MiniTpPenaltyApplyVO.java
@@ -3,11 +3,11 @@ package com.cool.store.vo.tp.mini;
 import com.cool.store.annotation.DictField;
 import com.cool.store.enums.tp.TpFormStatusEnum;
 import com.cool.store.enums.tp.TpPayStatusEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.Date;

 /**
@@ -29,6 +29,10 @@ public class MiniTpPenaltyApplyVO {
    @ApiModelProperty("项目名称")
    private String projectName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    @ApiModelProperty("项目大类")
    private String projectCategory;

--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/mini/MiniTpRuleListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/mini/MiniTpRuleListVO.java
@@ -36,6 +36,10 @@ public class MiniTpRuleListVO {
    @ApiModelProperty("项目名称")
    private String projectName;

+    @ApiModelProperty("项目名称")
+    @DictField
+    private String projectNameName;
+
    @ApiModelProperty("警告上限次数")
    private Integer warningLimit;