Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java

@@ -19,6 +19,7 @@ public class EmployeeConstants {
 	public static final String CONTACT_ADDRESS = "通信地址必填！";
 	public static final String EMP_NATRUE_ZERO = "派遣";
 	public static final String EMP_NATRUE_ONE = "外包";
+	public static final String EMP_NATRUE_THREE = "内部员工";
 	public static final String HIGN_EDUCATION = "最高学历必填";
 	public static final String SCHOOL = "学校必填";
 	public static final String MAJOR = "专业必填";

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

@@ -238,8 +238,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		// 获取所有未审核通过的合同数据
 		List<TEmployeeContractInfo> notAccessList = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.and(obj->obj.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ZERO_STRING)
-						.or().eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_STRING)
-						.or().eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.THREE_STRING))
+						.or().eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_STRING))
 				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getWorkFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING));
@@ -294,7 +293,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 					&& project.getProjectStatus().intValue()== CommonConstants.ONE_INT)
 					|| (
 					!CommonConstants.ZERO_STRING.equals(project.getEmpNatrue())
-							&& !CommonConstants.ONE_STRING.equals(project.getEmpNatrue()))
+							&& !CommonConstants.ONE_STRING.equals(project.getEmpNatrue())
+							&& !CommonConstants.THREE_STRING.equals(project.getEmpNatrue()))
 					)){
 				return;
 			}

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

@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.check.entity.TCheckIdCard;
 import com.yifu.cloud.plus.v1.check.entity.TCheckMobile;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractAuditMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.*;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
@@ -83,6 +84,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 	private final TEmpEducationService tEmpEducationService;
 	private final TSettleDomainService tSettleDomainService;
 
+	private final TEmployeeContractAuditMapper contractAuditMapper;
+
 	private final TEmployeeContractInfoService contractServicer;
 
 
@@ -791,7 +794,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			errorMsgMap.put(lineNum, new ErrorMessage("员工类型必填！"));
 		} else if (EmployeeConstants.EMP_NATRUE_ZERO.equals(employeeInfo.getEmpNatrue())
 				|| EmployeeConstants.EMP_NATRUE_ONE.equals(employeeInfo.getEmpNatrue())
-				|| CommonConstants.THREE_STRING.equals(employeeInfo.getEmpNatrue())) {
+				|| EmployeeConstants.EMP_NATRUE_THREE.equals(employeeInfo.getEmpNatrue())) {
 			// 2.员工类型为外包和派遣和内部员工，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
 			if (Common.isEmpty(employeeInfo.getValidityStart())) {
 				errorMsg.add(EmployeeConstants.VALIDITY_START);
@@ -2156,6 +2159,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							c.setAuditStatus(CommonConstants.TWO_INT);
 							c.setInUse(CommonConstants.ZERO_STRING);
 							c.setAuditTimeLast(LocalDateTime.now());
+							TEmployeeContractAudit contractAudit = new TEmployeeContractAudit();
+							contractAudit.setAuditStatus("审核通过");
+							contractAudit.setRemark("派单审核通过,同步审核通过合同");
+							contractAudit.setLinkId(c.getId());
+							contractAudit.setLinkType(CommonConstants.ONE_INT);
+							contractAudit.setRootName("合同审核-派单审核通过");
+							contractAuditMapper.insert(contractAudit);
 							contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId());
 						//审核不同
 						}else if (CommonConstants.ONE_STRING.equals(vo.getType())){

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

@@ -116,7 +116,7 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证所在地")
 	private String idCardAddress;
 
-	@ExcelAttribute(name = "档案-省")
+	@ExcelAttribute(name = "档案-省", isArea = true)
 	@Schema(description = "档案-省")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("档案-省")

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

@@ -1221,6 +1221,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				temp.append(DispatchConstants.DISPATCH_FUND);
 			}
 		}
+		if (Common.isNotNull(temp.toString())){
+			temp.deleteCharAt(temp.length()-1);
+		}
 		dispatch.setDispatchItem(temp.toString());
 	}
 
@@ -3079,7 +3082,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				StringBuilder temp = new StringBuilder();
 				// 预估库同步社保还是公积金的标志，0：全部；1仅社保；2仅公积金
 				int forecastFlag = CommonConstants.ZERO_INT;
+				// auditFlag 表示社保办理无办理项是不保存
+				boolean auditFlag = true;
 				for (TDispatchInfo dis : disList) {
+					auditFlag = true;
 					if (CommonConstants.ZERO_STRING.equals(typeSub)) {
 						forecastFlag = CommonConstants.ONE_INT;
 					} else if (CommonConstants.ONE_STRING.equals(typeSub)) {
@@ -3129,21 +3135,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
-								auditInfo.setType(CommonConstants.ONE_STRING);
-								if (CommonConstants.ZERO_INT == flag) {
-									temp.setLength(CommonConstants.ZERO_INT);
-									temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
-									temp.append(Common.isNullToString(socialTypeRemark));
-									temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
-									initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString(), remark);
-								} else {
-									temp.setLength(CommonConstants.ZERO_INT);
-									temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
-									temp.append(Common.isNullToString(socialTypeRemark));
-									temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
-									initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString(), remark);
+								auditFlag = Common.isNotNull(Common.isNullToString(socialTypeRemark));
+								if (auditFlag){
+									auditInfo.setType(CommonConstants.ONE_STRING);
+									if (CommonConstants.ZERO_INT == flag) {
+										temp.setLength(CommonConstants.ZERO_INT);
+										temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
+										temp.append(Common.isNullToString(socialTypeRemark));
+										temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
+										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString(), remark);
+									} else {
+										temp.setLength(CommonConstants.ZERO_INT);
+										temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
+										temp.append(Common.isNullToString(socialTypeRemark));
+										temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
+										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString(), remark);
+									}
+									auditInfo.setSocialId(dis.getId());
 								}
-								auditInfo.setSocialId(dis.getId());
 							} else {
 								errorList.add(new ErrorMessage(-1, "找不到对应员工社保派增派单数据：" + dis.getEmpName()));
 								continue;
@@ -3362,7 +3371,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						//新增办理记录信息
 						auditInfo.setDispatchInfoId(dis.getId());
 						auditInfo.setEmpIdcard(dis.getEmpIdcard());
-						auditInfoMapper.insert(auditInfo);
+						if (auditFlag){
+							auditInfoMapper.insert(auditInfo);
+						}
 						baseMapper.updateById(dis);
 						socialFundMapper.updateById(sf);
 						//1.派增办理失败 刷新预估数据

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

@@ -256,6 +256,9 @@
 		<result property="fundSum" column="FUND_SUM"/>
 
 		<result property="trustRemark" column="TRUST_REMARK"/>
+		<result property="empNational" column="EMP_NATIONAL"/>
+		<result property="empRegisType" column="EMP_REGIS_TYPE"/>
+
 	</resultMap>
 	<sql id="Base_Column_List">
 				a.ID,
@@ -1035,7 +1038,9 @@
 			a.UNEMPLOY_HANDLE,
 			a.WORK_INJURY_HANDLE,
 			a.BIRTH_HANDLE,
-			a.BIGAILMENT_HANDLE
+			a.BIGAILMENT_HANDLE,
+		    d.EMP_NATIONAL,
+		    d.EMP_REGIS_TYPE
 		from t_social_fund_info a
 		left join t_dispatch_info d on a.DISPATCH_ID=d.ID
 		<where>