fix:十二分制-移动端接口;PC端接口补充

This commit is contained in:
wangff
2025-11-11 13:58:24 +08:00
parent 85de65cda6
commit b35903010c
17 changed files with 903 additions and 77 deletions

View File

@@ -1,10 +1,15 @@
package com.cool.store.request.tp;
import com.cool.store.common.PageBasicInfo;
import com.cool.store.constants.CommonConstants;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
@@ -28,9 +33,12 @@ public class TpApplyQueryRequest extends PageBasicInfo {
@ApiModelProperty("规则id")
private String ruleId;
@ApiModelProperty("状态")
@ApiModelProperty("状态,可多选逗号隔开")
private String status;
@ApiModelProperty(value = "状态列表", hidden = true)
private List<String> statusList;
@ApiModelProperty(value = "单据类型0加分单 1警告书 2处罚书")
private Integer type;
@@ -45,4 +53,16 @@ public class TpApplyQueryRequest extends PageBasicInfo {
@ApiModelProperty("复议理由")
private String appealReason;
@ApiModelProperty("是否为草稿")
private Integer isDraft;
public List<String> getStatusList() {
if (StringUtils.isNotBlank(this.status)) {
return null;
}
return Arrays.stream(this.status.split(CommonConstants.COMMA))
.filter(StringUtils::isNotBlank)
.collect(Collectors.toList());
}
}

View File

@@ -17,6 +17,9 @@ import java.util.List;
* @注释:
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class AuditInfoResponse {
@ApiModelProperty("操作人集合")

View File

@@ -0,0 +1,38 @@
package com.cool.store.vo.tp.mini;
import com.cool.store.annotation.DictField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* Mini复议信息VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class MiniTpAppealVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("申请人姓名")
private String applicantName;
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("复议理由")
private String appealReason;
@ApiModelProperty("复议理由名称")
@DictField
private String appealReasonName;
@ApiModelProperty("复议详细理由")
private String appealDetailReason;
@ApiModelProperty("证明材料")
private String proofUrls;
}

View File

@@ -0,0 +1,61 @@
package com.cool.store.vo.tp.mini;
import com.cool.store.enums.tp.TpFormStatusEnum;
import com.cool.store.enums.tp.TpFormTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* Mini申请单列表VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class MiniTpApplyListVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("单据类型0加分单 1警告书 2处罚书")
private Integer type;
@ApiModelProperty("单据类型名称")
private String typeName;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("分值")
private BigDecimal score;
@ApiModelProperty("金额")
private BigDecimal amount;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("状态名称")
private String statusName;
@ApiModelProperty("是否为草稿")
private Integer isDraft;
@ApiModelProperty("是否复议中")
private Integer isAppeal;
public String getTypeName() {
return TpFormTypeEnum.getMsgByType(this.type);
}
public String getStatusName() {
return TpFormStatusEnum.getMsgByStatus(this.status);
}
}

View File

@@ -0,0 +1,76 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
/**
* <p>
* Mini惩处申请单详情VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class MiniTpPenaltyApplyVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("申请单号")
private String applyNo;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目大类")
private String projectCategory;
@ApiModelProperty("项目大类名称")
@DictField
private String projectCategoryName;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("申请人名称")
private String applyUserName;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("缴费状态")
private Integer payStatus;
@ApiModelProperty("缴费状态名称")
private String payStatusName;
@ApiModelProperty("状态名称")
private String statusName;
@ApiModelProperty("分值")
private BigDecimal score;
@ApiModelProperty("复议截止日期")
private LocalDate appealEndDate;
@ApiModelProperty("证明图片列表")
private String proofUrls;
@ApiModelProperty("复议申请")
private MiniTpAppealVO appeal;
public String getStatusName() {
return TpFormStatusEnum.getMsgByStatus(this.status);
}
public String getPayStatusName() {
return TpPayStatusEnum.getMsgByStatus(this.payStatus);
}
}

View File

@@ -0,0 +1,55 @@
package com.cool.store.vo.tp.mini;
import com.cool.store.annotation.DictField;
import com.cool.store.enums.tp.TpFormStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* Mini加分申请单详情VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class MiniTpRewardApplyVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("申请单号")
private String applyNo;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目大类")
private String projectCategory;
@ApiModelProperty("项目大类名称")
@DictField
private String projectCategoryName;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("状态")
private String status;
@ApiModelProperty("状态名称")
private String statusName;
@ApiModelProperty("分值")
private BigDecimal score;
@ApiModelProperty("证明图片列表")
private String proofUrls;
public String getStatusName() {
return TpFormStatusEnum.getMsgByStatus(this.status);
}
}

View File

@@ -0,0 +1,53 @@
package com.cool.store.vo.tp.mini;
import com.cool.store.annotation.DictField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* <p>
* Mini奖惩规则列表VO
* </p>
*
* @author wangff
* @since 2025/11/11
*/
@Data
public class MiniTpRuleListVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("问题分类")
private String problemClassification;
@ApiModelProperty("问题分类名称")
@DictField
private String problemClassificationName;
@ApiModelProperty("项目大类")
private String projectCategory;
@ApiModelProperty("项目大类名称")
@DictField
private String projectCategoryName;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("警告上限次数")
private Integer warningLimit;
@ApiModelProperty("分值")
private BigDecimal score;
@ApiModelProperty("是否加满0否 1是")
private Integer isFull;
@ApiModelProperty("金额")
private BigDecimal amount;
@ApiModelProperty("项目描述")
private String remark;
}