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

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

@@ -443,6 +443,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 	public boolean changeFeedBackAll(ChangeFeedBackAllVo changeFeedBackAllVo) {
 		YifuUser user = SecurityUtils.getUser();
 		FeedBackDetail feedbackDetail;
+		List<FeedBackDetail>  details = new ArrayList<>();
 		for (int i = 0; i < changeFeedBackAllVo.getIds().length; i++) {
 			feedbackDetail = new FeedBackDetail();
 			feedbackDetail.setFeedbackPerson(user.getNickname());
@@ -451,9 +452,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 			feedbackDetail.setFeedbackReason(changeFeedBackAllVo.getFeedbackReason());
 			feedbackDetail.setFeedbackDetail(changeFeedBackAllVo.getFeedbackDetail());
 			feedbackDetail.setIsFeedback(CommonConstants.ONE_INT);
-			feedbackDetailMapper.insert(feedbackDetail);
+			details.add(feedbackDetail);
 		}
-		    changeFeedBackAllVo.setIsFeedback(CommonConstants.ONE_INTEGER);
+		if (Common.isNotEmpty(details)){
+			feedBackDetailService.saveBatch(details);
+		}
+		changeFeedBackAllVo.setIsFeedback(CommonConstants.ONE_INTEGER);
 		    changeFeedBackAllVo.setFeedbackPerson(user.getNickname());
 			changeFeedBackAllVo.setFeedbackTime(DateTime.now());
 	        return  baseMapper.changeFeedBackAll(changeFeedBackAllVo);

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java

@@ -121,13 +121,9 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 	@Transactional
 	@Override
 	public void updateOverTimeMsg() {
-		// 1. 删除未读的超时，如果有继续生成
-		baseMapper.delete(Wrappers.<MsgInfo>query().lambda()
-				.eq(MsgInfo::getReadStatus,CommonConstants.ZERO_STRING)
-				.eq(MsgInfo::getAlertType,CommonConstants.ONE_STRING));
+		// 获取所有已经产生的数据 后面直接排除
 		List<MsgInfo>  temps = baseMapper.selectList(Wrappers.<MsgInfo>query().lambda()
-				.eq(MsgInfo::getAlertType,CommonConstants.ONE_STRING)
-				.eq(MsgInfo::getReadStatus,CommonConstants.ONE_STRING));
+				.eq(MsgInfo::getAlertType,CommonConstants.ONE_STRING));
 		Map<String,MsgInfo> tempMap = new HashMap<>();
 		if (Common.isNotNull(temps)){
 			for (MsgInfo msg:temps){
@@ -180,13 +176,8 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 	@Transactional
 	@Override
 	public void statusChangeTimeMsg(){
-		// 1. 删除未读的待支出状态变更，如果有继续生成
-		baseMapper.delete(Wrappers.<MsgInfo>query().lambda()
-				.eq(MsgInfo::getReadStatus,CommonConstants.ZERO_STRING)
-				.eq(MsgInfo::getAlertType,CommonConstants.THREE_STRING));
 		List<MsgInfo>  temps = baseMapper.selectList(Wrappers.<MsgInfo>query().lambda()
-				.eq(MsgInfo::getAlertType,CommonConstants.THREE_STRING)
-				.eq(MsgInfo::getReadStatus,CommonConstants.ONE_STRING));
+				.eq(MsgInfo::getAlertType,CommonConstants.THREE_STRING));
 		Map<String,MsgInfo> tempMap = new HashMap<>();
 		if (Common.isNotNull(temps)){
 			for (MsgInfo msg:temps){

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

@@ -837,7 +837,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (excel.getEducationName().equals("中专")) {
 						vo.setHighEducation("11");
 					}
-
+					else {
+						vo.setHighEducation("");
+					}
 				}
 			}
 		}