Merge branch 'develop' into feature-licancan

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java

@@ -44,7 +44,20 @@ import java.util.Set;
 public class EmployeeContractExportVO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
-
+	/**
+	 * @Author fxj
+	 * @Description 0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
+	 * 1、增加“审核类型”，内容为：派增-社保派单、派增-无社保新签、派增-续签、派减-作废、派减-终止
+	 * 2、社保派单过来的合同，审核类型统一为：派增-社保派单；
+	 * 3、合同申请处申请类型为：新签（正常签订）——审核类型为：派增-无社保新签、；续签（合同未到期重新签订、离职再入职、商务合同更改）——审核类型统一为：派增-续签；
+	 * 3、合同申请处申请类型为：作废——审核类型统一为：派减-作废；终止——审核类型统一为：派减-终止；
+	 * @Date 14:50 2022/11/7
+	 **/
+	@ExcelAttribute(name = "审核类型",readConverterExp = "0=派增-社保派单,1=派增-无社保新签,2=派增-续签,3=派减-作废,4=派减-终止")
+	@Schema(description = "审核类型")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("审核类型")
+	private String type;
 	@Schema(description = "申请编号")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("申请编号")

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -135,6 +135,7 @@
 		<result property="startDate" column="START_DATE"/>
 		<result property="endDate" column="END_DATE"/>
 		<result property="history" column="HISTORY"/>
+		<result property="type" column="TYPE"/>
 
 	</resultMap>
 
@@ -448,7 +449,7 @@
 	<!--导出-->
 	<select id="getTEmployeeContractExport" resultMap="tEmployeeContrctInfoExportMap">
 		SELECT
-			<include refid="Base_Export_Column_List"/>
+			<include refid="Base_Export_Column_List"/>,a.type
 		FROM t_employee_contract_info a
 		<where>
 			a.DELETE_FLAG = 0

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

@@ -1866,7 +1866,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		project.setCreateBy(user.getId());
 		project.setCreateName(user.getNickname());
 		project.setDeptNo(excel.getSettleDomainCode());
-		project.setContractType(excel.getContractType());
+		project.setContractType(excel.getContractName());
 		project.setEmpIdcard(excel.getEmpIdcard());
 		project.setEmpName(excel.getEmpName());
 		project.setEmpNatrue(excel.getEmpType());

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

@@ -269,7 +269,7 @@
 				AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
 			</if>
 			<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
-				AND a.SOCIAL_HOUSEHOLD like CONCAT(#{tPaymentInfo.socialHousehold},'%')
+				AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
 			</if>
 			<if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''">
 				AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
@@ -293,7 +293,7 @@
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
 			</if>
 			<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
-				AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
+				AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
 			</if>
 			<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
 				AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
@@ -492,7 +492,7 @@
 				AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
 			</if>
 			<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
-				AND a.SOCIAL_HOUSEHOLD like CONCAT(#{tPaymentInfo.socialHousehold},'%')
+				AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
 			</if>
 			<if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''">
 				AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
@@ -507,7 +507,7 @@
 				AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
 			</if>
 			<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
-				AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
+				AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
 			</if>
 			<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
 				AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
@@ -522,10 +522,10 @@
 				AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
 			</if>
 			<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
-				AND a.SOCIAL_PROVINCE = #{tPaymentInfo.socialProvince}
+				AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
 			</if>
 			<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
-				AND a.SOCIAL_CITY = #{tPaymentInfo.socialCity}
+				AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
 			</if>
 			<if test="tPaymentInfo.socialTown == null">
 				<if test="tPaymentInfo.socialCity != null">
@@ -675,7 +675,7 @@
 		w.SETTLE_DOMAIN_CODE,
 		w.SETTLE_DOMAIN_NAME,
 		w.SOCIAL_HOUSEHOLD,
-		w.SOCIAL_SECURITY_NO,
+		MAX( w.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
 		w.SOCIAL_PAY_ADDR,
 		w.SOCIAL_PAY_MONTH,
 		w.SOCIAL_CREATE_MONTH,
@@ -732,7 +732,7 @@
 		a.SETTLE_DOMAIN_CODE,
 		a.SETTLE_DOMAIN_NAME,
 		a.SOCIAL_HOUSEHOLD,
-		a.SOCIAL_SECURITY_NO,
+		MAX( a.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
 		a.SOCIAL_PAY_ADDR,
 		a.SOCIAL_PAY_MONTH,
 		a.SOCIAL_CREATE_MONTH,