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

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

@@ -472,10 +472,19 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 	@Override
 	public R<Boolean> updateProjectServerTeam(List<TSettleDomainUpServerTeamVo> list) {
 		TSettleDomain domain;
+		TSettleDomain tSettleDomainInfo;
 		for (TSettleDomainUpServerTeamVo vo:list) {
 			domain = new TSettleDomain();
 			BeanUtil.copyProperties(vo,domain);
-			initServerTeamPermission(domain);
+			tSettleDomainInfo = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
+					.eq(TSettleDomain::getDepartNo,domain.getDepartNo())
+					.orderByDesc(BaseEntity::getCreateTime)
+					.last(CommonConstants.LAST_ONE_SQL));
+			if (Common.isNotNull(tSettleDomainInfo)){
+				domain.setDepartName(tSettleDomainInfo.getDepartName());
+				domain.setId(tSettleDomainInfo.getId());
+				initServerTeamPermission(domain);
+			}
 		}
 		return R.ok(Boolean.TRUE,CommonConstants.RESULT_DATA_SUCESS);
 	}

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java

@@ -521,11 +521,17 @@ public interface ErrorCodes {
 	 * 派增异常： 失败项重新派单缴纳方式不可变更
 	 */
 	String EMP_DISPATCH_SOCIAL_PAYMENT_TYPE_NOT_SAME = "emp.dispatch.social.payment.type.same";
-
+	/**
+	 * 社保户不能为空
+	**/
 	String SOCIAL_HOLD_IS_EMPTY = "social.hold.is.empty";
-
+	/**
+	 * 公积金户不能为空
+	 **/
 	String FUND_HOLD_IS_EMPTY = "fund.hold.is.empty";
-
+	/**
+	 * 信息校验通过，但其他行存在问题数据，请调整后，统一减档
+	 **/
 	String ARCHIVES_IMPORT_EMP_TRUE = "archives.import.emp.true";
 
 	/**

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

@@ -1049,7 +1049,7 @@
 			/*社保代办理 1.派单审核通过 2.派增(type=0)：待办理(social_handle_status='0')  or 派减(type=1)：已办理完成或部分办理失败 且已派减*/
 			AND a.social_id is not null
 			AND a.STATUS = "2"
-			and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1'  AND s.HANDLE_STATUS in ('1','5')  and s.REDUCE_CAN = '1'))
+			and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1'  AND s.HANDLE_STATUS in ('1','5','6','3','7')  and s.REDUCE_CAN = '1'))
 			and a.SOCIAL_HANDLE_STATUS in ('0','4')
 
 			<!--<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">