缴费库 代码修改

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -85,11 +85,11 @@ public class TPaymentInfo extends BaseEntity {
     private String empIdcard;
 
     /**
-     * 单位名称
+     * 客户名称
      */
-    @ExcelAttribute(name = "单位名称" )
-    @Schema(description ="单位名称")
-    @ExcelProperty("单位名称")
+    @ExcelAttribute(name = "客户名称" )
+    @Schema(description ="客户名称")
+    @ExcelProperty("客户名称")
     private String unitId;
 
     /**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java

@@ -68,7 +68,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 日期，格式：2020-12-25
      */
     @Schema(description ="日期，格式：2020-12-25")
-	@ExcelAttribute(name = "日期")
+	@ExcelAttribute(name = "日期", isDate = true)
 	private String date;
 
     /**
@@ -132,7 +132,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="入职日期")
 	@Size(max = 20, message = "入职日期不可超过20位")
-	@ExcelAttribute(name = "入职日期",isDate = true,dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
+	@ExcelAttribute(name = "入职日期", isDate = true)
 	private String entryDate;
 
     /**
@@ -147,7 +147,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="派遣开始日期")
 	@Size(max = 20, message = "派遣开始日期不可超过20位")
-	@ExcelAttribute(name = "派遣开始日期", maxLength = 20)
+	@ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
 	private String dispatchStart;
 
     /**
@@ -155,6 +155,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="派遣结束日期")
 	@Size(max = 20, message = "派遣结束日期不可超过20位")
+	@ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
     private String dispatchEnd;
 
     /**
@@ -162,7 +163,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="合同开始日期")
 	@Size(max = 20, message = "合同开始日期不可超过20位")
-	@ExcelAttribute(name = "派遣结束日期", maxLength = 20)
+	@ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
 	private String contractStart;
 
     /**
@@ -170,7 +171,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="合同终止日期")
 	@Size(max = 20, message = "合同终止日期不可超过20位")
-	@ExcelAttribute(name = "合同终止日期",  isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
+	@ExcelAttribute(name = "合同终止日期", isDate = true)
 	private String contractEnd;
 
     /**
@@ -178,7 +179,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="试用开始日期")
 	@Size(max = 20, message = "试用开始日期不可超过20位")
-	@ExcelAttribute(name = "试用开始日期", maxLength = 20)
+	@ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
 	private String trialStart;
 
     /**
@@ -186,7 +187,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="试用结束日期")
 	@Size(max = 20, message = "试用结束日期不可超过20位")
-	@ExcelAttribute(name = "试用结束日期", maxLength = 20)
+	@ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
 	private String trialEnd;
 
     /**
@@ -513,7 +514,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 离职日期
      */
     @Schema(description ="离职日期")
-	@ExcelAttribute(name = "离职日期")
+	@ExcelAttribute(name = "离职日期", isDate = true)
 	private Date leaveDate;
 
     /**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java

@@ -82,12 +82,12 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证号")
 	private String empIdcard;
 	/**
-	 * 单位名称
+	 * 客户名称
 	 */
-	@Length(max = 50, message = "单位名称 不能超过50 个字符")
-	@ExcelAttribute(name = "单位名称", maxLength = 50)
-	@Schema(description = "单位名称")
-	@ExcelProperty("单位名称")
+	@Length(max = 50, message = "客户名称 不能超过50 个字符")
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Schema(description = "客户名称")
+	@ExcelProperty("客户名称")
 	private String unitId;
 	/**
 	 * 项目名称

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java

@@ -27,7 +27,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
     /**
      * 日期，格式：2020-12-25
      */
-    @ExcelAttribute(name = "日期")
+    @ExcelAttribute(name = "日期", isDate = true)
     private String date;
     /**
      * 接单分公司
@@ -74,7 +74,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
     /**
      * 入职日期
      */
-    @ExcelAttribute(name = "入职日期")
+    @ExcelAttribute(name = "入职日期", isDate = true)
     private String entryDate;
     /**
      * 正式工资
@@ -85,37 +85,37 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 派遣开始日期
      */
     @Length(max = 20, message = "派遣开始日期不能超过20个字符")
-    @ExcelAttribute(name = "派遣开始日期", maxLength = 20)
+    @ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
     private String dispatchStart;
     /**
      * 派遣结束日期
      */
     @Length(max = 20, message = "派遣结束日期不能超过20个字符")
-    @ExcelAttribute(name = "派遣结束日期", maxLength = 20)
+    @ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
     private String dispatchEnd;
     /**
      * 合同开始日期
      */
     @Length(max = 20, message = "合同开始日期不能超过20个字符")
-    @ExcelAttribute(name = "合同开始日期", maxLength = 20)
+    @ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
     private String contractStart;
     /**
      * 合同终止日期
      */
     @Length(max = 20, message = "合同终止日期不能超过20个字符")
-    @ExcelAttribute(name = "合同终止日期", maxLength = 20)
+    @ExcelAttribute(name = "合同终止日期", maxLength = 20, isDate = true)
     private String contractEnd;
     /**
      * 试用开始日期
      */
     @Length(max = 20, message = "试用开始日期不能超过20个字符")
-    @ExcelAttribute(name = "试用开始日期", maxLength = 20)
+    @ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
     private String trialStart;
     /**
      * 试用结束日期
      */
     @Length(max = 20, message = "试用结束日期不能超过20个字符")
-    @ExcelAttribute(name = "试用结束日期", maxLength = 20)
+    @ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
     private String trialEnd;
     /**
      * 试用期工资
@@ -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;
     /**
      * 离职原因
@@ -410,7 +410,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 员工类型
      */
     @Length(max = 2, message = "员工类型不能超过2个字符")
-    @ExcelAttribute(name = "员工类型",  maxLength = 2)
+    @ExcelAttribute(name = "员工类型", maxLength = 2)
 	@ExcelProperty(value ="员工类型")
     private String empTypeAdd;
     /**
@@ -543,13 +543,13 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 派单合同开始时间
      */
     @Length(max = 20, message = "派单合同开始时间不能超过20个字符")
-    @ExcelAttribute(name = "派单合同开始时间", maxLength = 20)
+    @ExcelAttribute(name = "派单合同开始时间", maxLength = 20, isDate = true)
     private String contractStartAdd;
     /**
      * 派单合同截止时间
      */
     @Length(max = 20, message = "派单合同截止时间不能超过20个字符")
-    @ExcelAttribute(name = "派单合同截止时间", maxLength = 20)
+    @ExcelAttribute(name = "派单合同截止时间", maxLength = 20, isDate = true)
     private String contractEndAdd;
     /**
      * 派单合同期限

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -624,7 +624,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			}
 			baseMapper.insert(info);
 		}
-		return null;
+		return errorList;
 	}
 
 	/**