Commit c7cc39ec authored by huyuchen's avatar huyuchen

缴费库 代码修改

parent 9404aa41
...@@ -85,11 +85,11 @@ public class TPaymentInfo extends BaseEntity { ...@@ -85,11 +85,11 @@ public class TPaymentInfo extends BaseEntity {
private String empIdcard; private String empIdcard;
/** /**
* 单位名称 * 客户名称
*/ */
@ExcelAttribute(name = "单位名称" ) @ExcelAttribute(name = "客户名称" )
@Schema(description ="单位名称") @Schema(description ="客户名称")
@ExcelProperty("单位名称") @ExcelProperty("客户名称")
private String unitId; private String unitId;
/** /**
......
...@@ -68,7 +68,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -68,7 +68,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 日期,格式:2020-12-25 * 日期,格式:2020-12-25
*/ */
@Schema(description ="日期,格式:2020-12-25") @Schema(description ="日期,格式:2020-12-25")
@ExcelAttribute(name = "日期") @ExcelAttribute(name = "日期", isDate = true)
private String date; private String date;
/** /**
...@@ -132,7 +132,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -132,7 +132,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="入职日期") @Schema(description ="入职日期")
@Size(max = 20, message = "入职日期不可超过20位") @Size(max = 20, message = "入职日期不可超过20位")
@ExcelAttribute(name = "入职日期",isDate = true,dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT) @ExcelAttribute(name = "入职日期", isDate = true)
private String entryDate; private String entryDate;
/** /**
...@@ -147,7 +147,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -147,7 +147,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="派遣开始日期") @Schema(description ="派遣开始日期")
@Size(max = 20, message = "派遣开始日期不可超过20位") @Size(max = 20, message = "派遣开始日期不可超过20位")
@ExcelAttribute(name = "派遣开始日期", maxLength = 20) @ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
private String dispatchStart; private String dispatchStart;
/** /**
...@@ -155,6 +155,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -155,6 +155,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="派遣结束日期") @Schema(description ="派遣结束日期")
@Size(max = 20, message = "派遣结束日期不可超过20位") @Size(max = 20, message = "派遣结束日期不可超过20位")
@ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
private String dispatchEnd; private String dispatchEnd;
/** /**
...@@ -162,7 +163,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -162,7 +163,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="合同开始日期") @Schema(description ="合同开始日期")
@Size(max = 20, message = "合同开始日期不可超过20位") @Size(max = 20, message = "合同开始日期不可超过20位")
@ExcelAttribute(name = "派遣结束日期", maxLength = 20) @ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
private String contractStart; private String contractStart;
/** /**
...@@ -170,7 +171,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -170,7 +171,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="合同终止日期") @Schema(description ="合同终止日期")
@Size(max = 20, message = "合同终止日期不可超过20位") @Size(max = 20, message = "合同终止日期不可超过20位")
@ExcelAttribute(name = "合同终止日期", isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT) @ExcelAttribute(name = "合同终止日期", isDate = true)
private String contractEnd; private String contractEnd;
/** /**
...@@ -178,7 +179,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -178,7 +179,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="试用开始日期") @Schema(description ="试用开始日期")
@Size(max = 20, message = "试用开始日期不可超过20位") @Size(max = 20, message = "试用开始日期不可超过20位")
@ExcelAttribute(name = "试用开始日期", maxLength = 20) @ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
private String trialStart; private String trialStart;
/** /**
...@@ -186,7 +187,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -186,7 +187,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="试用结束日期") @Schema(description ="试用结束日期")
@Size(max = 20, message = "试用结束日期不可超过20位") @Size(max = 20, message = "试用结束日期不可超过20位")
@ExcelAttribute(name = "试用结束日期", maxLength = 20) @ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
private String trialEnd; private String trialEnd;
/** /**
...@@ -513,7 +514,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -513,7 +514,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 离职日期 * 离职日期
*/ */
@Schema(description ="离职日期") @Schema(description ="离职日期")
@ExcelAttribute(name = "离职日期") @ExcelAttribute(name = "离职日期", isDate = true)
private Date leaveDate; private Date leaveDate;
/** /**
......
...@@ -82,12 +82,12 @@ public class TPaymentInfoVo extends RowIndex implements Serializable { ...@@ -82,12 +82,12 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
private String empIdcard; private String empIdcard;
/** /**
* 单位名称 * 客户名称
*/ */
@Length(max = 50, message = "单位名称 不能超过50 个字符") @Length(max = 50, message = "客户名称 不能超过50 个字符")
@ExcelAttribute(name = "单位名称", maxLength = 50) @ExcelAttribute(name = "客户名称", maxLength = 50)
@Schema(description = "单位名称") @Schema(description = "客户名称")
@ExcelProperty("单位名称") @ExcelProperty("客户名称")
private String unitId; private String unitId;
/** /**
* 项目名称 * 项目名称
......
...@@ -27,7 +27,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -27,7 +27,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
/** /**
* 日期,格式:2020-12-25 * 日期,格式:2020-12-25
*/ */
@ExcelAttribute(name = "日期") @ExcelAttribute(name = "日期", isDate = true)
private String date; private String date;
/** /**
* 接单分公司 * 接单分公司
...@@ -74,7 +74,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -74,7 +74,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
/** /**
* 入职日期 * 入职日期
*/ */
@ExcelAttribute(name = "入职日期") @ExcelAttribute(name = "入职日期", isDate = true)
private String entryDate; private String entryDate;
/** /**
* 正式工资 * 正式工资
...@@ -85,37 +85,37 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -85,37 +85,37 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 派遣开始日期 * 派遣开始日期
*/ */
@Length(max = 20, message = "派遣开始日期不能超过20个字符") @Length(max = 20, message = "派遣开始日期不能超过20个字符")
@ExcelAttribute(name = "派遣开始日期", maxLength = 20) @ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
private String dispatchStart; private String dispatchStart;
/** /**
* 派遣结束日期 * 派遣结束日期
*/ */
@Length(max = 20, message = "派遣结束日期不能超过20个字符") @Length(max = 20, message = "派遣结束日期不能超过20个字符")
@ExcelAttribute(name = "派遣结束日期", maxLength = 20) @ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
private String dispatchEnd; private String dispatchEnd;
/** /**
* 合同开始日期 * 合同开始日期
*/ */
@Length(max = 20, message = "合同开始日期不能超过20个字符") @Length(max = 20, message = "合同开始日期不能超过20个字符")
@ExcelAttribute(name = "合同开始日期", maxLength = 20) @ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
private String contractStart; private String contractStart;
/** /**
* 合同终止日期 * 合同终止日期
*/ */
@Length(max = 20, message = "合同终止日期不能超过20个字符") @Length(max = 20, message = "合同终止日期不能超过20个字符")
@ExcelAttribute(name = "合同终止日期", maxLength = 20) @ExcelAttribute(name = "合同终止日期", maxLength = 20, isDate = true)
private String contractEnd; private String contractEnd;
/** /**
* 试用开始日期 * 试用开始日期
*/ */
@Length(max = 20, message = "试用开始日期不能超过20个字符") @Length(max = 20, message = "试用开始日期不能超过20个字符")
@ExcelAttribute(name = "试用开始日期", maxLength = 20) @ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
private String trialStart; private String trialStart;
/** /**
* 试用结束日期 * 试用结束日期
*/ */
@Length(max = 20, message = "试用结束日期不能超过20个字符") @Length(max = 20, message = "试用结束日期不能超过20个字符")
@ExcelAttribute(name = "试用结束日期", maxLength = 20) @ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
private String trialEnd; private String trialEnd;
/** /**
* 试用期工资 * 试用期工资
...@@ -383,7 +383,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -383,7 +383,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
/** /**
* 离职日期 * 离职日期
*/ */
@ExcelAttribute(name = "离职日期", isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT) @ExcelAttribute(name = "离职日期", isDate = true)
private Date leaveDate; private Date leaveDate;
/** /**
* 离职原因 * 离职原因
...@@ -410,7 +410,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -410,7 +410,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 员工类型 * 员工类型
*/ */
@Length(max = 2, message = "员工类型不能超过2个字符") @Length(max = 2, message = "员工类型不能超过2个字符")
@ExcelAttribute(name = "员工类型", maxLength = 2) @ExcelAttribute(name = "员工类型", maxLength = 2)
@ExcelProperty(value ="员工类型") @ExcelProperty(value ="员工类型")
private String empTypeAdd; private String empTypeAdd;
/** /**
...@@ -543,13 +543,13 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -543,13 +543,13 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 派单合同开始时间 * 派单合同开始时间
*/ */
@Length(max = 20, message = "派单合同开始时间不能超过20个字符") @Length(max = 20, message = "派单合同开始时间不能超过20个字符")
@ExcelAttribute(name = "派单合同开始时间", maxLength = 20) @ExcelAttribute(name = "派单合同开始时间", maxLength = 20, isDate = true)
private String contractStartAdd; private String contractStartAdd;
/** /**
* 派单合同截止时间 * 派单合同截止时间
*/ */
@Length(max = 20, message = "派单合同截止时间不能超过20个字符") @Length(max = 20, message = "派单合同截止时间不能超过20个字符")
@ExcelAttribute(name = "派单合同截止时间", maxLength = 20) @ExcelAttribute(name = "派单合同截止时间", maxLength = 20, isDate = true)
private String contractEndAdd; private String contractEndAdd;
/** /**
* 派单合同期限 * 派单合同期限
......
...@@ -624,7 +624,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -624,7 +624,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
} }
baseMapper.insert(info); baseMapper.insert(info);
} }
return null; return errorList;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment