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

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

@@ -218,7 +218,7 @@ fund.import.handle.not.exits=\u65E0\u529E\u7406\u6743\u9650\u6216\u65E0\u53EF\u9
 
 fund_import_handle_reason_not_empty=\u516C\u79EF\u91D1\u529E\u7406\uFF1A\u529E\u7406\u5931\u8D25\uFF0C\u5931\u8D25\u7C7B\u578B\u5FC5\u586B
 
-social_import_handle_reason_not_empty=\u793E\u4FDD\u529E\u7406\uFF1A\u4EFB\u4E00\u9669\u79CD\u529E\u7406\u5931\u8D25\uFF0C\u5931\u8D25\u539F\u56E0\u5FC5\u586B
+social_import_handle_reason_not_empty=\u793E\u4FDD\u529E\u7406\uFF1A\u4EFB\u4E00\u9669\u79CD\u529E\u7406\u5931\u8D25\uFF0C\u5931\u8D25\u7C7B\u578B\u5FC5\u586B
 social_import_handle_not_empty=\u793E\u4FDD\u529E\u7406\u5931\u8D25\uFF0C\u5FC5\u987B\u529E\u7406\u5176\u4E2D\u4E00\u4E2A\u9669\u79CD
 social.import.handle.not.exits=\u65E0\u529E\u7406\u6743\u9650\u6216\u65E0\u53EF\u9700\u8981\u529E\u7406\u7684\u793E\u4FDD\u6570\u636E
 

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

@@ -100,7 +100,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
 	/**
 	 * 办理意见
 	 */
-	@ExcelAttribute(name = "办理意见")
+	@ExcelAttribute(name = "办理意见", maxLength = 150)
 	@Schema(description = "办理意见" )
 	@ExcelProperty("办理意见" )
 	private String remark;

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

@@ -3650,13 +3650,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
 										temp.append(Common.isNullToString(socialTypeRemark));
 										temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
-										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString().concat(handleRemark), remark);
+										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString().concat(ServiceUtil.ifNullToEmpty(handleRemark)), remark);
 									} else {
 										temp.setLength(CommonConstants.ZERO_INT);
 										temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
 										temp.append(Common.isNullToString(socialTypeRemark));
 										temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
-										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString().concat(handleRemark), remark);
+										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString().concat(ServiceUtil.ifNullToEmpty(handleRemark)), remark);
 									}
 									auditInfo.setSocialId(dis.getId());
 								}
@@ -5260,11 +5260,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 		TDispatchInfo dispatch;
 		ErrorMessage errorMessage;
-		List<ErrorMessage> messageList = new ArrayList<>();
+		List<ErrorMessage> messageList;
 
+		for (int i = 0; i < excelVOList.size(); i++) {
 			StringBuilder socialSucessType = new StringBuilder();
 			StringBuilder socialFailureType = new StringBuilder();
-		for (int i = 0; i < excelVOList.size(); i++) {
 			excel = excelVOList.get(i);
 			//身份证加任一险种必填
 			if (Common.isEmpty(excel.getDbHandleStatus()) && Common.isEmpty(excel.getGsHandleStatus())
@@ -5284,7 +5284,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 			dispatch = dispatchMap.get(excel.getEmpIdcard());
 			if (Common.isEmpty(dispatch)) {
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_IMPORT_HANDLE_NOT_EMPY), excel));
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SOCIAL_IMPORT_HANDLE_NOT_EXITS), excel));
 				continue;
 			}
 
@@ -5324,15 +5324,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				if (socialSucessType.length() > 1) {
 					// 执行数据插入操作 组装
 					messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ZERO_STRING, user
-							, 0, CommonConstants.ONE_STRING, "", socialSucessType.substring(0, socialSucessType.length() - 1), excel.getRemark());
+							, 0, CommonConstants.ONE_STRING, excel.getReasonType() + CommonConstants.COLON_STRING + ServiceUtil.ifNullToEmpty(excel.getRemark()), socialSucessType.substring(0, socialSucessType.length() - 1), excel.getReasonType() + CommonConstants.COLON_STRING + ServiceUtil.ifNullToEmpty(excel.getRemark()));
+					if (Common.isNotNull(messageList)) {
+						errorMessage = messageList.get(CommonConstants.ZERO_INT);
+						errorMessage.setData(excel);
+					}else {
+						errorMessage = new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS, CommonConstants.GREEN, excel);
+					}
+					errorMessageList.add(errorMessage);
 				}
 				//办理失败处理
 				if (socialFailureType.length() > 1) {
 					// 执行数据插入操作 组装
 					messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ZERO_STRING, user
-							, 1, CommonConstants.TWO_STRING, excel.getReasonType(), socialFailureType.substring(0, socialFailureType.length() - 1), excel.getReasonType() + CommonConstants.COLON_STRING + excel.getRemark());
-				}
-
+							, 1, CommonConstants.TWO_STRING, excel.getReasonType() + CommonConstants.COLON_STRING + ServiceUtil.ifNullToEmpty(excel.getRemark()), socialFailureType.substring(0, socialFailureType.length() - 1), excel.getReasonType() + CommonConstants.COLON_STRING + ServiceUtil.ifNullToEmpty(excel.getRemark()));
 					if (Common.isNotNull(messageList)) {
 						errorMessage = messageList.get(CommonConstants.ZERO_INT);
 						errorMessage.setData(excel);
@@ -5340,6 +5345,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						errorMessage = new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS, CommonConstants.GREEN, excel);
 					}
 					errorMessageList.add(errorMessage);
+				}
 			} catch (Exception e) {
 				log.error("批量导入办理异常：", e);
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_FAILED, excel));