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

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

@@ -251,6 +251,11 @@ public class EmployeeContractExportVO implements Serializable {
 	@ExcelProperty("创建人")
 	private String createName;
 
+	@ExcelAttribute(name = "审核人")
+	@ExcelProperty("审核人")
+	@Schema(description = "审核人")
+	private String auditUserName;
+
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("创建时间")

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -769,6 +769,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								.eq(TEmployeeContractInfo::getSettleDomain, contractInfo.getSettleDomain())
 								.and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
 										.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
+								.ne(TEmployeeContractInfo::getId, contractInfo.getId())
 								.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
 						if (Common.isNotNull(contractInfoListZt)) {
 							for (TEmployeeContractInfo contractInfo1:contractInfoListZt) {
@@ -1439,17 +1440,28 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						contractInfo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
 						list = baseMapper.getTEmployeeContractExport(contractInfo);
 						if (Common.isNotNull(list)) {
-							for(EmployeeContractExportVO ll:list){
-								if(ll.getAuditStatus().contains("审核不通过")) {
-									if (null != ll.getRemark()) {
-										String[] a = ll.getRemark().split(":");
-										for(int t=CommonConstants.ZERO_INT;t<a.length;t++){
-											if(t==CommonConstants.ONE_INT) {
-												ll.setNoPassReason(a[CommonConstants.ZERO_INT]);
-												ll.setRemark(a[CommonConstants.ONE_INT]);
+							for (EmployeeContractExportVO ll : list) {
+								if (ll.getRemark() != null) {
+									if (!ll.getRemark().contains("派增审核")) {
+										if (ll.getAuditStatus().contains("审核不通过") && null != ll.getRemark()) {
+											if (ll.getRemark().contains(":")) {
+												String a = ll.getRemark().substring(0, ll.getRemark().indexOf(":", 1));
+												String b = ll.getRemark().substring(ll.getRemark().indexOf(":", 1) + 1);
+												ll.setNoPassReason(a);
+												ll.setRemark(b);
 											}
 										}
 									}
+									if (ll.getRemark().contains("派增审核")) {
+										if (ll.getRemark().contains("-")) {
+											String c = ll.getRemark().substring(0, ll.getRemark().indexOf("-", 1));
+											String d = ll.getRemark().substring(ll.getRemark().indexOf("-", 1) + 1);
+											ll.setNoPassReason(c);
+											ll.setRemark(d);
+										}
+									}
+
+
 								}
 							}
 							writeSheet = EasyExcel.writerSheet("员工合同" + index).build();
@@ -1698,6 +1710,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						if (Common.isNotNull(contractInfoList)) {
 							for (TEmployeeContractInfo contractInfo1 : contractInfoList) {
 								contractInfo1.setInUse(CommonConstants.ONE_STRING);
+								contractInfo1.setAuditUserName(user.getNickname());
 								baseMapper.updateById(contractInfo1);
 								//增加审核记录
 								this.setAuditInfoNew(contractInfo1);
@@ -1709,10 +1722,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								.eq(TEmployeeContractInfo::getSettleDomain, contract.getSettleDomain())
 								.and(obj -> obj.eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ONE_INT)
 										.or().eq(TEmployeeContractInfo::getAuditStatus, CommonConstants.ZERO_INT))
+								.ne(TEmployeeContractInfo::getId, contract.getId())
 								.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT));
 						if (Common.isNotNull(contractInfoListZt)) {
 							for (TEmployeeContractInfo contractInfo1 : contractInfoListZt) {
 								contractInfo1.setAuditStatus(CommonConstants.THREE_INT);
+								contractInfo1.setAuditUserName(user.getNickname());
 								baseMapper.updateById(contractInfo1);
 								//增加审核记录
 								this.setAuditInfoNew(contractInfo1);

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

@@ -213,6 +213,7 @@
 		a.EMP_NO,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
+		a.AUDIT_USER_NAME,
 		a.CONTRACT_START,
 		a.CONTRACT_END,
 		a.FILE_PROVINCE,
@@ -456,10 +457,8 @@
 		SELECT
 		count(1)
 		FROM t_employee_contract_info a
-		join t_employee_contract_audit b on a.ID=b.LINK_ID
 		<where>
 			a.DELETE_FLAG = 0
-			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}
@@ -476,6 +475,7 @@
 		a.EMP_IDCARD,
 		a.CONTRACT_START,
 		a.CONTRACT_END,
+		a.AUDIT_USER_NAME,
 		a1.AREA_NAME as "FILE_PROVINCE",
 		a2.AREA_NAME as "FILE_CITY",
 		a3.AREA_NAME as "FILE_TOWN",
@@ -515,10 +515,9 @@
 		LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
 		LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
 		LEFT JOIN sys_area a3 on a3.id=a.FILE_TOWN
-		  join t_employee_contract_audit b on a.ID=b.LINK_ID
+		left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID
 		<where>
 			a.DELETE_FLAG = 0
-			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java

@@ -117,6 +117,114 @@ public class SysBaseSetInfo extends BaseEntity {
 	@ExcelProperty("基数下限（社保或公积金）")
 	private BigDecimal lowerLimit;
 
+	/**
+	 * 养老基数上限
+	 */
+	@ExcelAttribute(name = "养老基数上限")
+	@Schema(description = "养老基数上限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老基数上限")
+	private BigDecimal upPersion;
+
+	/**
+	 * 医疗基数上限
+	 */
+	@ExcelAttribute(name = "医疗基数上限")
+	@Schema(description = "医疗基数上限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗基数上限")
+	private BigDecimal upMedical;
+
+	/**
+	 * 失业基数上限
+	 */
+	@ExcelAttribute(name = "失业基数上限")
+	@Schema(description = "失业基数上限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业基数上限")
+	private BigDecimal upUnemployment;
+
+	/**
+	 * 工伤基数上限
+	 */
+	@ExcelAttribute(name = "工伤基数上限")
+	@Schema(description = "工伤基数上限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤基数上限")
+	private BigDecimal upInjury;
+
+	/**
+	 * 生育基数上限
+	 */
+	@ExcelAttribute(name = "生育基数上限")
+	@Schema(description = "生育基数上限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育基数上限")
+	private BigDecimal upBirth;
+
+	/**
+	 * 大病基数上限
+	 */
+	@ExcelAttribute(name = "大病基数上限")
+	@Schema(description = "大病基数上限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病基数上限")
+	private BigDecimal upBig;
+
+	/**
+	 * 养老基数下限
+	 */
+	@ExcelAttribute(name = "养老基数下限")
+	@Schema(description = "养老基数下限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老基数下限")
+	private BigDecimal lowerPersion;
+
+	/**
+	 * 医疗基数下限
+	 */
+	@ExcelAttribute(name = "医疗基数下限")
+	@Schema(description = "医疗基数下限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗基数下限")
+	private BigDecimal lowerMedical;
+
+	/**
+	 * 失业基数下限
+	 */
+	@ExcelAttribute(name = "失业基数下限")
+	@Schema(description = "失业基数下限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业基数下限")
+	private BigDecimal lowerUnemployment;
+
+	/**
+	 * 工伤基数下限
+	 */
+	@ExcelAttribute(name = "工伤基数下限")
+	@Schema(description = "工伤基数下限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤基数下限")
+	private BigDecimal lowerInjury;
+
+	/**
+	 * 生育基数下限
+	 */
+	@ExcelAttribute(name = "生育基数下限")
+	@Schema(description = "生育基数下限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育基数下限")
+	private BigDecimal lowerBirth;
+
+	/**
+	 * 大病基数下限
+	 */
+	@ExcelAttribute(name = "大病基数下限")
+	@Schema(description = "大病基数下限")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病基数下限")
+	private BigDecimal lowerBig;
+
 	/**
 	 * 补缴政策（社保或公积金）
 	 */

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

@@ -146,6 +146,16 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	@ExcelProperty("档案-县" )
 	private String fileTown;
 
+
+	/**
+	 * 通信地址
+	 */
+
+	@Schema(description = "通信地址" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("通信地址" )
+	private String contactAddress;
+
 	/**
 	 * 就职班组
 	 */
@@ -217,6 +227,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 业务细分 personnel_type_sub
 	 */
+	@ExcelProperty("业务细分" )
 	@ExcelAttribute(name = "业务细分", maxLength = 32)
 	@Schema(description = "业务细分", name = "contractName")
 	private String contractSubName;
@@ -228,6 +239,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 */
 	@NotBlank(message = "签订期限不能为空")
 	@Length(max = 32, message = "签订期限不能超过32个字符")
+	@ExcelProperty("签订期限" )
 	@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE)
 	@Schema(description = "签订期限", name = "contractType")
 	private String contractType;
@@ -489,14 +501,6 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	private String dispatchId;
 
 
-	/**
-	 * 通信地址
-	 */
-
-	@Schema(description = "通信地址" )
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("通信地址" )
-	private String contactAddress;
 
 	/**
 	 * 订单ID

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

@@ -81,6 +81,18 @@
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="updateTime" column="UPDATE_TIME"/>
+		<result property="upPersion" column="UP_PERSION"/>
+		<result property="upMedical" column="UP_MEDICAL"/>
+		<result property="upUnemployment" column="UP_UNEMPLOYMENT"/>
+		<result property="upInjury" column="UP_INJURY"/>
+		<result property="upBirth" column="UP_BIRTH"/>
+		<result property="upBig" column="UP_BIG"/>
+		<result property="lowerPersion" column="LOWER_PERSION"/>
+		<result property="lowerMedical" column="LOWER_MEDICAL"/>
+		<result property="lowerUnemployment" column="LOWER_UNEMPLOYMENT"/>
+		<result property="lowerInjury" column="LOWER_INJURY"/>
+		<result property="lowerBirth" column="LOWER_BIRTH"/>
+		<result property="lowerBig" column="LOWER_BIG"/>
 		<collection property="fundProList" ofType="com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion"
 					select="com.yifu.cloud.plus.v1.yifu.social.mapper.SysPayProportionMapper.selectByPrimaryId" column="id">
 		</collection>
@@ -142,7 +154,19 @@
 		a.UPDATE_BY,
 		a.CREATE_NAME,
 		a.CREATE_TIME,
-		a.UPDATE_TIME
+		a.UPDATE_TIME,
+		UP_PERSION,
+		UP_MEDICAL,
+		UP_UNEMPLOYMENT,
+		UP_INJURY,
+		UP_BIRTH,
+		UP_BIG,
+		LOWER_PERSION,
+		LOWER_MEDICAL,
+		LOWER_UNEMPLOYMENT,
+		LOWER_INJURY,
+		LOWER_BIRTH,
+		LOWER_BIG
 	</sql>
 	<sql id="sysBaseSetInfo_where">
 		<if test="sysBaseSetInfo != null">

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

@@ -1161,7 +1161,7 @@
 		a.PROVIDENT_HOUSEHOLD_NAME,
 		f.PROVIDENT_START,
 		f.UNIT_PROVIDENG_CARDINAL,
-		f.FUND_REDUCE_DATE,
+		a.FUND_REDUCE_DATE,
 		f.PERSONAL_PROVIDENT_CARDINAL,
 		f.UNIT_PROVIDENT_PER,
 		f.PERSONAL_PROVIDENT_PER,