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

yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/config/CASproperties.java

@@ -5,12 +5,12 @@ public class CASproperties {
 	/**
 	 * 当前应用程序的登陆界面
 	 */
-	public static String CLIENT_LOGIN_PAGE = "http://mvp.wanxinwork.com/login";
+	public static String CLIENT_LOGIN_PAGE = "https://qas-mvp-1.worfu.com/login";
 
 	/**
 	 * CAS服务器地址
 	 */
-	public static String CAS_SERVER_PATH = "http://192.168.0.240:8443/cas";
+	public static String CAS_SERVER_PATH = "http://192.168.1.62:8443/cas";
 
-	public static String SPRING_SECURITY_CAS_SERVER = "http://192.168.0.240:8443/cas/v1/tickets";
+	public static String SPRING_SECURITY_CAS_SERVER = "http://192.168.1.62:8443/cas/v1/tickets";
 }

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -1213,6 +1213,7 @@
 		) a
 		where 1=1
 		<include refid="tSalaryAccount_where"/>
+		order by a.SALARY_MONTH desc
 	</select>
 
 </mapper>

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

@@ -63,6 +63,15 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty("派单申请编码" )
 	private String dispatchCode;
 
+	/**
+	 * 重新派单号
+	 */
+	@ExcelAttribute(name = "重新派单号", maxLength = 30)
+	@Schema(description = "重新派单号" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("重新派单号" )
+	private String againDispatchCode;
+
 	/**
 	 * 员工ID
 	 */

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

@@ -110,4 +110,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
 	@ExcelProperty("委托备注" )
 	private String trustRemark;
 
+	/**
+	 * 是否是失败项重新派单 0 是
+	 */
+	@ExcelAttribute(name = "是否是失败项重新派单")
+	@Schema(description = "是否是失败项重新派单" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("是否是失败项重新派单" )
+	private String isAgainFlag;
+
 }

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

@@ -2724,6 +2724,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			try {
 				dispatch.setOrderId(orderId);
 				dispatch.setApplyNo(getApplyCode());
+				if (CommonConstants.ZERO_STRING.equals(excel.getIsAgainFlag())) {
+					dispatch.setAgainDispatchCode(dispatch.getApplyNo());
+				}
 				dispatch.setStatus(CommonConstants.ONE_STRING);
 				baseMapper.insert(dispatch);
 				socialFundMapper.updateById(socialFund);

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

@@ -701,7 +701,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 				info.setPreStatus(CommonConstants.ONE_STRING);
 			}
 			int finalI = i;
-			if (!errList.stream().anyMatch(e-> hasError(e, finalI))) {
+			if (errList.stream().noneMatch(e-> hasError(e, finalI))) {
 				baseMapper.insert(info);
 			}
 		}
@@ -2266,7 +2266,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 	 * @Date 2022-07-18
 	 **/
 	private R<Boolean> handleDispatchAddRes(TPreDispatchInfo preInfo, List<ErrorMessage> errorMessageList) {
-		if (errorMessageList.size() == CommonConstants.ZERO_INT) {
+		if (errorMessageList.size() == CommonConstants.ZERO_INT ||
+				errorMessageList.stream().allMatch(e-> CommonConstants.SAVE_SUCCESS.equals(e.getMessage()))) {
 			preInfo.setPreStatus(CommonConstants.TWO_STRING);
 			preInfo.setExceptionContent(CommonConstants.EMPTY_STRING);
 			baseMapper.updatePreStatusById(preInfo);
@@ -2282,36 +2283,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		}
 	}
 
-	private R<Boolean> handleBatchSocialFundReduce(TPreDispatchInfo preInfo,
-												   TDispatchInfo dispatchInfo, TSocialInfo social, TProvidentFund fund) {
-		if (Common.isEmpty(preInfo.getSocialProvince()) && Common.isEmpty(preInfo.getFundProvince())) {
-			return R.failed("请检查派减缴纳地是否准确！");
-		}
-		if (Common.isNotNull(preInfo.getSocialProvince())) {
-			if (null != social) {
-				dispatchInfo.setSettleDomain(social.getSettleDomain());
-				dispatchInfo.setBelongUnit(social.getBelongUnit());
-			} else {
-				preInfo.setPreStatus(CommonConstants.ONE_STRING);
-				preInfo.setExceptionContent(PreDispatchConstants.NO_SOCIAL_CAN_REDUCE);
-				baseMapper.updatePreStatusById(preInfo);
-				return R.failed(PreDispatchConstants.NO_SOCIAL_CAN_REDUCE);
-			}
-		}
-		if (Common.isNotNull(preInfo.getFundProvince())) {
-			if (null != fund) {
-				dispatchInfo.setSettleDomain(fund.getSettleDomain());
-				dispatchInfo.setBelongUnit(fund.getBelongUnit());
-			} else {
-				preInfo.setPreStatus(CommonConstants.ONE_STRING);
-				preInfo.setExceptionContent(PreDispatchConstants.NO_FUND_CAN_REDUCE);
-				baseMapper.updatePreStatusById(preInfo);
-				return R.failed(PreDispatchConstants.NO_FUND_CAN_REDUCE);
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * 派减派单时间处理
 	 * @param dispatchInfo

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

@@ -85,6 +85,7 @@
 	<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
     <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
 	<result property="dispatchCode" column="DISPATCH_CODE"/>
+	<result property="againDispatchCode" column="AGAIN_DISPATCH_CODE"/>
 	<result property="contractSubName" column="CONTRACT_SUB_NAME"/>
 	<result property="contractId" column="CONTRACT_ID"/>
 	<result property="educationName" column="EDUCATION_NAME"/>
@@ -280,6 +281,7 @@
 		a.SETTLE_DOMAIN_NAME,
 		a.BELONG_UNIT_NAME,
 		a.DISPATCH_CODE,
+		a.AGAIN_DISPATCH_CODE,
 		a.SETTLE_DOMAIN_CODE,
 		a.CONTRACT_SUB_NAME,
 		a.CONTRACT_ID,