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

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml

@@ -247,6 +247,7 @@
 			or (datediff(#{pp}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
 		  and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3')
 		   and a.PROJECT_STATUS = 0
+		   and a.DELETE_FLAG=0
 		GROUP BY a.EMP_IDCARD,
 				 a.DEPT_NO
 	</select>

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpOrderUtil.java

@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * @author licancan
- * @description 对接ekp订单
+ * @description 对接ekp订
  * @date 2022-08-31 15:35:20
  */
 @Log4j2

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAddVO.java

@@ -356,6 +356,7 @@ public class OrderAddVO implements Serializable {
 
 
 
+
 	/**
 	 * 工资附件
 	 */
@@ -421,5 +422,4 @@ public class OrderAddVO implements Serializable {
 
 
 
-
 }

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -188,13 +188,16 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		String result;
 		switch (orderStatus){
 			case 0:
-				result = "待处理";
+				result = "待分配";
 				break;
 			case 1:
-				result = "处理中";
+				result = "制作中";
 				break;
 			case 2:
-				result = "已办结";
+				result = "待确认";
+				break;
+			case 3:
+				result = "已完结";
 				break;
 			default:
 				result = "";
@@ -505,9 +508,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){
 			return R.failed(OrderConstants.ORDER_CONTENT_MORE_THAN_2048);
 		}
-		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
-			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
-		}		TSettleDomain settleDomain = new TSettleDomain();
+			TSettleDomain settleDomain = new TSettleDomain();
 
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;

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

@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 预估费用
@@ -92,7 +93,7 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 * @Date: 2022/7/26 19:02
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
-	R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo);
+	R<String> updateForecastLibaryByDispatch(ConcurrentHashMap<String, String> socialMap, ConcurrentHashMap<String, String> fundMap,TSocialFundInfo socialFundInfo);
 
 	/**
 	 * @Description: 户调基-基数变更，同步社保公积金查询、预估库

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

@@ -724,7 +724,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 				// 生成预付数据
 				if (Common.isNotNull(socialFund) && Common.isNotNull(socialFund.getId())){
-					forecastLibraryService.updateForecastLibaryByDispatch(socialFund);
+					forecastLibraryService.updateForecastLibaryByDispatch(null,null,socialFund);
 				}
 				// 同步更新人员档案和项目档案的社保公积金状态
 				updateDocSocialFund(social, fund, socialFund,excel);
@@ -3356,7 +3356,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							&& CommonConstants.ONE_INT == flag){
 						// 更新预估数据 -- 失败项重新派单审核不通过不处理预估
 						if (!flagTemp){
-							socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
+							socialTask.asynchronousDisPatchHandle(null,null,sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 						}
 						// 更新人员档案和项目档案的社保公积金状态
 						UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
@@ -3490,7 +3490,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		if (Common.isNotNull(requestId)) {
 			try {
-				List<ErrorMessage> errorInfo = addBatchApplyHandle(ids, typeSub, user, flag, handleStatus,
+				List<ErrorMessage> errorInfo = addBatchApplyHandle(null,null,ids, typeSub, user, flag, handleStatus,
 						Common.isNullToString(handleRemark), socialType, remark);
 				if (errorInfo == null || errorInfo.isEmpty()) {
 					return R.ok(null, "办理成功！");
@@ -3536,7 +3536,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	 * @Date 2022-07-26
 	 **/
 	@Transactional(rollbackFor = Exception.class)
-	public List<ErrorMessage> addBatchApplyHandle(List<String> idsList, String typeSub, YifuUser user
+	public List<ErrorMessage> addBatchApplyHandle(ConcurrentHashMap<String, String> socialMap,ConcurrentHashMap<String, String> fundMap,
+			List<String> idsList, String typeSub, YifuUser user
 			, int flag, String handleStatus, String handleRemark, String socialType, String remark) {
 		List<ErrorMessage> errorList = new ArrayList<>();
 		if (!Common.isNotNull(idsList)) {
@@ -3877,18 +3878,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									&& (CommonConstants.FIVE_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.FOUR_STRING.equals(sf.getFundStatus()))) {
 								// 派增办理，全部失败 同步预估库数据
-								socialTask.asynchronousDisPatchHandle(sf, forecastFlag, null, null, CommonConstants.ZERO_INT);
+								socialTask.asynchronousDisPatchHandle(socialMap,fundMap,sf, forecastFlag, null, null, CommonConstants.ZERO_INT);
 							}
 							// 社保办理只要办理成功就刷新预估数据  公积金办理不用处理（前面公积金办理成功的时候处理过了）
 							if (CommonConstants.ZERO_STRING.equals(typeSub)
 									&& (Common.isNotNull(dis.getSocialId())
 									&& CommonConstants.FOUR_STRING.equals(sf.getSocialStatus())
-									|| CommonConstants.TWO_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.THREE_STRING.equals(sf.getSocialStatus()))) {
 								if (partSuccess) {
-									forecastLibraryService.updateForecastLibaryByDispatch(sf);
+									forecastLibraryService.updateForecastLibaryByDispatch(socialMap,fundMap,sf);
 								} else {
-									socialTask.asynchronousDisPatchHandle(sf, 0, null, null, CommonConstants.ONE_INT);
+									socialTask.asynchronousDisPatchHandle(socialMap,fundMap,sf, 0, null, null, CommonConstants.ONE_INT);
 								}
 							}
 						}
@@ -3898,7 +3898,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								&& (CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())
 								|| CommonConstants.SEVEN_STRING.equals(sf.getFundStatus()))){
 							// 同步预估库数据
-							socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
+							socialTask.asynchronousDisPatchHandle(socialMap,fundMap,sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
 						}
 						// 派减公积金办理失败不同步档案的相关字段信息
 						if (!(CommonConstants.ONE_STRING.equals(dis.getType())
@@ -5163,7 +5163,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			try {
 				// 执行数据插入操作 组装
-				messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ONE_STRING, user
+				messageList = addBatchApplyHandle(null,null,Collections.singletonList(dispatch.getId()), CommonConstants.ONE_STRING, user
 						, flag, handleStatus, (Common.isEmpty(excel.getReasonType())?"":excel.getReasonType()+CommonConstants.COLON_STRING)
 								+excel.getRemark(), null, excel.getReasonType());
 				if (Common.isNotNull(messageList)){
@@ -5289,6 +5289,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		String handlerRemaek;
 
 		List<TDispatchInfo> failueList = new ArrayList<>();
+		ConcurrentHashMap<String, String> socialMap = new ConcurrentHashMap<>();
+		ConcurrentHashMap<String, String> fundMap = new ConcurrentHashMap<>();
 		for (int i = 0; i < excelVOList.size(); i++) {
 			StringBuilder socialSucessType = new StringBuilder();
 			StringBuilder socialFailureType = new StringBuilder();
@@ -5366,7 +5368,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						continue;
 					}
 					// 执行数据插入操作 组装
-					messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ZERO_STRING, user
+					messageList = addBatchApplyHandle(socialMap,fundMap,Collections.singletonList(dispatch.getId()), CommonConstants.ZERO_STRING, user
 							, 0, CommonConstants.ONE_STRING, ServiceUtil.ifNullToEmpty(excel.getRemark()), socialSucessType.substring(0, socialSucessType.length() - 1), ServiceUtil.ifNullToEmpty(excel.getRemark()));
 					if (Common.isNotNull(messageList)) {
 						errorMessage = messageList.get(CommonConstants.ZERO_INT);
@@ -5397,7 +5399,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			for (TDispatchInfo dispatchInfo : failueList) {
 				vo = dispatchInfo.getExcel();
 				// 执行数据插入操作 组装
-				messageList = addBatchApplyHandle(Collections.singletonList(dispatchInfo.getId()), CommonConstants.ZERO_STRING, user
+				messageList = addBatchApplyHandle(socialMap,fundMap,Collections.singletonList(dispatchInfo.getId()), CommonConstants.ZERO_STRING, user
 						, 1, CommonConstants.TWO_STRING, dispatchInfo.getHandlerRemaek() + ServiceUtil.ifNullToEmpty(vo.getRemark()), dispatchInfo.getSocialFailureType().substring(0, dispatchInfo.getSocialFailureType().length() - 1), dispatchInfo.getHandlerRemaek() + ServiceUtil.ifNullToEmpty(vo.getRemark()));
 				if (Common.isNotNull(messageList)) {
 					errorMessage = messageList.get(CommonConstants.ZERO_INT);

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

@@ -62,6 +62,7 @@ import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 预估费用
@@ -1490,7 +1491,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				sysBaseSetInfoMapper.updateById(sysBaseSetInfo);
 			}
 			for (TSocialFundInfo socialFundInfo : socialFundInfoMap.values()) {
-				this.updateForecastLibaryCore(socialFundInfo, socialFundInfo.getDoMonth(), true, false,true);
+				this.updateForecastLibaryCore(null,null,socialFundInfo, socialFundInfo.getDoMonth(), true, false,true);
 				socialFundInfoMapper.updateById(socialFundInfo);
 			}
 		}
@@ -1505,7 +1506,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 **/
 	@Override
 	public R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo, String doMonth) {
-		return this.updateForecastLibaryCore(socialFundInfo, doMonth, false, false,true);
+		return this.updateForecastLibaryCore(null,null,socialFundInfo, doMonth, false, false,true);
 	}
 
 	/**
@@ -1516,8 +1517,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @return: void
 	 **/
 	@Override
-	public R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo) {
-		return this.updateForecastLibaryCore(socialFundInfo, null, false, true,false);
+	public R<String> updateForecastLibaryByDispatch(ConcurrentHashMap<String, String> socialMap, ConcurrentHashMap<String, String> fundMap,TSocialFundInfo socialFundInfo) {
+		return this.updateForecastLibaryCore(socialMap,fundMap,socialFundInfo, null, false, true,false);
 	}
 
 	/**
@@ -1714,7 +1715,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @Date: 2022/7/26 19:01
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
-	private R<String> updateForecastLibaryCore(TSocialFundInfo socialFundInfo, String doMonth, boolean isOnly, boolean isDispatch,boolean synFlag) {
+	private R<String> updateForecastLibaryCore(ConcurrentHashMap<String, String> socialMap,ConcurrentHashMap<String, String> fundMap,TSocialFundInfo socialFundInfo, String doMonth, boolean isOnly, boolean isDispatch,boolean synFlag) {
 		String empIdCard = socialFundInfo.getEmpIdcard();
 		//定义未推送的按条件查询得到的预估数据
 		List<TForecastLibrary> librarySocialList = null;
@@ -1906,8 +1907,29 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				log.error("更新一条预估耗时：" + times + "毫秒");
 				isSaveAndUpdate = true;
 			} else {
-				if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
-						|| BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitFundSum())) != CommonConstants.ZERO_INT) {
+				if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT) {
+					if (null != socialMap) {
+						String sameKey = library.getEmpIdcard() + "_" + library.getSocialCreateMonth() + "_" + library.getSocialPayMonth();
+						if (null == socialMap.get(sameKey)) {
+							socialMap.put(sameKey,CommonConstants.ONE_STRING);
+						} else {
+							continue;
+						}
+					}
+					library.setCreateBy(userId);
+					library.setCreateName(userName);
+					library.setCreateTime(LocalDateTime.now());
+					baseMapper.insert(library);
+					isSaveAndUpdate = true;
+				} else if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitFundSum())) != CommonConstants.ZERO_INT) {
+					if (null != fundMap) {
+						String sameKey = library.getEmpIdcard() + "_" + library.getProvidentCreateMonth() + "_" + library.getProvidentPayMonth();
+						if (null == fundMap.get(sameKey)) {
+							fundMap.put(sameKey,CommonConstants.ONE_STRING);
+						} else {
+							continue;
+						}
+					}
 					library.setCreateBy(userId);
 					library.setCreateName(userName);
 					library.setCreateTime(LocalDateTime.now());

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoSocialTask.java

@@ -27,6 +27,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @Author fxj
@@ -58,7 +59,7 @@ public class DoSocialTask {
 	 * @param type=0 updateForecastLibaryByDispatchReduce   type=1 updateForecastLibaryByDispatch  type=2 pushForecastFundInfo   createIncomeInfo(library);
 	 **/
 	@Async
-	public void asynchronousDisPatchHandle(TSocialFundInfo sf, int forecastFlag,List< TForecastLibrary > libs,TForecastLibrary library,int type) {
+	public void asynchronousDisPatchHandle(ConcurrentHashMap<String, String> socialMap, ConcurrentHashMap<String, String> fundMap, TSocialFundInfo sf, int forecastFlag, List< TForecastLibrary > libs, TForecastLibrary library, int type) {
 		synchronized (this){
 			R<String> res;
 			String linkId = null;
@@ -74,7 +75,7 @@ public class DoSocialTask {
 				// 派单变更预估库
 				if (type == CommonConstants.ONE_INT){
 					linkId = sf.getId();
-					res  = forecastLibraryService.updateForecastLibaryByDispatch(sf);
+					res  = forecastLibraryService.updateForecastLibaryByDispatch(socialMap,fundMap,sf);
 					if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
 						initSendError(sf.getId(), res.getMsg(),"updateForecastLibaryByDispatch:");
 					}