suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:十二分制-申请单

Browse Source
This commit is contained in:
wangff
2025-11-10 14:20:44 +08:00
parent a3d0f9572c
commit bd64b33ebb
19 changed files with 496 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpAppealFormDO.java
View File

@@ -1,123 +0,0 @@
package com.cool.store.entity.tp;
import lombok.Data;
import java.util.Date;
import javax.persistence.*;
/**
* <p>
* 十二分制-复议申请单
* </p>
*
* @author wangff
* @since 2025/11/4
*/
@Table(name = "zxjp_tp_appeal_form")
@Data
public class TpAppealFormDO {
/**
* id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 申请单号
*/
@Column(name = "apply_no")
private String applyNo;
/**
* 处罚单id
*/
@Column(name = "punish_id")
private Long punishId;
/**
* 门店id
*/
@Column(name = "store_id")
private String storeId;
/**
* 申请人姓名
*/
@Column(name = "applicant_name")
private String applicantName;
/**
* 联系电话
*/
private String phone;
/**
* 复议理由
*/
@Column(name = "appeal_reason")
private String appealReason;
/**
* 详细理由
*/
@Column(name = "detail_reason")
private String detailReason;
/**
* 状态
*/
private Integer status;
/**
* 来源，0非小程序 1小程序
*/
private Integer source;
/**
* 审批人id
*/
@Column(name = "approve_user_id")
private String approveUserId;
/**
* 审批时间
*/
@Column(name = "approve_time")
private Date approveTime;
/**
* 是否为草稿 0否 1是
*/
@Column(name = "is_draft")
private Integer isDraft;
/**
* 创建人id
*/
@Column(name = "create_user_id")
private String createUserId;
/**
* 创建时间
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 是否删除 0否1是
*/
private Integer deleted;
/**
* 证明图片列表
*/
@Column(name = "proof_urls")
private String proofUrls;
}

34
coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpApplyFormDO.java
View File

@@ -129,13 +129,13 @@ public class TpApplyFormDO {
private Integer source;
/**
* 申请人id
* 申请人(创建人)id
*/
@Column(name = "apply_user_id")
private String applyUserId;
/**
* 申请人名称
* 申请人(创建人)名称
*/
@Column(name = "apply_user_name")
private String applyUserName;
@@ -174,4 +174,34 @@ public class TpApplyFormDO {
*/
@Column(name = "proof_urls")
private String proofUrls;
/**
* 处罚单id
*/
@Column(name = "penalty_id")
private Long penaltyId;
/**
* 申请人姓名（复议申请单）
*/
@Column(name = "applicant_name")
private String applicantName;
/**
* 联系电话
*/
@Column(name = "phone")
private String phone;
/**
* 复议理由
*/
@Column(name = "appeal_reason")
private String appealReason;
/**
* 复议详细理由
*/
@Column(name = "appeal_detail_reason")
private String appealDetailReason;
}

63
coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpAppealApplyRequest.java Normal file
View File

@@ -0,0 +1,63 @@
package com.cool.store.request.tp;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* <p>
* 复议申请Request
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class TpAppealApplyRequest {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("门店id")
@NotBlank(message = "门店id不能为空")
private String storeId;
@ApiModelProperty("是否为草稿 0否 1是")
@NotNull(message = "是否为草稿不能为空")
private Integer isDraft;
@ApiModelProperty(value = "来源，0非小程序 1小程序", hidden = true)
private Integer source;
@ApiModelProperty(value = "申请人(创建人)id", hidden = true)
private String applyUserId;
@ApiModelProperty(value = "申请人(创建人)名称", hidden = true)
private String applyUserName;
@ApiModelProperty("证明图片列表")
@NotEmpty(message = "证明图片列表不能为空")
private String proofUrls;
@ApiModelProperty("处罚单id")
@NotNull(message = "处罚单id不能为空")
private Long penaltyId;
@ApiModelProperty("申请人姓名")
@NotBlank(message = "申请人姓名不能为空")
private String applicantName;
@ApiModelProperty("联系电话")
@NotBlank(message = "联系电话不能为空")
private String phone;
@ApiModelProperty("复议理由")
@NotBlank(message = "复议理由不能为空")
private String appealReason;
@ApiModelProperty("复议详细理由")
@NotBlank(message = "复议详细理由不能为空")
private String appealDetailReason;
}

3
coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyAuditRequest.java
View File

@@ -19,9 +19,6 @@ public class TpApplyAuditRequest {
@NotNull(message = "申请单id不能为空")
private Long applyId;
@ApiModelProperty(value = "单据类型，0加分单 1警告书 2处罚书", hidden = true)
private Integer applyType;
@ApiModelProperty("审批状态 1通过 2拒绝")
@NotNull(message = "审批状态不能为空")
private Integer auditStatus;

3
coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyQueryRequest.java
View File

@@ -42,4 +42,7 @@ public class TpApplyQueryRequest extends PageBasicInfo {
@ApiModelProperty(value = "是惩处单", hidden = true)
private Boolean isPenalty;
@ApiModelProperty("复议理由")
private String appealReason;
}

15
coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyRequest.java
View File

@@ -5,6 +5,8 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* <p>
@@ -37,13 +39,22 @@ public class TpApplyRequest {
@ApiModelProperty(value = "来源，0非小程序 1小程序", hidden = true)
private Integer source;
@ApiModelProperty(value = "申请人id", hidden = true)
@ApiModelProperty(value = "申请人(创建人)id", hidden = true)
private String applyUserId;
@ApiModelProperty(value = "申请人名称", hidden = true)
@ApiModelProperty(value = "申请人(创建人)名称", hidden = true)
private String applyUserName;
@ApiModelProperty("证明图片列表，逗号隔开")
@NotBlank(message = "证明图片列表不能为空")
private String proofUrls;
@ApiModelProperty("分值")
private BigDecimal score;
@ApiModelProperty("金额")
private BigDecimal amount;
@ApiModelProperty("申请复议截止日期，yyyy-MM-dd")
private LocalDate appealEndDate;
}

59
coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpAppealFormDetailVO.java Normal file
View File

@@ -0,0 +1,59 @@
package com.cool.store.vo.tp;
import com.cool.store.annotation.DictField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 复议申请单详情VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class TpAppealFormDetailVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("门店id")
private String storeId;
@ApiModelProperty("门店编码")
private String storeNum;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("是否为草稿 0否 1是")
private Integer isDraft;
@ApiModelProperty("处罚单id")
private Long penaltyId;
@ApiModelProperty("处罚单号")
private Long penaltyNo;
@ApiModelProperty("证明图片列表")
private String proofUrls;
@ApiModelProperty("申请人姓名")
private String applicantName;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("复议理由")
private String appealReason;
@ApiModelProperty("复议理由名称")
@DictField
private String appealReasonName;
@ApiModelProperty("复议详细理由")
private String appealDetailReason;
@ApiModelProperty("处罚单")
private TpPenaltyApplyDetailVO penaltyDetail;
}

38
coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpAppealListVO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.vo.tp;
import com.cool.store.annotation.DictField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 复审列表VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class TpAppealListVO extends TpApplyListBaseVO {
@ApiModelProperty("处罚单id")
private Long penaltyId;
@ApiModelProperty("处罚单号")
private String penaltyNo;
@ApiModelProperty("申请人姓名")
private String applicantName;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("复议理由")
private String appealReason;
@ApiModelProperty("复议理由名称")
@DictField
private String appealReasonName;
@ApiModelProperty("复议详细理由")
private String appealDetailReason;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpApplyListBaseVO.java
View File

@@ -67,7 +67,7 @@ public class TpApplyListBaseVO {
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("申请人名称")
@ApiModelProperty("申请人(创建人)名称")
private String applyUserName;
@ApiModelProperty("申请时间")