花名册修改

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ * @author huyc
+ * @date 2023-07-18 11:38:05
+ */
+@Data
+public class TDispatchSocialPersionReduceExportVo implements Serializable {
+
+	/**
+	 * 序号
+	 */
+	@Schema(description = "序号" )
+	@ExcelAttribute(name = "序号" )
+	@ExcelProperty("序号")
+	private Integer num;
+	/**
+	 * 职工编码
+	 */
+	@Schema(description = "职工编码" )
+	@ExcelAttribute(name = "职工编码" )
+	@ExcelProperty("职工编码")
+	private String empNo;
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "姓名" )
+	@ExcelAttribute(name = "姓名" )
+	@ExcelProperty("姓名")
+	private String empName;
+	/**
+	 * 社会保障号码
+	 */
+	@Schema(description = "社会保障号码（身份证号码）" )
+	@ExcelAttribute(name = "社会保障号码（身份证号码）" )
+	@ExcelProperty("社会保障号码（身份证号码）")
+	private String empIdcard;
+	/**
+	 * 停止缴费时间
+	 */
+	@Schema(description = "停止缴费时间" )
+	@ExcelAttribute(name = "停止缴费时间" )
+	@ExcelProperty("停止缴费时间")
+	private String workDate;
+	/**
+	 * 辞职
+	 */
+	@Schema(description = "辞职" )
+	@ExcelAttribute(name = "辞职" )
+	@ExcelProperty("辞职")
+	private String typeA;
+	/**
+	 * 辞退
+	 */
+	@Schema(description = "辞退" )
+	@ExcelAttribute(name = "辞退" )
+	@ExcelProperty("辞退")
+	private String typeB;
+	/**
+	 * 参军
+	 */
+	@Schema(description = "参军" )
+	@ExcelAttribute(name = "参军" )
+	@ExcelProperty("参军")
+	private String typeC;
+	/**
+	 * 辞退
+	 */
+	@Schema(description = "上学" )
+	@ExcelAttribute(name = "上学" )
+	@ExcelProperty("上学")
+	private String typeD;
+	/**
+	 * 辞退
+	 */
+	@Schema(description = "劳改" )
+	@ExcelAttribute(name = "劳改" )
+	@ExcelProperty("劳改")
+	private String typeE;	/**
+	 * 劳教
+	 */
+	@Schema(description = "除名" )
+	@ExcelAttribute(name = "除名" )
+	@ExcelProperty("除名")
+	private String typeF;
+	/**
+	 * 人员失踪
+	 */
+	@Schema(description = "人员失踪" )
+	@ExcelAttribute(name = "人员失踪" )
+	@ExcelProperty("人员失踪")
+	private String typeG;
+	/**
+	 * 停薪留职
+	 */
+	@Schema(description = "停薪留职" )
+	@ExcelAttribute(name = "停薪留职" )
+	@ExcelProperty("停薪留职")
+	private String typeH;
+	/**
+	 * 解除合同
+	 */
+	@Schema(description = "解除合同" )
+	@ExcelAttribute(name = "解除合同" )
+	@ExcelProperty("解除合同")
+	private String typeI;
+	/**
+	 * 统筹内调出
+	 */
+	@Schema(description = "统筹内调出" )
+	@ExcelAttribute(name = "统筹内调出" )
+	@ExcelProperty("统筹内调出")
+	private String typeJ;
+
+	/**
+	 * 调出统筹范围
+	 */
+	@Schema(description = "调出统筹范围" )
+	@ExcelAttribute(name = "调出统筹范围" )
+	@ExcelProperty("调出统筹范围")
+	private String typeK;
+
+	/**
+	 * 退休
+	 */
+	@Schema(description = "退休" )
+	@ExcelAttribute(name = "退休" )
+	@ExcelProperty("退休")
+	private String typeL;
+
+	/**
+	 * 死亡
+	 */
+	@Schema(description = "死亡" )
+	@ExcelAttribute(name = "死亡" )
+	@ExcelProperty("死亡")
+	private String typeM;
+	/**
+	 * 出国定居
+	 */
+	@Schema(description = "出国定居" )
+	@ExcelAttribute(name = "出国定居" )
+	@ExcelProperty("出国定居")
+	private String typeN;
+	/**
+	 * 港澳台定居
+	 */
+	@Schema(description = "港澳台定居" )
+	@ExcelAttribute(name = "港澳台定居" )
+	@ExcelProperty("港澳台定居")
+	private String typeO;
+	/**
+	 * 退保
+	 */
+	@Schema(description = "退保" )
+	@ExcelAttribute(name = "退保" )
+	@ExcelProperty("退保")
+	private String typeP;
+	/**
+	 * 其他
+	 */
+	@Schema(description = "其他" )
+	@ExcelAttribute(name = "其他" )
+	@ExcelProperty("其他")
+	private String typeQ;
+
+	/**
+	 * 学历
+	 */
+	@Schema(description = "备注")
+	@ExcelAttribute(name = "备注" )
+	@ExcelProperty("备注")
+	private String remark;
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellStyleOneStrategy.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellStyleOneStrategy extends AbstractVerticalCellStyleStrategy {
+
+	/**
+	 * 操作列
+	 */
+	private List<Integer> columnIndexes;
+
+	public CustomCellStyleOneStrategy(List<Integer> columnIndexes ) {
+		this.columnIndexes = columnIndexes;
+	}
+
+	@Override
+	protected WriteCellStyle headCellStyle(Head head) {
+
+		// 获取样式实例
+		WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+		// 获取字体实例
+		WriteFont headWriteFont = new WriteFont();
+		// 设置字体样式
+		headWriteFont.setFontName("宋体");
+		// 设置字体大小
+		headWriteFont.setFontHeightInPoints((short)12);
+		// 边框
+		headWriteFont.setBold(false);
+		headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+		headWriteCellStyle.setWriteFont(headWriteFont);
+		headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
+		headWriteCellStyle.setBorderLeft(BorderStyle.NONE);
+		headWriteCellStyle.setBorderBottom(BorderStyle.NONE);
+		headWriteCellStyle.setBorderRight(BorderStyle.NONE);
+		headWriteCellStyle.setBorderTop(BorderStyle.NONE);
+		return headWriteCellStyle;
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellStyleStrategy.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellStyleStrategy extends AbstractVerticalCellStyleStrategy {
+
+	/**
+	 * 操作列
+	 */
+	private List<Integer> columnIndexes;
+
+	public CustomCellStyleStrategy( List<Integer> columnIndexes ) {
+		this.columnIndexes = columnIndexes;
+	}
+
+
+	@Override
+	public void setHeadCellStyle(Cell cell, Head head, Integer relativeRowIndex) {
+		super.setHeadCellStyle(cell, head, relativeRowIndex);
+	}
+
+	@Override
+	protected WriteCellStyle headCellStyle(Head head) {
+
+		// 获取样式实例
+		WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+		// 获取字体实例
+		WriteFont headWriteFont = new WriteFont();
+		// 设置字体样式
+		headWriteFont.setFontName("宋体");
+		// 设置字体大小
+		headWriteFont.setFontHeightInPoints((short)20);
+		// 边框
+		headWriteFont.setBold(true);
+		headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+		headWriteCellStyle.setWriteFont(headWriteFont);
+		headWriteCellStyle.setBorderLeft(BorderStyle.NONE);
+		headWriteCellStyle.setBorderBottom(BorderStyle.NONE);
+		headWriteCellStyle.setBorderRight(BorderStyle.NONE);
+		headWriteCellStyle.setBorderTop(BorderStyle.NONE);
+		return headWriteCellStyle;
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellStyleThreeStrategy.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellStyleThreeStrategy extends AbstractVerticalCellStyleStrategy {
+
+	/**
+	 * 操作列
+	 */
+	private List<Integer> columnIndexes;
+
+	public CustomCellStyleThreeStrategy(List<Integer> columnIndexes ) {
+		this.columnIndexes = columnIndexes;
+	}
+
+
+	@Override
+	public void setHeadCellStyle(Cell cell, Head head, Integer relativeRowIndex) {
+		super.setHeadCellStyle(cell, head, relativeRowIndex);
+	}
+
+	@Override
+	protected WriteCellStyle headCellStyle(Head head) {
+
+		// 获取样式实例
+		WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+		// 获取字体实例
+		WriteFont headWriteFont = new WriteFont();
+		// 设置字体样式
+		headWriteFont.setFontName("宋体");
+		// 设置字体大小
+		headWriteFont.setFontHeightInPoints((short)12);
+		// 边框
+		headWriteFont.setBold(false);
+		headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+		headWriteCellStyle.setWriteFont(headWriteFont);
+		return headWriteCellStyle;
+	}
+
+	@Override
+	protected WriteCellStyle contentCellStyle(Head head) {
+
+		// 获取样式实例
+		WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+		// 获取字体实例
+		WriteFont headWriteFont = new WriteFont();
+		// 设置字体样式
+		headWriteFont.setFontName("宋体");
+		// 设置字体大小
+		headWriteFont.setFontHeightInPoints((short)12);
+		// 边框
+		headWriteFont.setBold(false);
+		headWriteCellStyle.setFillForegroundColor(IndexedColors.BLACK.getIndex());
+		headWriteCellStyle.setWriteFont(headWriteFont);
+		headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+		headWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+		headWriteCellStyle.setBorderTop(BorderStyle.THIN);
+		headWriteCellStyle.setBorderRight(BorderStyle.THIN);
+		headWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+		return headWriteCellStyle;
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellStyleTwoStrategy.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellStyleTwoStrategy extends AbstractVerticalCellStyleStrategy {
+
+	/**
+	 * 操作列
+	 */
+	private List<Integer> columnIndexes;
+
+	public CustomCellStyleTwoStrategy(List<Integer> columnIndexes ) {
+		this.columnIndexes = columnIndexes;
+	}
+
+	@Override
+	protected WriteCellStyle headCellStyle(Head head) {
+
+		// 获取样式实例
+		WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+		// 获取字体实例
+		WriteFont headWriteFont = new WriteFont();
+		// 设置字体样式
+		headWriteFont.setFontName("宋体");
+		// 设置字体大小
+		headWriteFont.setFontHeightInPoints((short)12);
+		// 边框
+		headWriteFont.setBold(false);
+		headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+		headWriteCellStyle.setWriteFont(headWriteFont);
+		headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
+		headWriteCellStyle.setBorderLeft(BorderStyle.NONE);
+		headWriteCellStyle.setBorderBottom(BorderStyle.NONE);
+		headWriteCellStyle.setBorderRight(BorderStyle.NONE);
+		headWriteCellStyle.setBorderTop(BorderStyle.NONE);
+		return headWriteCellStyle;
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CustomCellWriteWidthConfig.java

+package com.yifu.cloud.plus.v1.yifu.social.config;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CustomCellWriteWidthConfig extends AbstractColumnWidthStyleStrategy {
+
+	@Override
+	protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer integer, Boolean isHead) {
+		boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
+		if (needSetWidth) {
+			Sheet sheet = writeSheetHolder.getSheet();
+			int columnIndex = cell.getColumnIndex();
+			// 单元格文本长度大于45换行
+			if (columnIndex == 3) {
+				//要求将当前列的列宽设置为33英寸，理论值应该是33×256=8448，
+				//但是这里的设值是8648，具体原因请看下面的计算逻辑
+				sheet.setColumnWidth(0, 1000);
+				sheet.setColumnWidth(3, 5000);
+				sheet.setColumnWidth(6, 1500);
+				sheet.setColumnWidth(7, 1500);
+				sheet.setColumnWidth(8, 1500);
+				sheet.setColumnWidth(9, 1500);
+				sheet.setColumnWidth(10, 3000);
+				sheet.setColumnWidth(12, 3000);
+			}
+		}
+	}
+}
\ No newline at end of file

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java

@@ -190,6 +190,24 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 	 **/
 	List<TDispatchSocialPersionExportVo> getSocialPersionDisRecord(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
 
+	/**
+	 * @Author huyc
+	 * @Description 社保派单养老模版count
+	 * @Date 15:47 2023/7/18
+	 * @Param
+	 * @return
+	 **/
+	int getSocialPersionReduceDisCount(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
+
+	/**
+	 * @Author huyc
+	 * @Description 社保派单养老模版
+	 * @Date 15:47 2023/7/18
+	 * @Param
+	 * @return
+	 **/
+	List<TDispatchSocialPersionReduceExportVo> getSocialPersionReduceDisRecord(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
+
 	List<FundHandleExportVo> getFundRecordList(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
 											   @Param("idsStr") List<String> idsStr);
 	/**

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

@@ -25,6 +25,7 @@ import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.excel.util.ListUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.WriteTable;
+import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy;
 import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -50,6 +51,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.social.config.*;
 import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
 import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
@@ -5101,7 +5103,43 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			WriteSheet writeSheet;
 			WriteTable writeTable0;
 			WriteTable writeTable1;
+			WriteTable writeTable2;
+			WriteTable writeTable3;
+			WriteTable writeTable4;
 			TDispatchSocialExportVo vo;
+
+			List<Integer> columnIndexes = Arrays.asList(0,12);
+			CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
+			CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
+			CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
+			CustomCellStyleThreeStrategy customCellStyleStrategyThree = new CustomCellStyleThreeStrategy(columnIndexes);
+
+			writeTable0 = EasyExcel.writerTable(0).
+					head(headOne()).
+					registerWriteHandler(customCellStyleStrategy).
+					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
+					build();
+			writeTable1 = EasyExcel.writerTable(1).
+					head(headTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).
+					registerWriteHandler(customCellStyleStrategyOne).
+					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)).
+					build();
+			writeTable2 = EasyExcel.writerTable(2).
+					head(headThree()).
+					registerWriteHandler(customCellStyleStrategyThree).
+					registerWriteHandler(new CustomCellWriteWidthConfig()).
+					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
+					.build();
+			writeTable3 = EasyExcel.writerTable(3).
+					head(headFour()).
+					registerWriteHandler(customCellStyleStrategyTwo).
+					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)50,(short)20))
+					.build();
+			writeTable4 = EasyExcel.writerTable(4).
+					head(headFive()).
+					registerWriteHandler(customCellStyleStrategyTwo).
+					registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
+					.build();
 			//派增的数据
 			searchVo.setType(CommonConstants.ZERO_STRING);
 			long count = getSocialDisRecordCount(searchVo);
@@ -5111,19 +5149,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					//判断list的大小是否大于10
 					if (list.size() < 10) {
 						int size = 10 - list.size();
+						int num = list.size() + 1;
 						for (int i =1;i<= size;i++) {
 							vo = new TDispatchSocialExportVo();
-							vo.setNum(list.size() + i);
+							vo.setNum(num);
+							num ++;
 							list.add(vo);
 						}
 					}
 					writeSheet = EasyExcel.writerSheet("增员").build();
-					writeTable0 = EasyExcel.writerTable(0).head(head(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
-					writeTable1 = EasyExcel.writerTable(1).head(head1()).build();
 					// 第一次写入会创建头
-					excelWriter.write(list, writeSheet, writeTable0);
-					// 第二次写如也会创建头，然后在第一次的后面写入数据
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
 					excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
+					// 第二次写如也会创建头，然后在第一次的后面写入数据
+					excelWriter.write(list, writeSheet, writeTable2);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
 				}
 			} else {
 				writeSheet = EasyExcel.writerSheet("增员").build();
@@ -5138,19 +5179,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					//判断list的大小是否大于10
 					if (list.size() < 10) {
 						int size = 10 - list.size();
+						int num = list.size() + 1;
 						for (int i =1;i<= size;i++) {
 							vo = new TDispatchSocialExportVo();
-							vo.setNum(list.size() + i);
+							vo.setNum(num);
+							num ++;
 							list.add(vo);
 						}
 					}
 					writeSheet = EasyExcel.writerSheet("减员").build();
-					writeTable0 = EasyExcel.writerTable(0).head(head(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
-					writeTable1 = EasyExcel.writerTable(1).head(head1()).build();
 					// 第一次写入会创建头
-					excelWriter.write(list, writeSheet, writeTable0);
-					// 第二次写如也会创建头，然后在第一次的后面写入数据
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
 					excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
+					// 第二次写如也会创建头，然后在第一次的后面写入数据
+					excelWriter.write(list, writeSheet, writeTable2);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
 				}
 			} else {
 				writeSheet = EasyExcel.writerSheet("减员").build();
@@ -5184,7 +5228,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			WriteSheet writeSheet;
 			WriteTable writeTable0;
 			WriteTable writeTable1;
+			WriteTable writeTable2;
+			WriteTable writeTable3;
+			WriteTable writeTable4;
 			TDispatchSocialPersionExportVo vo;
+			TDispatchSocialPersionReduceExportVo reduceVo;
 			//派增的数据
 			searchVo.setType(CommonConstants.ZERO_STRING);
 			long count = getSocialPersionDisCount(searchVo);
@@ -5194,19 +5242,53 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					//判断list的大小是否大于10
 					if (list.size() < 10) {
 						int size = 10 - list.size();
+						int num = list.size() + 1;
 						for (int i =1;i<= size;i++) {
 							vo = new TDispatchSocialPersionExportVo();
-							vo.setNum(list.size() + i);
+							vo.setNum(num);
+							num ++;
 							list.add(vo);
 						}
 					}
+					List<Integer> columnIndexes = Arrays.asList(0,17);
+					CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
+					CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
+					CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
+					CustomCellStyleThreeStrategy customCellStyleStrategyThree = new CustomCellStyleThreeStrategy(columnIndexes);
+
+					writeTable0 = EasyExcel.writerTable(0).
+							head(persionHeadOne()).
+							registerWriteHandler(customCellStyleStrategy).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
+							build();
+					writeTable1 = EasyExcel.writerTable(1).
+							head(persionHeadTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).
+							registerWriteHandler(customCellStyleStrategyOne).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)).
+							build();
+					writeTable2 = EasyExcel.writerTable(2).
+							head(persionHead()).
+							registerWriteHandler(customCellStyleStrategyThree).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
+							.build();
+					writeTable3 = EasyExcel.writerTable(3).
+							head(persionHeadThree()).
+							registerWriteHandler(customCellStyleStrategyTwo).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)100,(short)20))
+							.build();
+					writeTable4 = EasyExcel.writerTable(4).
+							head(persionHead1()).
+							registerWriteHandler(customCellStyleStrategyTwo).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20))
+							.build();
 					writeSheet = EasyExcel.writerSheet("增员").build();
-					writeTable0 = EasyExcel.writerTable(0).head(persionHead(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
-					writeTable1 = EasyExcel.writerTable(1).head(persionHead1()).build();
 					// 第一次写入会创建头
-					excelWriter.write(list, writeSheet, writeTable0);
 					// 第二次写如也会创建头，然后在第一次的后面写入数据
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
 					excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
+					excelWriter.write(list, writeSheet, writeTable2);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
 				}
 			} else {
 				writeSheet = EasyExcel.writerSheet("增员").build();
@@ -5214,30 +5296,60 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			//派减的数据
 			searchVo.setType(CommonConstants.ONE_STRING);
-			long count1 = getSocialPersionDisCount(searchVo);
+			long count1 = getSocialPersionReduceDisCount(searchVo);
+			//获取要导出的列表
+			List<TDispatchSocialPersionReduceExportVo> listReduce = new ArrayList<>();
 			if (count1 >  CommonConstants.ZERO_INT){
-				list = getSocialPersionDisRecord(searchVo);
-				if (Common.isNotNull(list)) {
+				listReduce = getSocialPersionReduceDisRecord(searchVo);
+				if (Common.isNotNull(listReduce)) {
 					//判断list的大小是否大于10
-					if (list.size() < 10) {
-						int size = 10 - list.size();
+					if (listReduce.size() < 10) {
+						int size = 10 - listReduce.size();
+						int num = listReduce.size() + 1;
 						for (int i =1;i<= size;i++) {
-							vo = new TDispatchSocialPersionExportVo();
-							vo.setNum(list.size() + i);
-							list.add(vo);
-						}
-					}
+							reduceVo = new TDispatchSocialPersionReduceExportVo();
+							reduceVo.setNum(num);
+							num ++;
+							listReduce.add(reduceVo);
+						}
+					}
+					List<Integer> columnIndexes = Arrays.asList(0,24);
+					CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
+					CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
+					CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
+					CustomCellStyleThreeStrategy customCellStyleStrategyThree = new CustomCellStyleThreeStrategy(columnIndexes);
+
+					writeTable0 = EasyExcel.writerTable(0).
+							head(persionReduceHeadOne()).
+							registerWriteHandler(customCellStyleStrategy).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)).
+							build();
+					writeTable1 = EasyExcel.writerTable(1).
+							head(persionReduceHeadTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).
+							registerWriteHandler(customCellStyleStrategyOne).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)).
+							build();
+					writeTable2 = EasyExcel.writerTable(2).
+							head(persionReduceHead()).
+							registerWriteHandler(customCellStyleStrategyThree).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20))
+							.build();
+					writeTable3 = EasyExcel.writerTable(3).
+							head(persionReduceHead1()).
+							registerWriteHandler(customCellStyleStrategyTwo).
+							registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20))
+							.build();
 					writeSheet = EasyExcel.writerSheet("减员").build();
-					writeTable0 = EasyExcel.writerTable(0).head(persionHead(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())).build();
-					writeTable1 = EasyExcel.writerTable(1).head(persionHead1()).build();
 					// 第一次写入会创建头
-					excelWriter.write(list, writeSheet, writeTable0);
 					// 第二次写如也会创建头，然后在第一次的后面写入数据
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
 					excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
+					excelWriter.write(listReduce, writeSheet, writeTable2);
+					excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
 				}
 			} else {
 				writeSheet = EasyExcel.writerSheet("减员").build();
-				excelWriter.write(list,writeSheet);
+				excelWriter.write(listReduce,writeSheet);
 			}
 			if (excelWriter!= null) {
 				excelWriter.finish();
@@ -5247,136 +5359,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 	}
 
-	/**
-	 * @Author huyc
-	 * @Description 导出社保派单花名册
-	 * @Date 09:05 2023/7/19
-	 * @return
-	 */
-	public List<List<String>> head(String houseName,String cusNo) {
-		List<List<String>> list = new ArrayList<>();
-		//表头数据
-		String a="合肥市基本医疗保险参保登记表";
-		String b="单位名称(盖章): " + houseName + "   单位统一信用代码:" + cusNo;
-		String c="人员类型： □√单位职工      □灵活就业人员";
-		String d="变更类别";
-		//第一列
-		list.add( Lists.newArrayList(a,b,c,"序号","序号"));
-		//第二列
-		list.add( Lists.newArrayList(a,b,c,"姓名","姓名"));
-		//第三列
-		list.add( Lists.newArrayList(a,b,c,"身份证件类型","身份证件类型"));
-		//第四列
-		list.add( Lists.newArrayList(a,b,c,"身份证件号码","身份证件号码"));
-		//第五列
-		list.add( Lists.newArrayList(a,b,c,"参报/停保时间","参报/停保时间"));
-		//第六列
-		list.add( Lists.newArrayList(a,b,c,"申报工资（元）","申报工资（元）"));
-		//变更类别
-		List<String> orderSpeaces = Lists.newArrayList("新增","续保","中断","终止");
-		orderSpeaces.forEach(e->{
-			list.add( Lists.newArrayList(a,b,c,d ,e) );
-		});
-		//第十一列
-		list.add( Lists.newArrayList(a,b,c,"手机号码","手机号码"));
-		//第十二列
-		list.add( Lists.newArrayList(a,b,c,"学历","学历"));
-		//第十三列
-		list.add( Lists.newArrayList(a,b,c,"备注","备注"));
-		return list;
-	}
-
-	/**
-	 * @Author huyc
-	 * @Description 导出社保派单花名册
-	 * @Date 09:05 2023/7/19
-	 * @return
-	 */
-	public List<List<String>> head1() {
-		List<List<String>> list = new ArrayList<>();
-		//表头数据
-		String a = "备注： 1.身份证类型填写：身份证、护照、港澳台通行证等； \n" +
-				"2.增加人员勾选新增或续保，减少人员勾选中断或终止，按相应类型进行勾选；\n" +
-				"3.联系电话务必填写准确的手机号码;\n";
-		String b="填报人：       联系电话：           经办人（盖章）：         " +
-				DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " +
-				DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " +
-				DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
-		//第一列
-		list.add(Lists.newArrayList(a,b));
-		return list;
-	}
-
-	/**
-	 * @Author huyc
-	 * @Description 导出社保派单花名册
-	 * @Date 09:05 2023/7/21
-	 * @return
-	 */
-	public List<List<String>> persionHead(String houseName,String cusNo) {
-		List<List<String>> list = new ArrayList<>();
-		//表头数据
-		String a="职 工 社 会 保 险 增 加 花 名 册";
-		String b="单位名称(签章): " + houseName + "            单位编码:" + cusNo;
-		String c="参加保险险种";
-		//第一列
-		list.add( Lists.newArrayList(a,b,"序号","序号"));
-		//第二列
-		list.add( Lists.newArrayList(a,b,"姓名","姓名"));
-		//第三列
-		list.add( Lists.newArrayList(a,b,"职工编码","职工编码"));
-		//第四列
-		list.add( Lists.newArrayList(a,b,"社会保障号码（身份证号码）","社会保障号码（身份证号码）"));
-		//第五列
-		list.add( Lists.newArrayList(a,b,"性别","性别"));
-		//第六列
-		list.add( Lists.newArrayList(a,b,"民族","民族"));
-		//第七列
-		list.add( Lists.newArrayList(a,b,"参加工作时间","参加工作时间"));
-		//第八列
-		list.add( Lists.newArrayList(a,b,"户口性质","户口性质"));
-		//第九列
-		list.add( Lists.newArrayList(a,b,"个人身份","个人身份"));
-		//参加保险险种
-		List<String> orderSpeaces = Lists.newArrayList("养老","失业","医疗","工伤","生育");
-		orderSpeaces.forEach(e->{
-			list.add( Lists.newArrayList(a,b,c,e) );
-		});
-		//第十五列
-		list.add( Lists.newArrayList(a,b,"月工资收入(元)","月工资收入(元)"));
-		//第十六列
-		list.add( Lists.newArrayList(a,b,"补缴保险属期","补缴保险属期"));
-		//第十七列
-		list.add( Lists.newArrayList(a,b,"户籍所在地","户籍所在地"));
-		//第十八列
-		list.add( Lists.newArrayList(a,b,"备注","备注"));
-		return list;
-	}
-
-	/**
-	 * @Author huyc
-	 * @Description 导出社保派单花名册
-	 * @Date 11:12 2023/7/21
-	 * @return
-	 */
-	public List<List<String>> persionHead1() {
-		List<List<String>> list = new ArrayList<>();
-		//表头数据
-		String a = "1、“户口性质”栏按下列类别填写：非农业户口（城镇）、本地非农业户口（本地城镇）、外地非农业户口（外地城镇）、农业户口（农村）、 \n" +
-					"          本地农业户口（本地农村）、外地农业户口（外地农村）、港澳台、外籍 \n" +
-					"2、“个人身份”栏按下列类别填写：“企业职工”、“国家公务员”、“事业单位在编人员”、“编外人员”、“现役军人”、“协保人员”、“公益性岗位”“农民工医保” \n"  +
-					"3、“参加保险险种”栏可对应选项打“√” \n"  +
-					"4、新增人员（含断保再次缴费人员），个人月工资收入按起薪工资额申报。\n" +
-					"5、补缴时段超过3个月的，缴费基数为历年安徽省社平工资，同时加征利息(含参保当月的缴费基数)。\n"  +
-					"6、如属军队退役人员或劳模人员在备注栏中填写，“退役军人类别”栏按下列类别填写：军队转业干部、计划分配的军队转业干部、自主择业的军队转业干部、退伍复员军人、转业复员士官、退伍 \n" +
-					"义务兵（含伤病残义务兵）、复员干部，“劳模级别”栏按下列类别填写：国家级、省（自治区、直辖市）级、部（委）级、地（市、厅、局）级、其他 \n" +
-					"7、本表需填制一式两份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
-		String b="填报人：         单位联系电话：            社保经办机构审核人：         " + "填报日期:  " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
-		//第一列
-		list.add(Lists.newArrayList(a,b));
-		return list;
-	}
-
 	private List<FundHandleExportVo> getFundRecordList(SocialHandleSearchVo searchVo, String idStr) {
 		return baseMapper.getFundRecordList(searchVo,Common.getList(idStr));
 	}
@@ -5405,6 +5387,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return baseMapper.getSocialPersionDisRecord(searchVo);
 	}
 
+	private long getSocialPersionReduceDisCount(SocialHandleSearchVo searchVo) {
+		return baseMapper.getSocialPersionReduceDisCount(searchVo);
+	}
+
+	private List<TDispatchSocialPersionReduceExportVo> getSocialPersionReduceDisRecord(SocialHandleSearchVo searchVo) {
+		return baseMapper.getSocialPersionReduceDisRecord(searchVo);
+	}
+
 	/**
 	 * @param socialFundInfo
 	 * @Description: 获取最小起缴日
@@ -5954,4 +5944,314 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return false;
 	}
 
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> headOne() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a="合肥市基本医疗保险参保登记表";
+		//第一列-第十三列
+		for (int i =1;i<= 13;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> headTwo(String houseName,String cusNo) {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String b = "单位名称(盖章): " + houseName + "   单位统一信用代码:" + cusNo;
+		String c = "人员类型： □√单位职工      □灵活就业人员";
+		for (int i =1;i<= 13;i++) {
+			list.add(Lists.newArrayList(b,c));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> headThree() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String d="变更类别";
+		//第一列
+		list.add( Lists.newArrayList("序号","序号"));
+		//第二列
+		list.add( Lists.newArrayList("姓名","姓名"));
+		//第三列
+		list.add( Lists.newArrayList("身份证件类型","身份证件类型"));
+		//第四列
+		list.add( Lists.newArrayList("身份证件号码","身份证件号码"));
+		//第五列
+		list.add( Lists.newArrayList("参报/停保时间","参报/停保时间"));
+		//第六列
+		list.add( Lists.newArrayList("申报工资（元）","申报工资（元）"));
+		//变更类别
+		List<String> orderSpeaces = Lists.newArrayList("新增","续保","中断","终止");
+		orderSpeaces.forEach(e->{
+			list.add( Lists.newArrayList(d ,e) );
+		});
+		//第十一列
+		list.add( Lists.newArrayList("手机号码","手机号码"));
+		//第十二列
+		list.add( Lists.newArrayList("学历","学历"));
+		//第十三列
+		list.add( Lists.newArrayList(" 备注"," 备注"));
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> headFour() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a = "备注： 1.身份证类型填写：身份证、护照、港澳台通行证等； \n" +
+				"       2.增加人员勾选新增或续保，减少人员勾选中断或终止，按相应类型进行勾选；\n" +
+				"       3.联系电话务必填写准确的手机号码；\n";
+		//第一列-第十三列
+		for (int i =1;i<= 13;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> headFive() {
+		List<List<String>> list = new ArrayList<>();
+		String b="填报人：                   联系电话：                    经办人（盖章）：              " +
+				DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " +
+				DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " +
+				DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
+		//第一列-第十三列
+		for (int i =1;i<= 13;i++) {
+			list.add(Lists.newArrayList(b));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> persionHeadOne() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a="职 工 社 会 保 险 增 加 花 名 册";
+		//第一列-第十八列
+		for (int i =1;i<= 18;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> persionHeadTwo(String houseName,String cusNo) {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a="单位名称(签章): " + houseName + "                        单位编码:" + cusNo;
+		//第一列-第十八列
+		for (int i =1;i<= 18;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/21
+	 * @return
+	 */
+	public List<List<String>> persionHead() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String c="参加保险险种";
+		//第一列
+		list.add( Lists.newArrayList("序号","序号"));
+		//第二列
+		list.add( Lists.newArrayList("姓名","姓名"));
+		//第三列
+		list.add( Lists.newArrayList("职工编码","职工编码"));
+		//第四列
+		list.add( Lists.newArrayList("社会保障号码（身份证号码）","社会保障号码（身份证号码）"));
+		//第五列
+		list.add( Lists.newArrayList("性别","性别"));
+		//第六列
+		list.add( Lists.newArrayList("民族","民族"));
+		//第七列
+		list.add( Lists.newArrayList("参加工作时间","参加工作时间"));
+		//第八列
+		list.add( Lists.newArrayList("户口性质","户口性质"));
+		//第九列
+		list.add( Lists.newArrayList("个人身份","个人身份"));
+		//参加保险险种
+		List<String> orderSpeaces = Lists.newArrayList("养老","失业","医疗","工伤","生育");
+		orderSpeaces.forEach(e->{
+			list.add( Lists.newArrayList(c,e) );
+		});
+		//第十五列
+		list.add( Lists.newArrayList("月工资收入(元)","月工资收入(元)"));
+		//第十六列
+		list.add( Lists.newArrayList("补缴保险属期","补缴保险属期"));
+		//第十七列
+		list.add( Lists.newArrayList("户籍所在地","户籍所在地"));
+		//第十八列
+		list.add( Lists.newArrayList("备注","备注"));
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 11:12 2023/7/21
+	 * @return
+	 */
+	public List<List<String>> persionHeadThree() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a = "1、“户口性质”栏按下列类别填写：非农业户口（城镇）、本地非农业户口（本地城镇）、外地非农业户口（外地城镇）、农业户口（农村）、 \n" +
+				"          本地农业户口（本地农村）、外地农业户口（外地农村）、港澳台、外籍 \n" +
+				"	2、“个人身份”栏按下列类别填写：“企业职工”、“国家公务员”、“事业单位在编人员”、“编外人员”、“现役军人”、“协保人员”、“公益性岗位”“农民工医保” \n"  +
+				"	3、“参加保险险种”栏可对应选项打“√” \n"  +
+				"	4、新增人员（含断保再次缴费人员），个人月工资收入按起薪工资额申报。\n" +
+				"	5、补缴时段超过3个月的，缴费基数为历年安徽省社平工资，同时加征利息(含参保当月的缴费基数)。\n"  +
+				"	6、如属军队退役人员或劳模人员在备注栏中填写，“退役军人类别”栏按下列类别填写：军队转业干部、计划分配的军队转业干部、自主择业的军队转业干部、退伍复员军人、转业复员士官、退伍 \n" +
+				"	义务兵（含伤病残义务兵）、复员干部，“劳模级别”栏按下列类别填写：国家级、省（自治区、直辖市）级、部（委）级、地（市、厅、局）级、其他 \n" +
+				"	7、本表需填制一式两份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
+		//第一列-第十八列
+		for (int i =1;i<= 18;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 11:12 2023/7/21
+	 * @return
+	 */
+	public List<List<String>> persionHead1() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String b="填报人：           单位联系电话：             社保经办机构审核人：           " + "填报日期:  " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
+		//第一列-第十八列
+		for (int i =1;i<= 18;i++) {
+			list.add(Lists.newArrayList(b));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> persionReduceHeadOne() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a=" 社 会 保  险 缴 费 单 位 人 员 减 少 花 名 册";
+		//第一列-第二十五列
+		for (int i =1;i<= 25;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/19
+	 * @return
+	 */
+	public List<List<String>> persionReduceHeadTwo(String houseName,String cusNo) {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a="单位名称(签章): " + houseName + "                   单位编码:" + cusNo;
+		//第一列-第二十五列
+		for (int i =1;i<= 25;i++) {
+			list.add(Lists.newArrayList(a));
+		}
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 09:05 2023/7/21
+	 * @return
+	 */
+	public List<List<String>> persionReduceHead() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String c="减少原因";
+		//第一列
+		list.add( Lists.newArrayList("序号","序号"));
+		//第二列
+		list.add( Lists.newArrayList("职工编码","职工编码"));
+		//第三列
+		list.add( Lists.newArrayList("姓名","姓名"));
+		//第四列
+		list.add( Lists.newArrayList("社会保障号码（身份证号码）","社会保障号码（身份证号码）"));
+		//第五列
+		list.add( Lists.newArrayList("停止缴费时间","停止缴费时间"));
+		//减少原因
+		List<String> orderSpeaces = Lists.newArrayList("辞职","辞退","参军","上学","劳改","劳教","除名","人员失踪","停薪留职","解除合同","统筹内调出","调出统筹范围","退休","死亡","出国定居","港澳台定居","退保","其他");
+		orderSpeaces.forEach(e->{
+			list.add( Lists.newArrayList(c,e) );
+		});
+		list.add( Lists.newArrayList("备注","备注"));
+		return list;
+	}
+
+	/**
+	 * @Author huyc
+	 * @Description 导出社保派单花名册
+	 * @Date 11:12 2023/7/21
+	 * @return
+	 */
+	public List<List<String>> persionReduceHead1() {
+		List<List<String>> list = new ArrayList<>();
+		//表头数据
+		String a = "说明1、“减少原因”栏可对应选项打“√”； \n" +
+				"2、本表需填制一式二份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
+		String b="填报人：               单位联系电话：                社保经办机构审核人：           " + "填报日期:  " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
+		//第一列-第十八列
+		for (int i =1;i<= 25;i++) {
+			list.add(Lists.newArrayList(a,b));
+		}
+		return list;
+	}
+
 }

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

@@ -212,6 +212,32 @@
 		<result property="remark" column="REMARK"/>
 	</resultMap>
 
+	<resultMap id="socialPersionReduceDisExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchSocialPersionReduceExportVo">
+		<result property="num" column="num"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="empNo" column="EMP_NO"/>
+		<result property="empName" column="EMP_NAME"/>
+		<result property="workDate" column="WORK_DATE"/>
+		<result property="typeA" column="typeA"/>
+		<result property="typeB" column="typeB"/>
+		<result property="typeC" column="typeC"/>
+		<result property="typeD" column="typeD"/>
+		<result property="typeE" column="typeE"/>
+		<result property="typeF" column="typeF"/>
+		<result property="typeG" column="typeG"/>
+		<result property="typeH" column="typeH"/>
+		<result property="typeI" column="typeI"/>
+		<result property="typeJ" column="typeJ"/>
+		<result property="typeK" column="typeK"/>
+		<result property="typeL" column="typeL"/>
+		<result property="typeM" column="typeM"/>
+		<result property="typeN" column="typeN"/>
+		<result property="typeO" column="typeO"/>
+		<result property="typeP" column="typeP"/>
+		<result property="typeQ" column="typeQ"/>
+		<result property="remark" column="REMARK"/>
+	</resultMap>
+
 	<!-- 派单审核导出vo -->
 	<resultMap id="exportAuditMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchAuditExportVo">
 		<result property="empName" column="EMP_NAME"/>
@@ -1262,6 +1288,48 @@
 		</where>
 	</select>
 
+	<!--tDispatchInfo 社保养老花名册派单数据-->
+	<select id="getSocialPersionReduceDisCount" resultType="java.lang.Integer">
+		SELECT count(1)
+		FROM t_dispatch_info a
+		<where>
+			<include refid="where_getSocialPersionDisRecord"/>
+		</where>
+	</select>
+
+	<!--tDispatchInfo 社保养老花名册派单数据-->
+	<select id="getSocialPersionReduceDisRecord" resultMap="socialPersionReduceDisExportMap">
+		SELECT
+		(@i :=@i+1) as num,
+		a.EMP_NO,
+		a.EMP_NAME,
+		a.EMP_IDCARD,
+		DATE_FORMAT(a.CREATE_TIME,"%Y%m") as WORK_DATE,
+		'√' as typeA,
+		'' as typeB,
+		'' as typeC,
+		'' as typeD,
+		'' as typeE,
+		'' as typeF,
+		'' as typeG,
+		'' as typeH,
+		'' as typeJ,
+		'' as typeK,
+		'' as typeL,
+		'' as typeM,
+		'' as typeN,
+		'' as typeO,
+		'' as typeP,
+		'' as typeQ,
+		a.EMP_MOBILE as REMARK
+		FROM t_dispatch_info a
+		left join t_social_info s on s.id=a.SOCIAL_ID
+		,(select @i:=0) as itable
+		<where>
+			<include refid="where_getSocialPersionDisRecord"/>
+		</where>
+	</select>
+
 	<!--tDispatchInfo 公积金变更清册查询-->
 	<select id="getFundRecordList" resultMap="fundHandleMap">
 		SELECT