GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SGK\17962 2025-09-24 16:29:15 +08:00
commit e0c7d02ebd
18 changed files with 64 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportDianziShebaokaImportVo.java
View File

@ -35,34 +35,29 @@ public class MpsImportDianziShebaokaImportVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = "主键", index = 0)
private Long id;
/**
* 单位名称
*/
@ExcelProperty(value = {
"",
"",
"",
"",
"",
"开户机构名称"
}, index = 0)
}, index = 1)
@NotBlank(message = "开户机构名称不能为空")
private String branchName;
/**
* 证件类型
*/
@ExcelProperty(value = "证件类型", index = 1)
@ExcelProperty(value = "证件类型", index = 2)
@NotBlank(message = "证件类型不能为空")
private String crtType;
/**
* 证件号码
*/
@ExcelProperty(value = "证件号码", index = 2)
@ExcelProperty(value = "证件号码", index = 3)
@IdCard
@NotBlank(message = "证件号码不能为空")
private String crtNo;
@ -70,27 +65,27 @@ public class MpsImportDianziShebaokaImportVo implements Serializable {
/**
* 客户名称
*/
@ExcelProperty(value = "客户名称", index = 3)
@ExcelProperty(value = "客户名称", index = 4)
@NotBlank(message = "客户名称不能为空")
private String custName;
/**
* 签发日期
*/
@ExcelProperty(value = "签发日期", index = 4)
@ExcelProperty(value = "签发日期", index = 5)
@Pattern(message = "签发日期错误", regexp = "^\\d{4}-([0][1-9]|1[0-2])-([0-2][1-9]|[1-3][0-1])\\s([0-1][0-9]|[2][0-3]):[0-5][0-9]:[0-5][0-9]$")
private String qianfariqi;
/**
* 解除关联日期
*/
@ExcelProperty(value = "解除关联日期", index = 5)
@ExcelProperty(value = "解除关联日期", index = 6)
private String jiechuguanlianriqi;
/**
* 渠道
*/
@ExcelProperty(value = "渠道", index = 6)
@ExcelProperty(value = "渠道", index = 7)
@NotBlank(message = "渠道不能为空")
private String channel;

18
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportDianziYibaoImportVo.java
View File

@ -27,54 +27,50 @@ public class MpsImportDianziYibaoImportVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = "主键", index = 0)
private Long id;
/**
* 单位名称
*/
@ExcelProperty(value = {
"",
"",
"",
"",
"开户机构名称"
}, index = 0)
}, index = 1)
@NotBlank(message = "开户机构名称不能为空")
private String branchName;
/**
* 证件类型
*/
@ExcelProperty(value = "证件类型",index = 1)
@ExcelProperty(value = "证件类型",index = 2)
@NotBlank(message = "证件类型不能为空")
private String crtType;
/**
* 证件号码
*/
@ExcelProperty(value = "证件号码",index = 2)
@ExcelProperty(value = "证件号码",index = 3)
@NotBlank(message = "证件号码不能为空")
private String crtNo;
/**
* 客户名称
*/
@ExcelProperty(value = "客户名称",index = 3)
@ExcelProperty(value = "客户名称",index = 4)
@NotBlank(message = "客户名称不能为空")
private String custName;
/**
* 激活日期
*/
@ExcelProperty(value = "激活日期",index = 4)
@ExcelProperty(value = "激活日期",index = 5)
@NotBlank(message = "激活日期不能为空")
private String jihuoriqi;
/**
* 渠道
*/
@ExcelProperty(value = "激活渠道",index = 5)
@ExcelProperty(value = "激活渠道",index = 6)
@NotBlank(message = "激活渠道不能为空")
private String channel;

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportHuinongtongDetailImportVo.java
View File

@ -42,10 +42,8 @@ public class MpsImportHuinongtongDetailImportVo implements Serializable {
* 订单号
*/
@ExcelProperty(value = {
"慧农通订单信息列表",
"",
"订单号"
}, index = 0)
})
@NotBlank(message = "订单号不能为空")
private String orderNo;

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportHuinongtongInfoImportVo.java
View File

@ -43,10 +43,8 @@ public class MpsImportHuinongtongInfoImportVo implements Serializable {
* 签约ID
*/
@ExcelProperty(value = {
"慧农通农户信息列表",
"",
"签约ID"
}, index = 0)
})
@NotBlank(message = "签约ID不能为空")
private String signId;

7
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportSpecialImportVo.java
View File

@ -40,13 +40,8 @@ public class MpsImportSpecialImportVo implements Serializable {
* 账/卡号
*/
@ExcelProperty(value = {
"",
"特殊事务明细表月报",
"",
"",
"",
"账/卡号"
}, index = 0)
})
@NotBlank(message = "账/卡号不能为空")
private String acctNo;

6
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportZhiefuIndvImportVo.java
View File

@ -43,12 +43,8 @@ public class MpsImportZhiefuIndvImportVo implements Serializable {
* 序号
*/
@ExcelProperty(value = {
"",
"智e付个人用户注册明细表",
"",
"",
"序号"
}, index = 0)
})
private String xuhao;
/**

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportZhigongShebaokaImportVo.java
View File

@ -53,14 +53,14 @@ public class MpsImportZhigongShebaokaImportVo implements Serializable {
/**
* 客户名称
*/
@ExcelProperty(value = "4、客户姓名/对公账户名称")
@ExcelProperty(value = "客户姓名/对公账户名称")
@NotBlank(message = "客户名称不能为空")
private String custName;
/**
* 证件号码
*/
@ExcelProperty(value = "7、身份证号")
@ExcelProperty(value = "身份证号")
@IdCard
@NotBlank(message = "证件号码不能为空")
private String crtNo;

7
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalDianfeiImportVo.java
View File

@ -35,7 +35,8 @@ public class OriginalDianfeiImportVo implements Serializable {
/**
* 主键
*/
@ExcelIgnore
// @ExcelIgnore
@ExcelProperty(value = "主键")
private Long id;
/**
@ -47,14 +48,14 @@ public class OriginalDianfeiImportVo implements Serializable {
/**
* 支行名称
*/
@ExcelProperty(value = "支行名称", index = 0)
@ExcelProperty(value = "支行名称")
@NotBlank(message = "支行名称不能为空")
private String branchName;
/**
* 数量
*/
@ExcelProperty(value = "数量", index = 1)
@ExcelProperty(value = "数量")
@NotNull(message = "数量不能为空")
private Long quantity;

8
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalEMBankingImportVo.java
View File

@ -34,26 +34,26 @@ public class OriginalEMBankingImportVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = "主键",index = 0)
private Long id;
/**
* 支行代码
*/
@ExcelProperty(value = "支行代码",index = 0)
@ExcelProperty(value = "支行代码",index = 1)
private String branchId;
/**
* 支行名称
*/
@ExcelProperty(value = "支行名称", index = 1)
@ExcelProperty(value = "支行名称", index = 2)
@NotBlank(message = "支行名称不能为空")
private String branchName;
/**
* 数量
*/
@ExcelProperty(value = "数量", index = 2)
@ExcelProperty(value = "数量", index = 3)
@NotNull(message = "数量不能为空")
private Long quantity;

34
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgmxImportVo.java
View File

@ -35,51 +35,49 @@ public class OriginalHntSgmxImportVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = "主键",index = 0)
private Long id;
/**
* 订单号
*/
@ExcelProperty(value = {
"慧农通收购商信息列表",
"",
"订单号"
}, index = 0)
}, index = 1)
@NotBlank(message = "订单号不能为空")
private String orderId;
/**
* 农户
*/
@ExcelProperty(value = "农户", index = 1)
@ExcelProperty(value = "农户", index = 2)
@NotBlank(message = "农户不能为空")
private String farmerName;
/**
* 收购商
*/
@ExcelProperty(value = "收购商", index = 2)
@ExcelProperty(value = "收购商", index = 3)
@NotBlank(message = "收购商不能为空")
private String buyerName;
/**
* 订单状态
*/
@ExcelProperty(value = "订单状态", index = 3)
@ExcelProperty(value = "订单状态", index = 4)
@NotBlank(message = "订单状态不能为空")
private String orderStatus;
/**
* 结算状态
*/
@ExcelProperty(value = "结算状态", index = 4)
@ExcelProperty(value = "结算状态", index = 5)
private String settlementStatus;
/**
* 实际金额（元）
*/
@ExcelProperty(value = "实际金额（元）", index = 5)
@ExcelProperty(value = "实际金额（元）", index = 6)
@DecimalMin(value = "0", message = "实际金额（元）必须大于等于0")
@NotNull(message = "实际金额（元）不能为空")
private String actualAmount;
@ -87,59 +85,59 @@ public class OriginalHntSgmxImportVo implements Serializable {
/**
* 下单时间
*/
@ExcelProperty(value = "下单时间", index = 6)
@ExcelProperty(value = "下单时间", index = 7)
@NotBlank(message = "下单时间不能为空")
private String orderTime;
/**
* 支付时间
*/
@ExcelProperty(value = "支付时间", index = 7)
@ExcelProperty(value = "支付时间", index = 8)
private String paymentTime;
/**
* 农户法人机构
*/
@ExcelProperty(value = "农户法人机构", index = 8)
@ExcelProperty(value = "农户法人机构", index = 9)
private String farmerLegalEntity;
/**
* 农户网点
*/
@ExcelProperty(value = "农户网点", index = 9)
@ExcelProperty(value = "农户网点", index = 10)
private String farmerBranch;
/**
* 网点名称
*/
@ExcelProperty(value = "农户网点名称", index = 10)
@ExcelProperty(value = "农户网点名称", index = 11)
private String farmerBranchName;
/**
* 收购商法人机构
*/
@ExcelProperty(value = "收购商法人机构", index = 11)
@ExcelProperty(value = "收购商法人机构", index = 12)
@NotBlank(message = "收购商法人机构不能为空")
private String buyerLegalEntity;
/**
* 收购商网点
*/
@ExcelProperty(value = "收购商网点", index = 12)
@ExcelProperty(value = "收购商网点", index = 13)
@NotBlank(message = "收购商网点名称不能为空")
private String buyerBranch;
/**
* 收购商网点名称
*/
@ExcelProperty(value = "收购商网点名称", index = 13)
@ExcelProperty(value = "收购商网点名称", index = 14)
@NotBlank(message = "收购商网点名称不能为空")
private String buyerBranchName;
/**
* 流水号
*/
@ExcelProperty(value = "流水号", index = 14)
@ExcelProperty(value = "流水号", index = 15)
private String transactionNo;
/**

6
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalHntSgsInfoImportVo.java
View File

@ -37,17 +37,15 @@ public class OriginalHntSgsInfoImportVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = "主键",index = 0)
private Long id;
/**
* 签约ID
*/
@ExcelProperty(value = {
"慧农通收购商信息列表",
"",
"签约ID"
}, index = 0)
}, index = 1)
@NotBlank(message = "签约ID不能为空")
private String contractId;

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMerchantInfoImportVo.java
View File

@ -44,7 +44,7 @@ public class OriginalMerchantInfoImportVo implements Serializable {
/**
* 自增主键
*/
@ExcelProperty(value = "自增主键")
@ExcelProperty(value = "主键")
private Long id;
/**

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMerchantTransactionSummaryImportVo.java
View File

@ -37,7 +37,7 @@ public class OriginalMerchantTransactionSummaryImportVo implements Serializable
/**
* 自增主键
*/
@ExcelProperty(value = "自增主键")
@ExcelProperty(value = "主键")
private Long id;
/**

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveMonthImportVo.java
View File

@ -40,7 +40,7 @@ public class OriginalMobileBankInactiveMonthImportVo implements Serializable {
/**
* 自增主键
*/
@ExcelProperty(value = "自增主键")
@ExcelProperty(value = "主键")
private Long id;
/**

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveYearImportVo.java
View File

@ -40,7 +40,7 @@ public class OriginalMobileBankInactiveYearImportVo implements Serializable {
/**
* 自增主键
*/
@ExcelProperty(value = "自增主键")
@ExcelProperty(value = "主键")
private Long id;
/**

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankSignupCompanyImportVo.java
View File

@ -39,7 +39,7 @@ public class OriginalMobileBankSignupCompanyImportVo implements Serializable {
/**
* 自增主键
*/
@ExcelProperty(value = "自增主键")
@ExcelProperty(value = "主键")
private Long id;
/**

7
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankSignupPersonImportVo.java
View File

@ -39,18 +39,15 @@ public class OriginalMobileBankSignupPersonImportVo implements Serializable {
/**
* 自增主键
*/
@ExcelProperty(value = "自增主键")
@ExcelProperty(value = "主键", index = 0)
private Long id;
/**
* 机构名称
*/
@ExcelProperty(value = {
"",
"",
"",
"机构名称"
}, index = 0)
}, index = 1)
@NotBlank(message = "机构名称不能为空")
private String branchName;

27
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalTrafficImportVo.java
View File

@ -1,19 +1,16 @@
package org.dromara.original.domain.vo;
import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
@ -36,33 +33,29 @@ public class OriginalTrafficImportVo implements Serializable {
/**
* 主键
*/
@ExcelProperty(value = "主键")
@ExcelProperty(value = { "主键"},index = 0)
private Long id;
/**
* 机构支行
*/
@ExcelProperty(value = {
"保管期限",
"代收交警罚没款明细表",
"报表编号",
"机构名称",
"代收交警罚没款明细表",
"机构支行"}, index = 0)
"机构支行"}, index = 1)
@NotBlank(message = "机构名称不能为空")
private String branchName;
/**
* 缴费人名称
*/
@ExcelProperty(value = {"代收交警罚没款明细表", "缴费人名称"}, index = 1)
@ExcelProperty(value = { "缴费人名称"}, index = 2)
@NotBlank(message = "缴费人名称不能为空")
private String payerName;
/**
* 缴费账号
*/
@ExcelProperty(value = {"代收交警罚没款明细表", "缴费账号"}, index = 2)
@ExcelProperty(value = { "缴费账号"}, index = 3)
@NotBlank(message = "缴费账号不能为空")
@Pattern( regexp = "^[0-9]{16}$", message = "缴费账号错误")
private String payerAccount;
@ -70,21 +63,21 @@ public class OriginalTrafficImportVo implements Serializable {
/**
* 处罚决定书编号
*/
@ExcelProperty(value = {"代收交警罚没款明细表", "处罚决定书编号"}, index = 3)
@ExcelProperty(value = { "处罚决定书编号"}, index = 4)
@NotBlank(message = "处罚决定书编号不能为空")
private String penaltyDecisionNo;
/**
* 缴费方式
*/
@ExcelProperty(value = {"代收交警罚没款明细表", "缴费方式"}, index = 4)
@ExcelProperty(value = { "缴费方式"}, index = 5)
@NotBlank(message = "缴费方式不能为空")
private String paymentMethod;
/**
* 缴费金额
*/
@ExcelProperty(value = {"代收交警罚没款明细表", "缴费金额"}, index = 5)
@ExcelProperty(value = { "缴费金额"}, index = 6)
@NotNull(message = "缴费金额不能为空")
@Min(value = 0, message = "缴费金额不能小于0")
private String paymentAmount;
@ -92,7 +85,7 @@ public class OriginalTrafficImportVo implements Serializable {
/**
* 缴费渠道
*/
@ExcelProperty(value = {"代收交警罚没款明细表", "缴费渠道"}, index = 6)
@ExcelProperty(value = { "缴费渠道"}, index = 7)
@NotBlank(message = "缴费渠道不能为空")
private String paymentChannel;