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

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java

@@ -37,9 +37,7 @@ public class MenuUtil {
 
 	public void setAuthSql(YifuUser user, BaseEntity entity) {
 		// 普通用户：
-		log.error("userINfo:"+ user.getUserGroup() +"}"+user.getId() +"|" + entity.getMId());
 		if (user != null && Common.isNotNull(user.getId()) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
-			log.error("userINfo:"+ user.getUserGroup() +"}"+user.getId() +"|" + entity.getMId());
 			// 菜单id
 			String menuId = entity.getMId();
 			if (Common.isEmpty(menuId)) {

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -1786,7 +1786,7 @@
 						)
 					</if>
 				</if>-->
-				<if test="param == null">
+				<if test="param != null">
 					<!--数据权限判断-->
 					or a.CREATE_BY = #{param.createBy}
 					<if test="domains != null">

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

@@ -4066,6 +4066,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				sf.setSocialStatus(CommonConstants.ELEVEN_STRING);
 				sf.setSocialReduceStatus(CommonConstants.FIVE_STRING);
 			}
+			// 有部分办理失败的多次派单 优化，存在办理失败的 更新为 部分办理失败
+			if (CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus()) &&
+					(CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
+					|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
+					|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
+					|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
+					|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
+					|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))){
+				sf.setSocialStatus(CommonConstants.TWELVE_STRING);
+				sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
+			}
 		}
 		// 2.派增处理 socialType  社保拆分的每一项（1养老 2医疗 3失业 4工伤 5生育 6大病）
 		if (CommonConstants.ZERO_STRING.equals(dis.getType()) && Common.isNotNull(dis.getSocialId())){
@@ -4171,6 +4182,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				)
 				|| Common.isEmpty(socialInfo.getBigailmentHandle()))
 		){
+			if (partHandleStatus(socialInfo, sf, dis)) return;
 			if (CommonConstants.TWO_STRING.equals(socialInfo.getPensionHandle())
 					|| CommonConstants.TWO_STRING.equals(socialInfo.getWorkInjuryHandle())
 					|| CommonConstants.TWO_STRING.equals(socialInfo.getBirthHandle())
@@ -4214,6 +4226,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()))
 				|| Common.isEmpty(socialInfo.getBigailmentHandle()))
 		){
+			// 针对增增减的情况 直接派减完成第二次派增后 无法继续办理第一次派单项的情况优化  2023-04-07 fxj
+			if (partHandleStatus(socialInfo, sf, dis)) return;
 			socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
 			sf.setSocialStatus(CommonConstants.EIGHT_STRING);
 			sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
@@ -4258,6 +4272,26 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
 	}
 
+	private boolean partHandleStatus(TSocialInfo socialInfo, TSocialFundInfo sf, TDispatchInfo dis) {
+		// 针对增增减的情况 直接派减完成第二次派增后 无法继续办理第一次派单项的情况优化  2023-04-07 fxj
+		if (CommonConstants.FIVE_STRING.equals(sf.getPensionHandle())
+				|| CommonConstants.FIVE_STRING.equals(sf.getMedicalHandle())
+				|| CommonConstants.FIVE_STRING.equals(sf.getUnemployHandle())
+				|| CommonConstants.FIVE_STRING.equals(sf.getWorkInjuryHandle())
+				|| CommonConstants.FIVE_STRING.equals(sf.getBirthHandle())
+				|| CommonConstants.FIVE_STRING.equals(sf.getBigailmentHandle())
+		) {
+			//办理中
+			socialInfo.setHandleStatus(CommonConstants.SIX_STRING);
+			sf.setSocialStatus(CommonConstants.ELEVEN_STRING);
+			sf.setSocialReduceStatus(CommonConstants.FIVE_STRING);
+			socialInfo.setReduceCan(CommonConstants.ONE_STRING);
+			dis.setSocialHandleStatus(CommonConstants.FOUR_STRING);
+			return true;
+		}
+		return false;
+	}
+
 	private void updateSocialByHandle(int flag, TSocialInfo socialInfo, TDispatchInfo dis, TSocialFundInfo sf) {
 		if (CommonConstants.ZERO_INT== flag
 				&& Common.isNotNull(dis.getSocialId())

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

@@ -1711,8 +1711,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							boolean isTrueAdder = false;
 							fundlist = providentFundMapper.selectList(Wrappers.<TProvidentFund>query().lambda()
 									.eq(TProvidentFund::getEmpIdcard, infoVo.getEmpIdcard())
-									.eq(TProvidentFund::getFundProvince, infoVo.getSocialProvince())
-									.eq(TProvidentFund::getFundCity, infoVo.getSocialCity()));
+									.eq(TProvidentFund::getFundProvince, infoVo.getFundProvince())
+									.eq(TProvidentFund::getFundCity, infoVo.getFundCity()));
 							if (!fundlist.isEmpty()) {
 								for (TProvidentFund providentFund : fundlist) {
 									if ((Common.isEmpty(infoVo.getFundTown()) || (Common.isNotNull(infoVo.getFundTown()) &&