Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

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

@@ -132,6 +132,13 @@ public class TDispatchSocialPersionReduceExportVo implements Serializable {
 	@ExcelAttribute(name = "停薪留职" )
 	@ExcelProperty("停薪留职")
 	private String typeH;
+	/**
+	 * 合同期满
+	 */
+	@Schema(description = "合同期满" )
+	@ExcelAttribute(name = "合同期满" )
+	@ExcelProperty("合同期满")
+	private String typeZ;
 	/**
 	 * 解除合同
 	 */

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

@@ -26,7 +26,7 @@ public class CustomCellWriteWidthTwoConfig extends AbstractColumnWidthStyleStrat
 				//要求将当前列的列宽设置为33英寸，理论值应该是33×256=8448，
 				//但是这里的设值是8648，具体原因请看下面的计算逻辑
 				sheet.setColumnWidth(0, 1000);
-				sheet.setColumnWidth(1, 4000);
+				sheet.setColumnWidth(1, 3000);
 				sheet.setColumnWidth(3, 5000);
 				sheet.setColumnWidth(5, 1000);
 				sheet.setColumnWidth(6, 1000);
@@ -40,13 +40,14 @@ public class CustomCellWriteWidthTwoConfig extends AbstractColumnWidthStyleStrat
 				sheet.setColumnWidth(14, 1500);
 				sheet.setColumnWidth(15, 1500);
 				sheet.setColumnWidth(16, 1500);
-				sheet.setColumnWidth(17, 1000);
+				sheet.setColumnWidth(17, 1500);
 				sheet.setColumnWidth(18, 1000);
-				sheet.setColumnWidth(19, 1500);
+				sheet.setColumnWidth(19, 1000);
 				sheet.setColumnWidth(20, 1500);
-				sheet.setColumnWidth(21, 1000);
+				sheet.setColumnWidth(21, 1500);
 				sheet.setColumnWidth(22, 1000);
-				sheet.setColumnWidth(23, 4000);
+				sheet.setColumnWidth(23, 1000);
+				sheet.setColumnWidth(24, 3500);
 			}
 		}
 	}

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

@@ -5335,7 +5335,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			//获取要导出的列表
 			List<TDispatchSocialPersionReduceExportVo> listReduce = new ArrayList<>();
 
-			List<Integer> columnIndex = Arrays.asList(0,23);
+			List<Integer> columnIndex = Arrays.asList(0,24);
 			CustomCellStyleStrategy customCellStyleStrategy1 = new CustomCellStyleStrategy(columnIndex);
 			CustomCellStyleOneStrategy customCellStyleStrategy2 = new CustomCellStyleOneStrategy(columnIndex);
 			CustomCellStyleTwoStrategy customCellStyleStrategy3 = new CustomCellStyleTwoStrategy(columnIndex);
@@ -6211,7 +6211,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	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()) + " 日";
+		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));
@@ -6230,7 +6230,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//表头数据
 		String a="社 会 保 险 缴 费 单 位 人 员 减 少 花 名 册";
 		//第一列-第二十五列
-		for (int i =1;i<= 24;i++) {
+		for (int i =1;i<= 25;i++) {
 			list.add(Lists.newArrayList(a));
 		}
 		return list;
@@ -6247,7 +6247,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//表头数据
 		String a="单位名称(签章): " + houseName + "                   单位编码:" + (null == cusNo ? " " : cusNo);
 		//第一列-第二十五列cusNo
-		for (int i =1;i<= 24;i++) {
+		for (int i =1;i<= 25;i++) {
 			list.add(Lists.newArrayList(a));
 		}
 		return list;
@@ -6274,7 +6274,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//第五列
 		list.add( Lists.newArrayList("停止缴费时间","停止缴费时间"));
 		//减少原因
-		List<String> orderSpeaces = Lists.newArrayList("辞职","辞退","参军","上学","劳改","劳教","除名","人员失踪","停薪留职","解除合同","统筹内调出","调出统筹范围","退休","死亡","出国定居","港澳台定居","退保","其他");
+		List<String> orderSpeaces = Lists.newArrayList("辞职","辞退","参军","上学","劳改","劳教","除名","人员失踪","停薪留职","合同期满","解除合同","统筹内调出","调出统筹范围","退休","死亡","出国定居","港澳台定居","退保","其他");
 		orderSpeaces.forEach(e->{
 			list.add( Lists.newArrayList(c,e) );
 		});
@@ -6293,9 +6293,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		//表头数据
 		String a = "说明1、“减少原因”栏可对应选项打“√”； \n" +
 				"2、本表需填制一式二份，经办机构审核盖章后方可有效，一份单位自存，一份报市社会保险经办机构。";
-		String b="填报人：                 单位联系电话：                  社保经办机构审核人：               " + "填报日期:  " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
+		String b="填表人：                 单位联系电话：                  社保经办机构审核人：               " + "填报日期:  " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
 		//第一列-第十八列
-		for (int i =1;i<= 24;i++) {
+		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

@@ -236,6 +236,7 @@
 		<result property="typeO" column="typeO"/>
 		<result property="typeP" column="typeP"/>
 		<result property="typeQ" column="typeQ"/>
+		<result property="typeZ" column="typeZ"/>
 		<result property="remark" column="REMARK"/>
 	</resultMap>
 
@@ -1215,18 +1216,33 @@
 
 	<!--tDispatchInfo 社保花名册派单数据count-->
 	<select id="getSocialDisRecordCount" resultType="java.lang.Integer">
-		SELECT
-		count(1)
+		SELECT count(1) from (
+		SELECT 1
 		FROM t_dispatch_info a
 		<where>
 			<include refid="where_getSocialDisRecord"/>
 		</where>
+		group by a.EMP_IDCARD) h
 	</select>
 
 	<!--tDispatchInfo 社保医疗花名册派单数据-->
 	<select id="getSocialDisRecord" resultMap="socialDisExportMap">
 		SELECT
 			(@i :=@i+1) as NUM,
+			h.EMP_NAME,
+			h.IDCARD_TYPE,
+			h.EMP_IDCARD,
+			h.DIS_MONTH,
+			h.MEDICAL_CARDINAL,
+			h.CHANGE_TYPE_ONE,
+			h.CHANGE_TYPE_TWO,
+			h.CHANGE_TYPE_THREE,
+			h.CHANGE_TYPE_FOUR,
+			h.EMP_MOBILE,
+			h.EDUCATION_NAME,
+			h.REMARK
+			from (
+			select
 			a.EMP_NAME,
 			'身份证' as IDCARD_TYPE,
 			a.EMP_IDCARD,
@@ -1241,16 +1257,30 @@
 			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_getSocialDisRecord"/>
 		</where>
+		group by a.EMP_IDCARD) h,(select @i:=0) as itable
 	</select>
 
 	<!--tDispatchInfo 社保医疗花名册派单数据-->
 	<select id="getSocialReduceDisRecord" resultMap="socialDisExportMap">
 		SELECT
 		(@i :=@i+1) as NUM,
+		h.EMP_NAME,
+		h.IDCARD_TYPE,
+		h.EMP_IDCARD,
+		h.DIS_MONTH,
+		h.MEDICAL_CARDINAL,
+		h.CHANGE_TYPE_ONE,
+		h.CHANGE_TYPE_TWO,
+		h.CHANGE_TYPE_THREE,
+		h.CHANGE_TYPE_FOUR,
+		h.EMP_MOBILE,
+		h.EDUCATION_NAME,
+		h.REMARK
+		from (
+		select
 		a.EMP_NAME,
 		'身份证' as IDCARD_TYPE,
 		a.EMP_IDCARD,
@@ -1265,25 +1295,47 @@
 		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_getSocialDisRecord"/>
 		</where>
+		group by a.EMP_IDCARD) h,(select @i:=0) as itable
 	</select>
 
 	<!--tDispatchInfo 社保养老花名册派单数据-->
 	<select id="getSocialPersionDisCount" resultType="java.lang.Integer">
-		SELECT count(1)
+		SELECT count(1) from (
+		select 1
 		FROM t_dispatch_info a
 		<where>
 			<include refid="where_getSocialPersionDisRecord"/>
 		</where>
+		group by a.EMP_IDCARD) h
 	</select>
 
 	<!--tDispatchInfo 社保养老花名册派单数据-->
 	<select id="getSocialPersionDisRecord" resultMap="socialPersionDisExportMap">
 		SELECT
 		(@i :=@i+1) as num,
+		h.EMP_NAME,
+		h.EMP_NO,
+		h.EMP_IDCARD,
+		h.sex,
+		h.EMP_NATIONAL,
+		h.WORK_DATE,
+		h.type,
+		h.SIGNLE_TYPE,
+		h.INSURANCE_TYPE_ONE,
+		h.INSURANCE_TYPE_TWO,
+		h.INSURANCE_TYPE_THREE,
+		h.INSURANCE_TYPE_FOUR,
+		h.INSURANCE_TYPE_FIVE,
+		h.PERSION_CARDINAL,
+		h.MEDICAL_CARDINAL,
+		h.DATE_ONE,
+		h.CONTRACT_ADRESS,
+		h.REMARK
+		FROM (
+		SELECT
 		a.EMP_NAME,
 		'' as EMP_NO,
 		a.EMP_IDCARD,
@@ -1321,25 +1373,52 @@
 		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>
+		group by a.EMP_IDCARD)h,(select @i:=0) as itable
 	</select>
 
 	<!--tDispatchInfo 社保养老花名册派单数据-->
 	<select id="getSocialPersionReduceDisCount" resultType="java.lang.Integer">
-		SELECT count(1)
+		SELECT count(1) from (
+		SELECT 1
 		FROM t_dispatch_info a
 		<where>
 			<include refid="where_getSocialPersionDisRecord"/>
 		</where>
+		group by a.EMP_IDCARD) h
 	</select>
 
 	<!--tDispatchInfo 社保养老花名册派单数据-->
 	<select id="getSocialPersionReduceDisRecord" resultMap="socialPersionReduceDisExportMap">
 		SELECT
 		(@i :=@i+1) as num,
+		h.EMP_NO,
+		h.EMP_NAME,
+		h.EMP_IDCARD,
+		h.WORK_DATE,
+		h.typeA,
+		h.typeB,
+		h.typeC,
+		h.typeD,
+		h.typeE,
+		h.typeW,
+		h.typeF,
+		h.typeG,
+		h.typeH,
+		h.typeZ,
+		h.typeJ,
+		h.typeK,
+		h.typeL,
+		h.typeM,
+		h.typeN,
+		h.typeO,
+		h.typeP,
+		h.typeQ,
+		h.REMARK
+		FROM (
+		SELECT
 		'' as EMP_NO,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
@@ -1353,6 +1432,7 @@
 		'' as typeF,
 		'' as typeG,
 		'' as typeH,
+		'' as typeZ,
 		'' as typeJ,
 		'' as typeK,
 		'' as typeL,
@@ -1364,10 +1444,10 @@
 		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>
+		group by a.EMP_IDCARD) h,(select @i:=0) as itable
 	</select>
 
 	<!--tDispatchInfo 公积金变更清册查询-->
@@ -1810,8 +1890,8 @@
 	<sql id="where_getSocialPersionDisRecord">
 		a.DELETE_FLAG = 0
 		AND a.social_id is not null
-		AND a.STATUS = "2"
-		AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%'))
+		AND a.STATUS in ('2','4')
+		AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%') or a.DISPATCH_ITEM like concat('%','失业','%'))
 		<if test="tDispatchInfo != null">
 			<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
 				AND a.SOCIAL_HOUSEHOLD_NAME = #{tDispatchInfo.socialHouseholdName}
@@ -1822,9 +1902,12 @@
 			<if test="tDispatchInfo.disMonth != null and tDispatchInfo.disMonth.trim() != ''">
 				AND replace(DATE_FORMAT(a.CREATE_TIME,"%Y-%m"),'-','') = #{tDispatchInfo.disMonth}
 			</if>
-			<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus.trim() != ''">
+			<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus.trim() != '' and tDispatchInfo.socialHandleStatus != 1">
 				AND a.SOCIAL_HANDLE_STATUS = #{tDispatchInfo.socialHandleStatus}
 			</if>
+			<if test="tDispatchInfo.socialHandleStatus != null and tDispatchInfo.socialHandleStatus.trim() != '' and tDispatchInfo.socialHandleStatus == 1">
+				AND a.SOCIAL_HANDLE_STATUS in ('1','3')
+			</if>
 			<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
 				${tDispatchInfo.authSql}
 			</if>