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

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

@@ -416,12 +416,6 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 					&& vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT){
 				return R.failed("人员在原项目中存在在途的公积金，请先终止后，再进行划转");
 			}
-			if (vo.getChangeItems().indexOf(CommonConstants.ONE_STRING) >= CommonConstants.ZERO_INT) {
-				if (Common.isEmpty(newEmpProject.getSocialStatus())
-						|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus()) {
-
-				}
-			}
 			TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
 					.eq(TSettleDomain::getDepartNo, vo.getNewDeptNo())
 					.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
@@ -480,7 +474,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				if (Common.isEmpty(oldEmpProject.getSocialStatus())
 						|| CommonConstants.ZERO_INT == oldEmpProject.getSocialStatus()){
 					resStr.append("社保项不存在，无法划转! <br>");
-				}
+				}else {
 					if (Common.isEmpty(newEmpProject.getSocialStatus())
 							|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus()){
 						newEmpProject.setSocialStatus(oldEmpProject.getSocialStatus());
@@ -498,12 +492,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 						resStr.append("目标项目档案存在社保数据，社保划转失败! <br>");
 					}
 				}
+			}
 			// 处理公积金 如果目标项目档案已存在公积金 不划转
 			if (vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT) {
 				if (Common.isEmpty(oldEmpProject.getFundStatus())
 						|| CommonConstants.ZERO_INT == oldEmpProject.getFundStatus()){
 					resStr.append("公积金项不存在，无法划转! <br>");
-				}
+				}else{
 					if (Common.isEmpty(newEmpProject.getFundStatus())
 							|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus()){
 						newEmpProject.setFundStatus(oldEmpProject.getFundStatus());
@@ -515,12 +510,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 						resStr.append("目标项目档案存在公积金数据，公积金划转失败! <br>");
 					}
 				}
+			}
 			// 处理員工合同  目标 已有合同状态 不在处理合同划转
 			if (vo.getChangeItems().indexOf(CommonConstants.ZERO_STRING) >= CommonConstants.ZERO_INT){
 				if (Common.isEmpty(oldEmpProject.getContractStatus())
 						|| CommonConstants.ZERO_INT == oldEmpProject.getContractStatus()){
 					resStr.append("员工合同不存在，无法划转! <br>");
-				}
+				}else {
 					if (Common.isEmpty(newEmpProject.getContractStatus())
 							|| CommonConstants.ZERO_INT == newEmpProject.getContractStatus()){
 						newEmpProject.setContractStatus(oldEmpProject.getContractStatus());
@@ -533,6 +529,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 						resStr.append("目标项目档案存在员工合同数据，员工合同划转失败! <br>");
 					}
 				}
+			}
 			// 变更老的项目档案
 			tEmployeeProjectService.updateChangeById(oldEmpProject);
 			//新增或变更新的项目档案

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

@@ -1231,7 +1231,7 @@
 		SUM( w.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
 		FROM (
 		(SELECT
-		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH ) AS keyGroup,
+		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
@@ -1285,7 +1285,7 @@
 		)
 		union all
 		(SELECT
-		CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH ) AS keyGroup,
+		CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
@@ -1338,6 +1338,10 @@
 		GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
 		)
 		) w
+		<where>
+			1 = 1
+			<include refid="tPaymentInfo_export_socialFund_where"/>
+		</where>
 		GROUP BY w.keyGroup
 	</select>