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

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

@@ -420,6 +420,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				newEmpProject = new TEmployeeProject();
 				BeanUtil.copyProperties(oldEmpProject,newEmpProject);
 				newEmpProject.setId(null);
+				newEmpProject.setEmpNo(tEmployeeProjectService.getEmpNo(newEmpProject.getDeptNo()));
 				newEmpProject.setDeptId(vo.getNewDeptId());
 				newEmpProject.setDeptName(vo.getNewDeptName());
 				newEmpProject.setDeptNo(vo.getNewDeptNo());
@@ -430,7 +431,14 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				newEmpProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
 				newEmpProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
 				newEmpProject.setInsuranceStatus(null);
-
+				newEmpProject.setSocialStatus(null);
+				newEmpProject.setSocialProvince(null);
+				newEmpProject.setSocialCity(null);
+				newEmpProject.setSocialTown(null);
+				newEmpProject.setFundStatus(null);
+				newEmpProject.setContractStatus(null);
+				newEmpProject.setContractType(null);
+			}
 			updateTEmployeeProject.setDeptName(vo.getNewDeptName());
 			updateTEmployeeProject.setDeptNo(vo.getNewDeptNo());
 			updateTEmployeeProject.setDeptId(vo.getNewDeptId());
@@ -440,7 +448,6 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			updateTEmployeeProject.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType());
 			updateTEmployeeProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
 			updateTEmployeeProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
-			}
 			// 记录变更日志
 			tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeeProject.getId(), oldEmpProject, updateTEmployeeProject);
 			updateTEmployeeProject.setOdlDeptId(oldEmpProject.getDeptId());
@@ -456,8 +463,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			updatesf.setUnitName(updateTEmployeeProject.getUnitName());
 			// 处理社保  目标项目档案已有项目档案不做处理
 			if (vo.getChangeItems().indexOf(CommonConstants.ONE_STRING) >= CommonConstants.ZERO_INT) {
-				if (!(Common.isEmpty(newEmpProject.getSocialStatus())
-						|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus())){
+				if (Common.isEmpty(newEmpProject.getSocialStatus())
+						|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus()){
 					newEmpProject.setSocialStatus(oldEmpProject.getSocialStatus());
 					newEmpProject.setSocialProvince(oldEmpProject.getSocialProvince());
 					newEmpProject.setSocialCity(oldEmpProject.getSocialCity());
@@ -475,8 +482,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			}
 			// 处理公积金 如果目标项目档案已存在公积金 不划转
 			if (vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT) {
-				if (!(Common.isEmpty(newEmpProject.getFundStatus())
-						|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus())){
+				if (Common.isEmpty(newEmpProject.getFundStatus())
+						|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus()){
 					newEmpProject.setFundStatus(oldEmpProject.getFundStatus());
 					updatesf.setFlag(CommonConstants.ONE_STRING);
 					socialDaprUtils.updateSocialAndFoundInfo(updatesf);
@@ -488,8 +495,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			}
 			// 处理員工合同  目标 已有合同状态 不在处理合同划转
 			if (vo.getChangeItems().indexOf(CommonConstants.ZERO_STRING) >= CommonConstants.ZERO_INT){
-				if (!(Common.isEmpty(newEmpProject.getContractStatus())
-						|| CommonConstants.ZERO_INT != newEmpProject.getContractStatus())){
+				if (Common.isEmpty(newEmpProject.getContractStatus())
+						|| CommonConstants.ZERO_INT != newEmpProject.getContractStatus()){
 					newEmpProject.setContractStatus(oldEmpProject.getContractStatus());
 					newEmpProject.setContractType(oldEmpProject.getContractType());
 					// 合同同步划转---只划转在用合同 fxj 2023-03-06
@@ -506,6 +513,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			tEmployeeProjectService.saveOrUpdate(newEmpProject);
 			//同步减项老项目档案
 			if (CommonConstants.ONE_STRING.equals(vo.getChangeType())){
+				oldEmpProject.setIsLeaveEmployee(CommonConstants.ONE_INT);
 				R res  = tEmployeeProjectService.deleteEmpPro(oldEmpProject);
 				resStr.append(res.getMsg());
 			}

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java

@@ -153,5 +153,6 @@ public class ExcelAttributeConstants {
 	public static final String CUSTOMER = "customer";
 
 	public static final String HOUSEHOLD = "household";
-
+	// 派单办理失败类型
+	public static final String DISPATCH_HANDLE_REASON = "dispatch-audit-add-reason";
 }

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

@@ -65,14 +65,14 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
 	/**
 	 * 办理意见
 	 */
-	@ExcelAttribute(name = "办理意见")
+	@ExcelAttribute(name = "办理意见",maxLength = 150,errorInfo = "办理意见长度不可超过150！")
 	@Schema(description = "办理意见" )
-	@ExcelProperty("办理意见" )
+	@ExcelProperty("办理意见")
 	private String remark;
 	/**
 	 * 失败类型
 	 */
-	@ExcelAttribute(name = "失败类型")
+	@ExcelAttribute(name = "失败类型",isDataId = true,isConvert = false,dataType = ExcelAttributeConstants.DISPATCH_HANDLE_REASON)
 	@Schema(description = "失败类型" )
 	@ExcelProperty("失败类型" )
 	private String reasonType;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -643,7 +643,7 @@ public class TDispatchInfoController {
 	@Operation(summary = "单个派增 权限：social_dispatchinfo_add", description = "单个派增")
 	@PostMapping("/fundImportHandle")
 	//@PreAuthorize("@pms.hasPermission('fund_import_handle')")
-	public R<List<ErrorMessage>> fundImportHandle(@RequestBody MultipartFile file) {
+	public R<List<ErrorMessage>> fundImportHandle(@RequestBody MultipartFile file, @RequestParam(required = true)String mId) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(user)) {
 			return R.failed(CommonConstants.USER_FAIL);
@@ -659,7 +659,16 @@ public class TDispatchInfoController {
 		try {
 			if (Common.isNotNull(requestId)) {
 				//主动释放锁
-				return tDispatchInfoService.fundImportHandle(file.getInputStream());
+				TDispatchInfo tDispatchInfo = new TDispatchInfo();
+				tDispatchInfo.setMId(mId);
+				tDispatchInfo.setMenuInfo(mId);
+				tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
+				menuUtil.setAuthSql(user, tDispatchInfo);
+				if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+					tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+				}
+				tDispatchInfo.setCreateBy(user.getId());
+				return tDispatchInfoService.fundImportHandle(file.getInputStream(),tDispatchInfo);
 			} else {
 				return R.failed(ResultConstants.NO_GETLOCK_DATA);
 			}

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

@@ -111,7 +111,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 	 **/
 	R<List<ErrorMessage>> dispatchAdd(TDispatchImportVo importVo);
 
-	R<List<ErrorMessage>> fundImportHandle(InputStream inputStream);
+	R<List<ErrorMessage>> fundImportHandle(InputStream inputStream,TDispatchInfo tDispatchInfo);
 
 	R<Boolean> updateExportSocialFlagById(String id,String status);
 

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

@@ -5022,7 +5022,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	@Transactional(rollbackFor = Exception.class)
 	@ShardingTransactionType(TransactionType.BASE)
 	@Override
-	public R<List<ErrorMessage>> fundImportHandle(InputStream inputStream) {
+	public R<List<ErrorMessage>> fundImportHandle(InputStream inputStream,TDispatchInfo tDispatchInfo) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(user)){
 			R.failed(CommonConstants.USER_FAIL);
@@ -5073,7 +5073,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				 */
 				private void saveData() {
 					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
-					fundImportHandle(cachedDataList, errorMessageList,user);
+					fundImportHandle(cachedDataList, errorMessageList,user,tDispatchInfo);
 					log.info("存储数据库成功！");
 				}
 			}).sheet().doRead();
@@ -5091,7 +5091,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	 * @Param
 	 * @return
 	**/
-	public void fundImportHandle(List<FundImportHandleVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user) {
+	public void fundImportHandle(List<FundImportHandleVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user,TDispatchInfo dispatchInfo) {
 		if (!Common.isNotNull(excelVOList)) {
 			return;
 		}
@@ -5101,6 +5101,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		String handleStatus = "2";
 		SocialHandleSearchVo tDispatchInfo = new SocialHandleSearchVo();
 		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
+		tDispatchInfo.setAuthSql(dispatchInfo.getAuthSql());
+		tDispatchInfo.setCreateBy(dispatchInfo.getCreateBy());
+		tDispatchInfo.setMId(dispatchInfo.getMId());
+		tDispatchInfo.setMenuInfo(dispatchInfo.getMenuInfo());
 		menuUtil.setAuthSql(user, tDispatchInfo);
 		if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 			tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
@@ -5131,6 +5135,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (CommonConstants.ZERO_STRING.equals(excel.getHandleStatus())) {
 				flag = CommonConstants.ZERO_INT;
 				handleStatus = CommonConstants.ONE_STRING;
+				excel.setReasonType(CommonConstants.EMPTY_STRING);
 			}
 			if (CommonConstants.ONE_STRING.equals(excel.getHandleStatus())) {
 				flag = CommonConstants.ONE_INT;
@@ -5141,10 +5146,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.FUND_IMPORT_HANDLE_NOT_EXITS),excel));
 				continue;
 			}
+			if (Common.isEmpty(excel.getRemark())){
+				excel.setRemark(CommonConstants.EMPTY_STRING);
+			}
 			try {
 				// 执行数据插入操作 组装
 				messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ONE_STRING, user
-						, flag, handleStatus, excel.getReasonType(), null, excel.getReasonType()+CommonConstants.COLON_STRING+excel.getRemark());
+						, flag, handleStatus, (Common.isEmpty(excel.getReasonType())?"":excel.getReasonType()+CommonConstants.COLON_STRING)
+								+excel.getRemark(), null, excel.getReasonType());
 				if (Common.isNotNull(messageList)){
 					errorMessage = messageList.get(CommonConstants.ZERO_INT);
 					errorMessage.setData(excel);