MVP1.6.6-预入职相关_校验服务的忽略权限

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

@@ -125,4 +125,16 @@ public class SocialSoldierYgsAddVo implements Serializable {
 	private Date graduationTime;
 	@ExcelProperty(value = "首次至缴纳地时间")
 	private Date firstPayTime;
+
+	// 是否自动提交【社保减员&增员&批量减员&批量增员】	是否自动补充信息【社保增员】	是否上传附件材料【社保减员&增员&批量减员&批量增员】	提示已缴费是否继续申报【社保增员】	是否尝试单条操作【社保批量减员】
+	@ExcelProperty("是否自动提交【社保减员&增员&批量减员&批量增员】")
+	private String isAutoSubmit;
+	@ExcelProperty("是否自动补充信息【社保增员】")
+	private String isAutoInsert;
+	@ExcelProperty("是否上传附件材料【社保减员&增员&批量减员&批量增员】")
+	private String isAutoUpload;
+	@ExcelProperty("提示已缴费是否继续申报【社保增员】")
+	private String isDoShenBao;
+	@ExcelProperty("是否尝试单条操作【社保批量减员】")
+	private String isDanShenBao;
 }

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

+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author hgw
+ * @Description 社保士兵医生大增加模板
+ * @Date 2024-6-28 10:19:34
+ **/
+@Data
+public class SocialSoldierYsdAddVo implements Serializable {
+
+	// 社保id，用于回写
+	@ExcelIgnore
+	private String socialId;
+
+	@ExcelProperty("派单类型")
+	private String type;
+	@ExcelProperty("社保办理状态")
+	private String socialHandleStatus;
+	@ExcelProperty("养老状态")
+	private String pensionHandle;
+	@ExcelProperty("医疗状态")
+	private String medicalHandle;
+	@ExcelProperty("失业状态")
+	private String unemployHandle;
+	@ExcelProperty("工伤状态")
+	private String workInjuryHandle;
+	@ExcelProperty("生育状态")
+	private String birthHandle;
+	@ExcelProperty("大病状态")
+	private String bigailmentHandle;
+	@ExcelProperty("员工姓名")
+	private String empName;
+	@ExcelProperty("员工身份证")
+	private String empIdcard;
+	@ExcelProperty("学历")
+	private String educationName;
+	@ExcelProperty("客户名称")
+	private String belongUnit;
+	@ExcelProperty("项目名称")
+	private String settleDomain;
+	@ExcelProperty("员工类型")
+	private String empType;
+	@ExcelProperty("岗位")
+	private String post;
+	@ExcelProperty("手机号码")
+	private String empMobile;
+	@ExcelProperty("身份证所在地")
+	private String idCardAddress;
+	@ExcelProperty("通信地址")
+	private String contactAddress;
+	@ExcelProperty("户口性质")
+	private String empRegisType;
+	@ExcelProperty("民族")
+	private String empNational;
+	@ExcelProperty("工时制")
+	private String workingHours;
+	@ExcelProperty("合同年限")
+	private String contractTerm;
+	@ExcelProperty("合同起始时间")
+	private String contractStart;
+	@ExcelProperty("合同到期时间")
+	private String contractEnd;
+	@ExcelProperty("申请人")
+	private String createUserName;
+	@ExcelProperty("备案基数")
+	private String recordBase;
+	@ExcelProperty("缴纳类型")
+	private String paymentType;
+	@ExcelProperty("社保户")
+	private String socialHouseholdName;
+	@ExcelProperty("社保缴纳地-省")
+	private String socialProvince;
+	@ExcelProperty("社保缴纳地-市")
+	private String socialCity;
+	@ExcelProperty("社保缴纳地-县")
+	private String socialTown;
+	@ExcelProperty("养老起缴日期")
+	private String pensionStart;
+	;
+	@ExcelProperty("养老基数")
+	private BigDecimal unitPensionCardinal;
+	@ExcelProperty("医疗起缴日期")
+	private String medicalStart;
+	@ExcelProperty("医疗基数")
+	private BigDecimal unitMedicalCardinal;
+	@ExcelProperty("失业起缴日期")
+	private String unemployStart;
+	@ExcelProperty("失业基数")
+	private BigDecimal unitUnemploymentCardinal;
+	@ExcelProperty("工伤起缴日期")
+	private String workInjuryStart;
+	@ExcelProperty("工伤基数")
+	private BigDecimal unitWorkInjuryCardinal;
+	@ExcelProperty("生育起缴日期")
+	private String birthStart;
+	@ExcelProperty("生育基数")
+	private BigDecimal unitBirthCardinal;
+	@ExcelProperty("大病起缴日期")
+	private String bigailmentStart;
+	@ExcelProperty("大病缴纳基数")
+	private BigDecimal unitBigailmentCardinal;
+	@ExcelProperty("单位大病金额")
+	private BigDecimal unitBigailmentMoney;
+	@ExcelProperty("个人大病金额")
+	private BigDecimal personalBigailmentMoney;
+	@ExcelProperty("委托备注")
+	private String socailTrustRemark;
+	@ExcelProperty("减少原因")
+	private String reduceReason;
+	@ExcelProperty("是否已导出")
+	private String exportSocialFlag;
+	@ExcelProperty(value = "学校")
+	private String schoolName;
+	@ExcelProperty(value = "专业")
+	private String major;
+	@ExcelProperty("毕业时间")
+	private Date graduationTime;
+	@ExcelProperty(value = "首次至缴纳地时间")
+	private Date firstPayTime;
+
+	// 是否批量操作【医保减员&医保增员】	是否自动顺延月份申报【医保增员】	是否只新增【医保增员】	是否只续保【医保增员】
+	@ExcelProperty("是否批量操作【医保减员&医保增员】")
+	private String isBatch;
+	@ExcelProperty("是否自动顺延月份申报【医保增员】")
+	private String isAutoMonth;
+	@ExcelProperty("是否只新增【医保增员】")
+	private String isAdd;
+	@ExcelProperty("是否只续保【医保增员】")
+	private String isXu;
+}

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

@@ -42,23 +42,23 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
 	 **/
 	List<SocialSoldierYgsAddVo> getSocialSoldierYgsAddVoList(@Param("idsStr") List<String> idsStr);
 	/**
-	 * 社保士兵养工失增加模板
+	 * 社保士兵养工失减少模板
 	 * @Author hgw
 	 * @Date 2024-5-10 21:16:41
 	 **/
 	List<SocialSoldierYgsAddVo> getSocialSoldierYgsReduceVoList(@Param("idsStr") List<String> idsStr);
 	/**
-	 * 社保士兵养工失增加模板
+	 * 社保士兵医生大增加模板
 	 * @Author hgw
 	 * @Date 2024-5-10 21:16:41
 	 **/
-	List<SocialSoldierYgsAddVo> getSocialSoldierYsdAddVoList(@Param("idsStr") List<String> idsStr);
+	List<SocialSoldierYsdAddVo> getSocialSoldierYsdAddVoList(@Param("idsStr") List<String> idsStr);
 	/**
-	 * 社保士兵养工失增加模板
+	 * 社保士兵医生大减少模板
 	 * @Author hgw
 	 * @Date 2024-5-10 21:16:41
 	 **/
-	List<SocialSoldierYgsAddVo> getSocialSoldierYsdReduceVoList(@Param("idsStr") List<String> idsStr);
+	List<SocialSoldierYsdAddVo> getSocialSoldierYsdReduceVoList(@Param("idsStr") List<String> idsStr);
 
 	/**
 	 * 社保士兵养工失审核模板

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

@@ -105,24 +105,30 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 	 * @Date: 2024/5/23 17:59
 	 * @return: org.springframework.web.multipart.MultipartFile
 	 **/
-	public MultipartFile getFile(List<SocialSoldierYgsAddVo> list, int type) {
+	public MultipartFile getFileYgs(List<SocialSoldierYgsAddVo> list) {
 		if (list != null) {
-			String fileName = "soldierFile" + DateUtil.getThisTime() + new Date().getTime() + CommonConstants.XLSX;
-
+			String fileName = "soldierFileYgs" + DateUtil.getThisTime() + new Date().getTime() + CommonConstants.XLSX;
 			ExcelWriter excelWriter = EasyExcelFactory.write(fileName).build();
 			WriteSheet writeSheet = EasyExcelFactory.writerSheet("社保明细").head(SocialSoldierYgsAddVo.class).build();
 			excelWriter.write(list, writeSheet);
-			if (type == 2) {
-				List<SocialSoldierSetVo> setList = new ArrayList<>();
-				SocialSoldierSetVo vo = new SocialSoldierSetVo();
-				vo.setIsAutoSubmit("是");
-				vo.setIsAutoInsert("否");
-				vo.setIsAutoUpload("否");
-				vo.setIsDoShenBao("否");
-				setList.add(vo);
-				WriteSheet writeSheet2 = EasyExcelFactory.writerSheet("功能设置").head(SocialSoldierSetVo.class).build();
-				excelWriter.write(setList, writeSheet2);
+			File file = new File(fileName);
+			excelWriter.finish();
+			return getMultipartFile(file);
+		}
+		return null;
 	}
+	/**
+	 * @Description: 组装社保与医保的文件流
+	 * @Author: hgw
+	 * @Date: 2024/5/23 17:59
+	 * @return: org.springframework.web.multipart.MultipartFile
+	 **/
+	public MultipartFile getFileYsd(List<SocialSoldierYsdAddVo> list) {
+		if (list != null) {
+			String fileName = "soldierFileYsd" + DateUtil.getThisTime() + new Date().getTime() + CommonConstants.XLSX;
+			ExcelWriter excelWriter = EasyExcelFactory.write(fileName).build();
+			WriteSheet writeSheet = EasyExcelFactory.writerSheet("医保明细").head(SocialSoldierYsdAddVo.class).build();
+			excelWriter.write(list, writeSheet);
 			File file = new File(fileName);
 			excelWriter.finish();
 			return getMultipartFile(file);
@@ -169,7 +175,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 				socialInfo.setId(vo.getSocialId());
 				socialIdList.add(socialInfo);
 			}
-			MultipartFile file = this.getFile(ygsAddlist, 1);
+			MultipartFile file = this.getFileYgs(ygsAddlist);
 			if (Common.isNotNull(file)) {
 				this.getOneAppGetModuleDetail(socialIdList, file, "社保增员");
 			}
@@ -184,37 +190,37 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
 				socialInfo.setId(vo.getSocialId());
 				socialIdList.add(socialInfo);
 			}
-			MultipartFile file = this.getFile(ygsReducelist, 2);
+			MultipartFile file = this.getFileYgs(ygsReducelist);
 			if (Common.isNotNull(file)) {
 				this.getOneAppGetModuleDetail(socialIdList, file, "社保减员");
 			}
 		}
 		// 医生大新增列表
-		List<SocialSoldierYgsAddVo> ysdAddlist = baseMapper.getSocialSoldierYsdAddVoList(dispatchIdList);
+		List<SocialSoldierYsdAddVo> ysdAddlist = baseMapper.getSocialSoldierYsdAddVoList(dispatchIdList);
 		if (ysdAddlist != null && !ysdAddlist.isEmpty()) {
 			List<TSocialInfo> socialIdList = new ArrayList<>();
 			TSocialInfo socialInfo;
-			for (SocialSoldierYgsAddVo vo : ysdAddlist) {
+			for (SocialSoldierYsdAddVo vo : ysdAddlist) {
 				socialInfo = new TSocialInfo();
 				socialInfo.setId(vo.getSocialId());
 				socialIdList.add(socialInfo);
 			}
-			MultipartFile file = this.getFile(ysdAddlist, 3);
+			MultipartFile file = this.getFileYsd(ysdAddlist);
 			if (Common.isNotNull(file)) {
 				this.getOneAppGetModuleDetail(socialIdList, file, "医保增员");
 			}
 		}
 		// 医生大减少列表
-		List<SocialSoldierYgsAddVo> ysdReducelist = baseMapper.getSocialSoldierYsdReduceVoList(dispatchIdList);
+		List<SocialSoldierYsdAddVo> ysdReducelist = baseMapper.getSocialSoldierYsdReduceVoList(dispatchIdList);
 		if (ysdReducelist != null && !ysdReducelist.isEmpty()) {
 			List<TSocialInfo> socialIdList = new ArrayList<>();
 			TSocialInfo socialInfo;
-			for (SocialSoldierYgsAddVo vo : ysdReducelist) {
+			for (SocialSoldierYsdAddVo vo : ysdReducelist) {
 				socialInfo = new TSocialInfo();
 				socialInfo.setId(vo.getSocialId());
 				socialIdList.add(socialInfo);
 			}
-			MultipartFile file = this.getFile(ysdReducelist, 4);
+			MultipartFile file = this.getFileYsd(ysdReducelist);
 			if (Common.isNotNull(file)) {
 				this.getOneAppGetModuleDetail(socialIdList, file, "医保减员");
 			}

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

@@ -24,7 +24,7 @@
 <mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper">
 
 	<!-- 社保士兵基本查询-->
-	<sql id="getSocialSoldierBase" >
+	<sql id="getSocialSoldierBaseOne" >
 		SELECT
 			s.id as socialId,
 			if(a.TYPE='0','派增','派减') type,
@@ -79,6 +79,11 @@
 			a.MAJOR major,
 			a.FIRST_PAY_TIME graduationTime,
 			a.GRADUATION_TIME firstPayTime
+	</sql>
+
+	<!-- 社保士兵基本查询-->
+	<sql id="getSocialSoldierBaseTwo" >
+
 		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
@@ -101,7 +106,9 @@
 
 	<!-- 社保士兵养工失增加模板-->
 	<select id="getSocialSoldierYgsAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
-		<include refid="getSocialSoldierBase"/>
+		<include refid="getSocialSoldierBaseOne"/>
+		,'是' isAutoSubmit,'是' isAutoInsert,'是' isAutoUpload,'是' isDoShenBao,'' isDanShenBao
+		<include refid="getSocialSoldierBaseTwo"/>
 		and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '0' or
@@ -133,7 +140,9 @@
 
 	<!-- 社保士兵养工失减少模板-->
 	<select id="getSocialSoldierYgsReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
-		<include refid="getSocialSoldierBase"/>
+		<include refid="getSocialSoldierBaseOne"/>
+		,'是' isAutoSubmit,'是' isAutoInsert,'是' isAutoUpload,'是' isDoShenBao,'' isDanShenBao
+		<include refid="getSocialSoldierBaseTwo"/>
 		and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '5' or
@@ -145,8 +154,10 @@
 	</select>
 
 	<!-- 社保士兵医生大增加模板-->
-	<select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
-		<include refid="getSocialSoldierBase"/>
+	<select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo">
+		<include refid="getSocialSoldierBaseOne"/>
+		,'' isBatch,'' isAutoMonth,'' isAdd,'' isXu
+		<include refid="getSocialSoldierBaseTwo"/>
 		and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '0' or
@@ -158,8 +169,10 @@
 	</select>
 
 	<!-- 社保士兵医生大减少模板-->
-	<select id="getSocialSoldierYsdReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo">
-		<include refid="getSocialSoldierBase"/>
+	<select id="getSocialSoldierYsdReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo">
+		<include refid="getSocialSoldierBaseOne"/>
+		,'' isBatch,'' isAutoMonth,'' isAdd,'' isXu
+		<include refid="getSocialSoldierBaseTwo"/>
 		and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','2','3')
 		and (
 			if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '5' or