派单查询导出修改

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

@@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -40,7 +39,7 @@ import java.util.Date;
 @Schema(description = "派单导出Vo")
 public class TDispatchInfoExportVo {
 
-	@ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
+	@ExcelAttribute(name = "派单类型", readConverterExp = "0=派增,1=派减")
 	@Schema(description = "派单类型：0派增1派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("派单类型")
@@ -85,10 +84,9 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 合同类型（字典值）
 	 */
-	@NotNull(message = "合同类型不能为空")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="合同类型")
-	@ExcelAttribute(name = "合同类型",isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
+	@ExcelAttribute(name = "合同类型")
 	private String contractType;
 
 	/**
@@ -130,7 +128,6 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 备案基数
 	 */
-	@Length(max = 255, message = "备案基数 不能超过255 个字符" )
 	@ExcelAttribute(name = "备案基数", isFloat = true,max = "999999999.99")
 	@Schema(description = "备案基数：购买社保时必填" )
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -224,7 +221,6 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 社保办理时间
 	 */
-	@DateTimeFormat("yyyy-MM-dd")
 	@ExcelAttribute(name = "社保办理时间", isDate = true)
 	@Schema(description = "社保办理时间" )
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -234,7 +230,7 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 审核状态（0待审核/1已审核）
 	 */
-	@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=未审核,1=审核通过,2=审核不通过")
+	@ExcelAttribute(name = "公积金审核状态",readConverterExp = "0=待审核,1=审核通过,2=审核不通过")
 	@Schema(description = "公积金审核状态:（0待审核/1已审核）" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("公积金审核状态" )
@@ -258,7 +254,6 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 公积金办理人
 	 */
-	@Length(max = 32, message = "公积金办理人 不能超过32个字符" )
 	@ExcelAttribute(name = "公积金办理人", maxLength = 32)
 	@Schema(description = "公积金办理人" )
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -267,7 +262,6 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 公积金办理时间
 	 */
-	@DateTimeFormat("yyyy-MM-dd")
 	@ExcelAttribute(name = "公积金办理时间", isDate = true)
 	@Schema(description = "公积金办理时间" )
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -366,10 +360,10 @@ public class TDispatchInfoExportVo {
 	private String organName;
 
 	/**
-	 * 0未提交1待审核2审核通过3审核不通过4办理完成
+	 * 0未提交1待审核2审核通过3审核不通过4已办结
 	 */
-	@ExcelAttribute(name = "派单状态",readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=办理完成")
-	@Schema(description = "0未提交1待审核2审核通过3审核不通过4办理完成" )
+	@ExcelAttribute(name = "派单状态",readConverterExp = "0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结")
+	@Schema(description = "0未提交1待审核2审核通过3审核不通过4已办结" )
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("派单状态" )
 	private String status;
@@ -432,7 +426,6 @@ public class TDispatchInfoExportVo {
 	/**
 	 * 审核时间
 	 */
-	@DateTimeFormat("yyyy-MM-dd")
 	@ExcelAttribute(name = "派单审核时间", isDate = true)
 	@Schema(description = "派单审核时间" )
 	@HeadFontStyle(fontHeightInPoints = 11)

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -613,7 +613,7 @@
 			a.CREATE_NAME,
 			a.ORGAN_NAME,
 			a.CREATE_TIME,
-			a.CONTRACT_TYPE,
+			a.CONTRACT_NAME AS CONTRACT_TYPE,
 			a.CONTRACT_SUB_NAME,
 			a.CONTRACT_TERM,
 			a.CONTRACT_START,