MVP1.6.8-转人工等

357aba9c · hongguangwu · e2053380 · 357aba9c · 357aba9c · 357aba9c
Commit 357aba9c authored Aug 02, 2024 by hongguangwu
6 changed files
--- a/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierExportVo.java
+++ b/yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierExportVo.java
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.math.BigDecimal;
 import java.util.Date;
 /**
@@ -19,65 +24,101 @@ import java.util.Date;
 @Data
 public class SocialSoldierExportVo implements Serializable {
-	////@ExcelAttribute(name = "派单类型", errorInfo = "派单类型不能为空", maxLength = 1, isDataId = true, readConverterExp = "0=派增,1=派减", needExport = true)
+	/**
+	 * 派单类型：0派增1派减
+	 */
+	@ExcelAttribute(name = "派单类型", errorInfo = "派单类型不能为空", maxLength = 1, isDataId = true, readConverterExp = "0=派增,1=派减", needExport = true)
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("派单类型")
 	private String type;
-	@Schema(description = "派单办理状态")
+	/**
-	//@ExcelAttribute(name = "办理状态", readConverterExp = "0=未办理,1=全部办理成功,2=全部办理失败,3=部分办理成功,4=办理中", needExport = true)
+	 * 社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3已派减 4办理中 （20210609派单拆分新增fxj） 5部分办理失败 6 派减办理中 7 派减部分办理失败
+	 * 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3 部分办理成功 4 办理中
+	 */
+	@Schema(description = "社保办理状态")
+	@ExcelAttribute(name = "社保办理状态", readConverterExp = "0=未办理,1=全部办理成功,2=全部办理失败,3=部分办理成功,4=办理中", needExport = true)
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("派单办理状态")
+	@ExcelProperty("社保办理状态")
 	private String socialHandleStatus;
-	//@ExcelAttribute(name = "养老工伤失业-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功", needExport = true)
+	/**
-	@Schema(description = "养老工伤失业-办理状态")
+	 * 养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败
+	 */
+	@ExcelAttribute(name = "养老状态", maxLength = 1, readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
+	@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("养老工伤失业-办理状态")
+	@ExcelProperty("养老状态")
-	private String ygsHandleStatus;
+	private String pensionHandle;
+	/**
-	//@ExcelAttribute(name = "医保生育大病-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功", needExport = true)
+	 * 医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败
-	@Schema(description = "医保生育大病-办理状态")
+	 */
+	@ExcelAttribute(name = "医疗状态", maxLength = 1, readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
+	@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("医保生育大病-办理状态")
+	@ExcelProperty("医疗状态")
-	private String ysdHandleStatus;
+	private String medicalHandle;
+	/**
-	//@ExcelAttribute(name = "养老工伤失业-失败原因", maxLength = 500, needExport = true)
+	 * 失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败
-	@Schema(description = "养老工伤失业-失败原因")
+	 */
+	@ExcelAttribute(name = "失业状态", maxLength = 1, readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
+	@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("养老工伤失业-失败原因")
+	@ExcelProperty("失业状态")
-	private String ygsRemark;
+	private String unemployHandle;
+	/**
-	//@ExcelAttribute(name = "医保生育大病-失败原因", maxLength = 500, needExport = true)
+	 * 工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败
-	@Schema(description = "医保生育大病-失败原因")
+	 */
+	@ExcelAttribute(name = "工伤状态", maxLength = 1, readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
+	@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("医保生育大病-失败原因")
+	@ExcelProperty("工伤状态")
-	private String ysdRemark;
+	private String workInjuryHandle;
+	/**
-	//@ExcelAttribute(name = "申请编码", maxLength = 30, needExport = true)
+	 * 生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败
-	@Schema(description = "申请编码")
+	 */
+	@ExcelAttribute(name = "生育状态", maxLength = 1, readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
+	@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("申请编码")
+	@ExcelProperty("生育状态")
-	private String dispatchCode;
+	private String birthHandle;
+	/**
-	//@ExcelAttribute(name = "员工姓名", errorInfo = "员工姓名不能为空", maxLength = 50, needExport = true)
+	 * 大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败
+	 */
+	@ExcelAttribute(name = "大病状态", maxLength = 1, readConverterExp = "0=派增待办理,1=派增办理成功,2=派增办理失败,3=派减-已派减,4=派减失败,5=派减待办理,null=——", needExport = true)
+	@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病状态")
+	private String bigailmentHandle;
+	/**
+	 * 员工姓名
+	 */
+	@ExcelAttribute(name = "员工姓名", errorInfo = "员工姓名不能为空", maxLength = 50, needExport = true)
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("员工姓名")
 	private String empName;
-	//@ExcelAttribute(name = "身份证号", needExport = true)
+	/**
+	 * 员工身份证
+	 */
+	@ExcelAttribute(name = "员工身份证", errorInfo = "员工身份证不能为空", maxLength = 20, needExport = true)
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("身份证号")
+	@ExcelProperty("员工身份证")
 	private String empIdcard;
-	//@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE, needExport = true)
+	/**
+	 * 学历
+	 */
+	@ExcelAttribute(name = "学历", maxLength = 32, needExport = true)
+	@Schema(description = "学历")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("员工类型")
+	@ExcelProperty("学历")
-	private String empType;
+	private String educationName;
 	/**
 	 * 所属单位
 	 */
-	//@ExcelAttribute(name = "客户名称", isNotEmpty = true, needExport = true)
+	@ExcelAttribute(name = "客户名称", isNotEmpty = true, needExport = true)
 	@Schema(description = "客户名称（所属单位）")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("客户名称")
@@ -86,76 +127,378 @@ public class SocialSoldierExportVo implements Serializable {
 	/**
 	 * 项目名称
 	 */
-	//@ExcelAttribute(name = "项目名称", isNotEmpty = true, needExport = true)
+	@ExcelAttribute(name = "项目名称", isNotEmpty = true, needExport = true)
 	@Schema(description = "项目名称（项目）")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("项目名称")
 	private String settleDomain;
+	/**
+	 * 员工类型
+	 */
+	@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE, needExport = true)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("员工类型")
+	private String empType;
+	/**
+	 * 就职岗位
+	 */
+	@ExcelAttribute(name = "岗位", maxLength = 50, needExport = true)
+	@Schema(description = "岗位")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("岗位")
+	private String post;
-	//@ExcelAttribute(name = "项目编码", maxLength = 32, needExport = true)
+	/**
-	@Schema(description = "项目编码")
+	 * 员工电话
+	 */
+	@ExcelAttribute(name = "手机号码", maxLength = 20, needExport = true)
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("项目编码")
+	@ExcelProperty("手机号码")
-	private String settleDomainCode;
+	private String empMobile;
-	//@ExcelAttribute(name = "社保户", needExport = true)
+	@ExcelAttribute(name = "身份证所在地")
-	@Schema(description = "社保户")
+	@Schema(description = "身份证所在地")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保户")
+	@ExcelProperty("身份证所在地")
-	private String socialHouseholdName;
+	private String idCardAddress;
 	/**
-	 * 社保缴纳地
+	 * 通信地址
 	 */
-	//@ExcelAttribute(name = "社保缴纳地", maxLength = 32, isArea = true, needExport = true)
+	@ExcelAttribute(name = "通信地址")
-	@Schema(description = "社保缴纳地")
+	@Schema(description = "通信地址")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保缴纳地")
+	@ExcelProperty("通信地址")
-	private String socialProvince;
+	private String contactAddress;
-	//@ExcelAttribute(name = "离职日期", isDate = true, needExport = true)
+	/**
-	@Schema(description = "离职日期")
+	 * 户口性质
+	 */
+	@ExcelAttribute(name = "户口性质", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_REGISTYPE, needExport = true)
+	@Schema(description = "户口性质")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("离职日期")
+	@ExcelProperty("户口性质")
-	private String leaveDate;
+	private String empRegisType;
+	/**
+	 * 民族
+	 */
+	@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATIONAL, needExport = true)
+	@Schema(description = "民族")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("民族")
+	private String empNational;
-	//@ExcelAttribute(name = "派单项", maxLength = 50, needExport = true)
+	/**
-	@Schema(description = "派单项")
+	 * 工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制
+	 */
+	@ExcelAttribute(name = "工时制", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS, needExport = true)
+	@Schema(description = "工时制")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("派单项")
+	@ExcelProperty("工时制")
-	private String dispatchItem;
+	private String workingHours;
-	//@ExcelAttribute(name = "申请人", needExport = true)
+	/**
+	 * 合同年限
+	 */
+	@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空", needExport = true)
+	@Schema(description = "合同年限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("合同年限")
+	private String contractTerm;
+	/**
+	 * 合同起始时间
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@Schema(description = "合同起始时间")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("合同起始时间")
+	private String contractStart;
+	/**
+	 * 合同到期时间
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@Schema(description = "合同到期时间")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("合同到期时间")
+	private String contractEnd;
+	/**
+	 * 创建人姓名
+	 */
+	@ExcelAttribute(name = "申请人", needExport = true)
 	@Schema(description = "申请人")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("申请人")
 	private String createUserName;
+	/**
+	 * 备案基数
+	 */
+	@ExcelAttribute(name = "备案基数", needExport = true)
+	@Schema(description = "备案基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("备案基数")
+	private String recordBase;
+	/**
+	 * 缴纳类型（0最低、1自定义、2最高）
+	 */
+	@ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低,1=自定义,2=最高", needExport = true)
+	@Schema(description = "缴纳类型（0最低、1自定义、2最高）")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("缴纳类型")
+	private String paymentType;
+	/**
+	 * 社保户
+	 */
+	@ExcelAttribute(name = "社保户", needExport = true)
+	@Schema(description = "社保户")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保户")
+	private String socialHouseholdName;
+	/**
+	 * 缴纳地-省
+	 */
+	@ExcelAttribute(name = "社保缴纳地-省", maxLength = 32, isArea = true, needExport = true)
+	@Schema(description = "社保缴纳地-省")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保缴纳地-省")
+	private String socialProvince;
+	/**
+	 * 缴纳地-市
+	 */
+	@ExcelAttribute(name = "社保缴纳地-市", maxLength = 32, isArea = true, parentField = "socialProvince", needExport = true)
+	@Schema(description = "社保缴纳地-市")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保缴纳地-市")
+	private String socialCity;
+	/**
+	 * 缴纳地-县
+	 */
+	@ExcelAttribute(name = "社保缴纳地-县", maxLength = 32, isArea = true, parentField = "socialCity", needExport = true)
+	@Schema(description = "社保缴纳地-县")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保缴纳地-县")
+	private String socialTown;
+	/**
+	 * 养老起缴日期
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "养老起缴日期", needExport = true)
+	@Schema(description = "养老起缴日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老起缴日期")
+	private String pensionStart;
+	;
+	/**
+	 * 养老基数
+	 */
+	@ExcelAttribute(name = "养老基数", isFloat = true, needExport = true)
+	@Schema(description = "养老基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老基数")
+	private BigDecimal unitPensionCardinal;
-	//@ExcelAttribute(name = "申请人所在部门", maxLength = 50, needExport = true)
+	/**
-	@Schema(description = "申请人所在部门")
+	 * 医疗起缴日期
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "医疗起缴日期", needExport = true)
+	@Schema(description = "医疗起缴日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗起缴日期")
+	private String medicalStart;
+	/**
+	 * 医疗基数
+	 */
+	@ExcelAttribute(name = "医疗基数", isFloat = true, needExport = true)
+	@Schema(description = "医疗基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗基数")
+	private BigDecimal unitMedicalCardinal;
+	/**
+	 * 失业起缴日期
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "失业起缴日期", needExport = true)
+	@Schema(description = "失业起缴日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("申请人所在部门")
+	@ExcelProperty("失业起缴日期")
-	private String organName;
+	private String unemployStart;
+	/**
+	 * 失业基数
+	 */
+	@ExcelAttribute(name = "失业基数", isFloat = true, needExport = true)
+	@Schema(description = "失业基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业基数")
+	private BigDecimal unitUnemploymentCardinal;
+	/**
+	 * 工伤起缴日期
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "工伤起缴日期", needExport = true)
+	@Schema(description = "工伤起缴日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤起缴日期")
+	private String workInjuryStart;
+	/**
+	 * 工伤基数
+	 */
+	@ExcelAttribute(name = "工伤基数", isFloat = true, needExport = true)
+	@Schema(description = "工伤基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤基数")
+	private BigDecimal unitWorkInjuryCardinal;
+	/**
+	 * 生育起缴日期
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "生育起缴日期", needExport = true)
+	@Schema(description = "生育起缴日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育起缴日期")
+	private String birthStart;
+	/**
+	 * 生育基数
+	 */
+	@ExcelAttribute(name = "生育基数", isFloat = true, needExport = true)
+	@Schema(description = "生育基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育基数")
+	private BigDecimal unitBirthCardinal;
+	/**
+	 * 大病起缴日期
+	 */
+	@ContentStyle(dataFormat = 49)
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "大病起缴日期", needExport = true)
+	@Schema(description = "大病起缴日期")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病起缴日期")
+	private String bigailmentStart;
+	/**
+	 * 大病缴纳基数
+	 */
+	@ExcelAttribute(name = "大病缴纳基数")
+	@Schema(description = "大病缴纳基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病缴纳基数")
+	private BigDecimal unitBigailmentCardinal;
+	/**
+	 * 单位大病缴纳金额
+	 */
+	@ExcelAttribute(name = "单位大病金额", needExport = true)
+	@Schema(description = "单位大病金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位大病金额")
+	private BigDecimal unitBigailmentMoney;
+	/**
+	 * 个人大病金额
+	 */
+	@ExcelAttribute(name = "个人大病金额", needExport = true)
+	@Schema(description = "个人大病金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人大病金额")
+	private BigDecimal personalBigailmentMoney;
+	/**
+	 * 委托备注——2022-11-10 16:54:32与房工讨论，由于派增派减两个委托备注，只能取派单表里的委托备注，社保公积金的委托备注字段废弃
+	 **/
+	@ExcelAttribute(name = "委托备注", needExport = true)
+	@Schema(description = "委托备注")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("委托备注")
+	private String socailTrustRemark;
+	/**
+	 * 减少原因
+	 */
+	@ExcelAttribute(name = "减少原因", needExport = true, isDataId = true, dataType = ExcelAttributeConstants.REDUCE_SOCIAL_REASON)
+	@Schema(description = "减少原因")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("减少原因")
+	private String reduceReason;
+	/**
+	 * @Author fxj
+	 * @Description 社保是否已导出
+	 * @Date 15:32 2023/5/9
+	 * @Param
+	 * @return
+	 **/
+	@ExcelAttribute(name = "是否已导出", maxLength = 1, isDataId = true, readConverterExp = "0=否,1=是")
+	@Schema(description = "是否已导出：0否、1是")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("是否已导出")
+	private String exportSocialFlag;
-	//@ExcelAttribute(name = "申请时间", isDate = true, needExport = true)
+	/**
+	 * 学校
+	 */
+	@ExcelAttribute(name = "学校", isNotEmpty = false)
+	@Schema(description = "学校：派增只做记录")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("申请时间")
+	@ExcelProperty(value = "学校")
-	private LocalDateTime createTime;
+	private String schoolName;
+	/**
+	 * 专业
+	 */
+	@ExcelAttribute(name = "专业", isNotEmpty = false)
+	@Length(max = 50, message = "学校不能超过50个字符")
+	@Schema(description = "专业：派增只做记录")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "专业")
+	private String major;
-	//@ExcelAttribute(name = "审核人", maxLength = 50, needExport = true)
+	/**
-	@Schema(description = "审核人")
+	 * 毕业时间
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "毕业时间", isDate = true)
+	@Schema(description = "毕业时间")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("审核人")
+	@ExcelProperty("毕业时间")
-	private String auditUserName;
+	private Date graduationTime;
-	//@DateTimeFormat("yyyy-MM-dd")
+	/**
-	//@ExcelAttribute(name = "审核时间", isDate = true, needExport = true)
+	 * 首次至缴纳地时间
-	@Schema(description = "审核时间")
+	 */
+	@DateTimeFormat("yyyy-MM-dd")
+	@ExcelAttribute(name = "首次至缴纳地时间", isNotEmpty = false, isDate = true)
+	@Schema(description = "首次至缴纳地时间")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "首次至缴纳地时间")
+	private Date firstPayTime;
+	@ExcelAttribute(name = "养老工伤失业-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功,7=提交成功", needExport = true)
+	@Schema(description = "养老工伤失业-办理状态")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老工伤失业-办理状态")
+	private String ygsHandleStatus;
+	@ExcelAttribute(name = "医保生育大病-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功,7=提交成功", needExport = true)
+	@Schema(description = "医保生育大病-办理状态")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医保生育大病-办理状态")
+	private String ysdHandleStatus;
+	@ExcelAttribute(name = "养老工伤失业-失败原因", maxLength = 500, needExport = true)
+	@Schema(description = "养老工伤失业-失败原因")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("审核时间")
+	@ExcelProperty("养老工伤失业-失败原因")
-	private Date auditTime;
+	private String ygsRemark;
+	@ExcelAttribute(name = "医保生育大病-失败原因", maxLength = 500, needExport = true)
+	@Schema(description = "医保生育大病-失败原因")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医保生育大病-失败原因")
+	private String ysdRemark;
 }
--- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialInfoController.java
+++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialInfoController.java
@@ -24,9 +24,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierService;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -54,6 +57,8 @@ public class TSocialInfoController {
    private final TSocialInfoService tSocialInfoService;
+    private final TSocialSoldierService tSocialSoldierService;
    /**
     * 简单分页查询
@@ -181,4 +186,55 @@ public class TSocialInfoController {
 		}
 		return R.ok(socialInfo);
 	}
+	/**
+	 * @param id
+	 * @param isSocial 1 社保 2 医保
+	 * @Description:
+	 * @Author: hgw
+	 * @Date: 2024/8/1 18:12
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Operation(summary = "转人工", description = "转人工")
+	@GetMapping("/doRenGong" )
+	public R<String> doRenGong(@RequestParam String id, @RequestParam String isSocial) {
+		YifuUser user = SecurityUtils.getUser();
+		if (user == null || Common.isEmpty(user.getId())) {
+			return R.failed("请登录！");
+		}
+		TSocialInfo socialInfo = tSocialInfoService.getById(id);
+		if (socialInfo == null || Common.isEmpty(socialInfo.getId())) {
+			return R.failed("未找到社保");
+		}
+		String handleRemark;
+		if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) {
+			handleRemark = "派增";
+		} else {
+			handleRemark = "派减";
+		}
+		if (CommonConstants.ONE_STRING.equals(isSocial) && Common.isNotNull(socialInfo.getYgsHandleStatus())) {
+			if (CommonConstants.ZERO_STRING.equals(socialInfo.getYgsHandleStatus())
+					|| CommonConstants.FOUR_STRING.equals(socialInfo.getYgsHandleStatus())
+					|| CommonConstants.FIVE_STRING.equals(socialInfo.getYgsHandleStatus())
+					|| CommonConstants.SIX_STRING.equals(socialInfo.getYgsHandleStatus())) {
+				return R.failed("当前养老工伤失业-办理状态不可以转人工！");
+			}
+			socialInfo.setYgsHandleStatus(CommonConstants.FIVE_STRING);
+			tSocialInfoService.updateById(socialInfo);
+			handleRemark += "养老、工伤、失业手动转人工";
+		} else if (CommonConstants.TWO_STRING.equals(isSocial) && Common.isNotNull(socialInfo.getYsdHandleStatus())) {
+			if (CommonConstants.ZERO_STRING.equals(socialInfo.getYsdHandleStatus())
+					|| CommonConstants.FOUR_STRING.equals(socialInfo.getYsdHandleStatus())
+					|| CommonConstants.FIVE_STRING.equals(socialInfo.getYsdHandleStatus())
+					|| CommonConstants.SIX_STRING.equals(socialInfo.getYsdHandleStatus())) {
+				return R.failed("当前医疗生育大病-办理状态不可以转人工！");
+			}
+			socialInfo.setYsdHandleStatus(CommonConstants.FIVE_STRING);
+			tSocialInfoService.updateById(socialInfo);
+			handleRemark += "医疗、生育、大病手动转人工";
+		}
+		// 加记录
+		tSocialSoldierService.doSocialTAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user);
+		return R.ok("成功！");
+	}
 }
--- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierService.java
+++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierService.java
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -65,5 +66,12 @@ public interface TSocialSoldierService extends IService<TSocialInfo> {
 	R<String> getZip(MultipartFile zipFile);
+	/**
+	 * @Description: 加办理记录
+	 * @Author: hgw
+	 * @Date: 2024/8/2 9:40
+	 * @return: void
+	 **/
+	void doSocialTAuditInfo(TSocialInfo social, String title, String handleRemark, String remark, YifuUser user);
 }
--- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
@@ -5106,16 +5106,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (count >  CommonConstants.ZERO_INT){
 				WriteSheet writeSheet;
 				ExcelUtil<SocialSoldierExportVo> util;
-				for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
+				for (int i = 0; i <= count; ) {
 					// 获取实际记录
 					searchVo.setLimitStart(i);
 					searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
 					list = getSocialSoldierList(searchVo,idStr);
+					if (Common.isNotNull(list)){
+						util = new ExcelUtil<>(SocialSoldierExportVo.class);
+						for (SocialSoldierExportVo vo:list){
+							util.convertEntity(vo,null,null,null);
+						}
+					}
 					if (Common.isNotNull(list)){
 						writeSheet = EasyExcelFactory.writerSheet(DispatchConstants.SOCIAL_SOLDIER_EXPORT+index).build();
 						excelWriter.write(list,writeSheet);
 						index++;
+						i += CommonConstants.EXCEL_EXPORT_LIMIT;
 					}
 					if (Common.isNotNull(list)){
 						list.clear();

--- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
@@ -2295,6 +2295,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
 	 * @Author hgw
 	 * @Date 2024-5-16 11:43:33
 	 **/
+	@Override
 	public void doSocialTAuditInfo(TSocialInfo social, String title, String handleRemark, String remark, YifuUser user) {
 		TAuditInfo auditInfo = new TAuditInfo();
 		auditInfo.setType(CommonConstants.ONE_STRING);

--- a/yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+++ b/yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
@@ -1077,6 +1077,62 @@
 		</where>
 	</select>
+	<resultMap id="socialSoldierExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierExportVo">
+		<result property="empName" column="EMP_NAME"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="empType" column="EMP_TYPE"/>
+		<result property="empMobile" column="EMP_MOBILE"/>
+		<result property="idCardAddress" column="ID_CARD_ADDRESS"/>
+		<result property="empNational" column="EMP_NATIONAL"/>
+		<result property="type" column="TYPE"/>
+		<result property="settleDomain" column="SETTLE_DOMAIN_NAME"/>
+		<result property="reduceReason" column="REDUCE_REASON"/>
+		<result property="belongUnit" column="BELONG_UNIT_NAME"/>
+		<result property="contractStart" column="CONTRACT_START"/>
+		<result property="contractEnd" column="CONTRACT_END"/>
+		<result property="contractTerm" column="CONTRACT_TERM"/>
+		<result property="empRegisType" column="EMP_REGIS_TYPE"/>
+		<result property="post" column="POST"/>
+		<result property="socialHandleStatus" column="SOCIAL_HANDLE_STATUS"/>
+		<result property="socialProvince" column="SOCIAL_PROVINCE"/>
+		<result property="socialCity" column="SOCIAL_CITY"/>
+		<result property="socialTown" column="SOCIAL_TOWN"/>
+		<result property="workingHours" column="WORKING_HOURS"/>
+		<result property="educationName" column="EDUCATION_NAME"/>
+		<result property="createUserName" column="CREATE_NAME"/>
+		<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
+		<result property="socialProvince" column="SOCIAL_PROVINCE"/>
+		<result property="socialCity" column="SOCIAL_CITY"/>
+		<result property="socialTown" column="SOCIAL_TOWN"/>
+		<result property="unitPensionCardinal" column="UNIT_PENSION_CARDINAL"/>
+		<result property="unitMedicalCardinal" column="UNIT_MEDICAL_CARDINAL"/>
+		<result property="unitUnemploymentCardinal" column="UNIT_UNEMPLOYMENT_CARDINAL"/>
+		<result property="unitWorkInjuryCardinal" column="UNIT_WORK_INJURY_CARDINAL"/>
+		<result property="unitBirthCardinal" column="UNIT_BIRTH_CARDINAL"/>
+		<result property="personalBigailmentMoney" column="PERSONAL_BIGAILMENT_MONEY"/>
+		<result property="unitBigailmentMoney" column="UNIT_BIGAILMENT_MONEY"/>
+		<result property="unitBigailmentCardinal" column="UNIT_BIGAILMENT_CARDINAL"/>
+		<result property="socailTrustRemark" column="TRUST_REMARK"/>
+		<result property="pensionStart" column="PENSION_START"/>
+		<result property="medicalStart" column="MEDICAL_START"/>
+		<result property="unemployStart" column="UNEMPLOY_START"/>
+		<result property="workInjuryStart" column="WORK_INJURY_START"/>
+		<result property="birthStart" column="BIRTH_START"/>
+		<result property="bigailmentStart" column="BIGAILMENT_START"/>
+		<result property="exportSocialFlag" column="EXPORT_SOCIAL_FLAG"/>
+		<result property="schoolName" column="SCHOOL_NAME"/>
+		<result property="major" column="MAJOR"/>
+		<result property="firstPayTime" column="FIRST_PAY_TIME"/>
+		<result property="graduationTime" column="GRADUATION_TIME"/>
+		<result property="ygsHandleStatus" column="ygs_Handle_Status"/>
+		<result property="ysdHandleStatus" column="ysd_Handle_Status"/>
+		<result property="ygsRemark" column="YGS_REMARK"/>
+		<result property="ysdRemark" column="YSD_REMARK"/>
+	</resultMap>
 	<resultMap id="socialHandleExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo">
 		<result property="empName" column="EMP_NAME"/>
 		<result property="empIdcard" column="EMP_IDCARD"/>
@@ -1222,42 +1278,68 @@
 		<include refid="where_getSocialRecordRoster"/>
 	</select>
-	<!--tDispatchInfo 社保花名册数据查询-->
+	<!--tDispatchInfo 社保士兵数据查询-->
-	<select id="getSocialSoldierList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierExportVo">
+	<select id="getSocialSoldierList" resultMap="socialSoldierExportMap">
 		SELECT
-			if(a.TYPE='0','派增','派减') TYPE,
+		a.TYPE,
-			case SUBSTRING_INDEX(GROUP_CONCAT(a.SOCIAL_HANDLE_STATUS ORDER BY a.CREATE_TIME desc),',',1) when '0' then '未办理' when '1' then '全部办理成功' when '2' then '全部办理失败' when '3' then '部分办理成功' when '4' then '办理中' else '-' end socialHandleStatus,
+		a.SOCIAL_HANDLE_STATUS,
-			case s.ygs_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' when '7' then '提交成功' else '-' end ygsHandleStatus,
+		if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) PENSION_HANDLE,
-			case s.ysd_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' when '7' then '提交成功' else '-' end ysdHandleStatus,
+		if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) MEDICAL_HANDLE,
-			s.YGS_REMARK ygsRemark,s.YSD_REMARK ysdRemark,
+		if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) UNEMPLOY_HANDLE,
-		SUBSTRING_INDEX(GROUP_CONCAT(a.APPLY_NO ORDER BY a.CREATE_TIME desc),',',1) dispatchCode,
+		if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) WORK_INJURY_HANDLE,
-			a.EMP_NAME empName,
+		if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) BIRTH_HANDLE,
-			a.EMP_IDCARD empIdcard,
+		if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) BIGAILMENT_HANDLE,
-			emp_natrue.label empType,
+		a.EMP_NAME,
-			a.BELONG_UNIT_NAME belongUnit,
+		a.EMP_IDCARD,
-			a.SETTLE_DOMAIN_NAME settleDomain,
+		a.EDUCATION_NAME,
-			a.SETTLE_DOMAIN_CODE settleDomainCode,
+		a.BELONG_UNIT_NAME,
-			a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
+		a.SETTLE_DOMAIN_NAME,
-			concat(if(ifnull(h.id,0) != '0',sp1.AREA_NAME,sp2.AREA_NAME),
+		a.EMP_TYPE,
-			ifnull(if(ifnull(h.id,0) != '0',sc1.AREA_NAME,sc2.AREA_NAME),''),
+		a.POST,
-			ifnull(if(ifnull(h.id,0) != '0',st1.AREA_NAME,st2.AREA_NAME),'')) socialProvince,
+		a.EMP_MOBILE,
-			DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDate,
+		a.ID_CARD_ADDRESS,
-			a.DISPATCH_ITEM dispatchItem,
+		a.EMP_REGIS_TYPE,
-			a.CREATE_NAME createUserName,
+		a.EMP_NATIONAL,
-			a.ORGAN_NAME organName,
+		a.WORKING_HOURS,
-			a.CREATE_TIME createTime,
+		a.CONTRACT_TERM,
-			a.AUDIT_USER_NAME auditUserName,
+		a.CONTRACT_START,
-			a.AUDIT_TIME auditTime
+		a.CONTRACT_END,
+		a.CREATE_NAME,
+		a.CONTACT_ADDRESS,
+		s.RECORD_BASE,
+		s.PAYMENT_TYPE,
+		a.SOCIAL_HOUSEHOLD_NAME,
+		if(ifnull(h.id,0) != '0',h.SOCIAL_PROVINCE,s.SOCIAL_PROVINCE) SOCIAL_PROVINCE,
+		if(ifnull(h.id,0) != '0',h.SOCIAL_CITY,s.SOCIAL_CITY) SOCIAL_CITY,
+		if(ifnull(h.id,0) != '0',h.SOCIAL_TOWN,s.SOCIAL_TOWN) SOCIAL_TOWN,
+		if(ifnull(h.id,0) != '0',h.PENSION_START,s.PENSION_START) PENSION_START,
+		if(ifnull(h.id,0) != '0',h.UNIT_PENSION_CARDINAL,s.UNIT_PENSION_CARDINAL) UNIT_PENSION_CARDINAL,
+		if(ifnull(h.id,0) != '0',h.MEDICAL_START,s.MEDICAL_START) MEDICAL_START,
+		if(ifnull(h.id,0) != '0',h.UNIT_MEDICAL_CARDINAL,s.UNIT_MEDICAL_CARDINAL) UNIT_MEDICAL_CARDINAL,
+		if(ifnull(h.id,0) != '0',h.UNEMPLOY_START,s.UNEMPLOY_START) UNEMPLOY_START,
+		if(ifnull(h.id,0) != '0',h.UNIT_UNEMPLOYMENT_CARDINAL,s.UNIT_UNEMPLOYMENT_CARDINAL) UNIT_UNEMPLOYMENT_CARDINAL,
+		if(ifnull(h.id,0) != '0',h.WORK_INJURY_START,s.WORK_INJURY_START) WORK_INJURY_START,
+		if(ifnull(h.id,0) != '0',h.UNIT_WORK_INJURY_CARDINAL,s.UNIT_WORK_INJURY_CARDINAL) UNIT_WORK_INJURY_CARDINAL,
+		if(ifnull(h.id,0) != '0',h.BIRTH_START,s.BIRTH_START) BIRTH_START,
+		if(ifnull(h.id,0) != '0',h.UNIT_BIRTH_CARDINAL,s.UNIT_BIRTH_CARDINAL) UNIT_BIRTH_CARDINAL,
+		if(ifnull(h.id,0) != '0',h.BIGAILMENT_START,s.BIGAILMENT_START) BIGAILMENT_START,
+		if(ifnull(h.id,0) != '0',h.UNIT_BIGAILMENT_CARDINAL,s.UNIT_BIGAILMENT_CARDINAL) UNIT_BIGAILMENT_CARDINAL,
+		if(ifnull(h.id,0) != '0',h.UNIT_BIGAILMENT_MONEY,s.UNIT_BIGAILMENT_MONEY) UNIT_BIGAILMENT_MONEY,
+		if(ifnull(h.id,0) != '0',h.PERSONAL_BIGAILMENT_MONEY,s.PERSONAL_BIGAILMENT_MONEY) PERSONAL_BIGAILMENT_MONEY,
+		a.TRUST_REMARK,
+		a.REDUCE_REASON,
+		'1'  as EXPORT_SOCIAL_FLAG,
+		a.SCHOOL_NAME,
+		a.MAJOR,
+		a.FIRST_PAY_TIME,
+		a.GRADUATION_TIME
+		,s.ygs_Handle_Status
+		,s.ysd_Handle_Status
+		,s.YGS_REMARK
+		,s.YSD_REMARK
 		FROM t_dispatch_info a
 		left join t_social_info s on a.SOCIAL_ID = s.id
 		left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
-		left join sys_area sp1 on sp1.id = h.SOCIAL_PROVINCE
-		left join sys_area sp2 on sp2.id = s.SOCIAL_PROVINCE
-		left join sys_area sc1 on sc1.id = h.SOCIAL_CITY
-		left join sys_area sc2 on sc2.id = s.SOCIAL_CITY
-		left join sys_area st1 on st1.id = h.SOCIAL_TOWN
-		left join sys_area st2 on st2.id = s.SOCIAL_TOWN
-		left join view_sys_dict_item emp_natrue on emp_natrue.value=a.EMP_TYPE and emp_natrue.type='emp_natrue'
 		<include refid="where_getSocialSoldier"/>
 		group by s.id
 		order by a.AUDIT_TIME desc