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

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

@@ -104,6 +104,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			TSettleDomain tSettleDomain = tSettleDomainMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
 					.eq(TSettleDomain::getDepartNo, tEmpChangeInfo.getDeptNo()).eq(TSettleDomain::getDepartName, tEmpChangeInfo.getNewSettle())
 					.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING).eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
+			if (Common.isEmpty(tSettleDomain)) {
+				return R.failed("对应项目编码的项目已停止合作");
+			}
 			TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(updateTEmployeeProject.getId());
 			updateTEmployeeProject.setDeptNo(tEmpChangeInfo.getDeptNo());
 			updateTEmployeeProject.setDeptId(tEmpChangeInfo.getDeptId());

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

@@ -482,7 +482,7 @@ public interface ErrorCodes {
 	 */
 	String EMP_DISPATCH_EMP_NOT_EMPTY = "emp.dispatch.emp.not.empty";
 	/**
-	 * 派增异常： 对应项目编码已停止合作
+	 * 派增异常：对应项目编码的项目已冻结/已停止合作
 	 */
 	String EMP_DISPATCH_SETTLEDOMAIN_STOP = "emp.dispatch.settleDomain.stop";
 	/**

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -102,7 +102,7 @@ archives.project.change.contract.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0
 archives.project.emp.lose.fee.not.empty=\u4E0D\u826F\u8BB0\u5F55\u8D39\u7528\u635F\u5931\u548C\u5176\u4ED6\u635F\u5931\u4E0D\u53EF\u540C\u65F6\u4E3A\u7A7A
 
 qt.project.change.not.exist=\u4EBA\u5458\u5728\u539F\u9879\u76EE\u4E2D\u5B58\u5728\u5728\u9014\u7684\u670D\u52A1\uFF0C\u8BF7\u5148\u7EC8\u6B62\u540E\uFF0C\u518D\u8FDB\u884C\u5212\u8F6C
-project.search.not.exist=\u672A\u627E\u5230\u5BF9\u5E94\u7684\u9879\u76EE\u6216\u8005\u9879\u76EE\u5DF2\u505C\u6B62\u5408\u4F5C\uFF0C\u8BF7\u6838\u5B9E
+project.search.not.exist=\u672A\u627E\u5230\u5BF9\u5E94\u7684\u65B0\u9879\u76EE\u6216\u8005\u65B0\u9879\u76EE\u5DF2\u505C\u6B62\u5408\u4F5C\uFF0C\u8BF7\u6838\u5B9E
 
 change.strat.month.exit=\u5212\u8F6C\u8D77\u59CB\u6708\u4E0D\u80FD\u4E3A\u7A7A
 change.less.month.exit=\u5212\u8F6C\u8D77\u59CB\u6708\u8981\u5C0F\u4E8E\u7B49\u4E8E\u5F53\u524D\u6708

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

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
@@ -30,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预估费用
@@ -128,8 +130,8 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	void createForecastInfo();
 	void createForecastFundInfo();
 
-	void pushForecastInfo(List<TForecastLibrary> library, boolean synFlag);
+	void pushForecastInfo(List<TForecastLibrary> library, boolean synFlag,Map<String,TSettleDomainSelectVo> mapSelectVo);
 
-	void pushForecastFundInfo(List<TForecastLibrary> library, boolean synFlag);
+	void pushForecastFundInfo(List<TForecastLibrary> library, boolean synFlag, Map<String, TSettleDomainSelectVo> mapSelectVo);
 
 }

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

@@ -58,10 +58,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 收入明细表
@@ -322,14 +318,12 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 
 	@Override
 	public void pushDetail() {
-		ThreadPoolExecutor threadPool = new ThreadPoolExecutor(50, 50, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
 		List<TIncome> list = baseMapper.selectList(Wrappers.<TIncome>query().lambda()
 				.eq(TIncome::getSendStatus, CommonConstants.ZERO_STRING));
-		ConcurrentHashMap<String,Integer> map = new ConcurrentHashMap<>();
-		ConcurrentHashMap<String,String> idMap = new ConcurrentHashMap<>();
+		Map<String, Integer> map = new HashMap<>();
+		Map<String, String> idMap = new HashMap<>();
 		//收入更新
 		List<TIncome> updateList = new ArrayList<>();
-		threadPool.execute(() -> {
 		for (TIncome income : list) {
 			String sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
@@ -343,7 +337,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 					updateList.clear();
 				}
 			} else {
-					if (map.get(sendBack) > 0) {
+				if (Common.isNotNull(map.get(sendBack)) && map.get(sendBack) > 0) {
 					int i = map.get(sendBack) + 1;
 					map.put(sendBack, i);
 					idMap.put(sendBack, income.getId());
@@ -368,7 +362,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				}
 			}
 		}
-		});
 		for (Map.Entry<String, Integer> entry : map.entrySet()) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());

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

@@ -89,7 +89,7 @@ public class DoSocialTask {
 							}
 						}
 					}
-					forecastLibraryService.pushForecastFundInfo(libs,false);
+					forecastLibraryService.pushForecastFundInfo(libs,false,null);
 				}
 				// 获取预估库数据并推送
 				if (type == CommonConstants.THREE_INT){