Commit ec862349 authored by huyuchen's avatar huyuchen

合同修改

parent 2f6bed4e
...@@ -377,19 +377,15 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -377,19 +377,15 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}else { }else {
alert.setFirstAlertTime(new Date()); alert.setFirstAlertTime(new Date());
} }
List<FeedBackDetail> list = feedbackDetailMapper.getAll(); FeedBackDetail feedBackDetail1 = feedbackDetailMapper.findByApplyNo(contract.getApplyNo());
for (FeedBackDetail feedBackDetail : list) { if (null != feedBackDetail1) {
FeedBackDetail feedBackDetail1 = feedbackDetailMapper.findByApplyNo(feedBackDetail.getApplyNo()); alert.setIsFeedback(feedBackDetail1.getIsFeedback());
if(null!=feedbackDetailMapper.findByApplyNo(contract.getApplyNo())){ alert.setFeedbackDetail(feedBackDetail1.getFeedbackDetail());
alert.setIsFeedback(feedBackDetail1.getIsFeedback()); alert.setFeedbackReason(feedBackDetail1.getFeedbackReason());
alert.setFeedbackDetail(feedBackDetail1.getFeedbackDetail()); alert.setFeedbackPerson(feedBackDetail1.getFeedbackPerson());
alert.setFeedbackReason(feedBackDetail1.getFeedbackReason()); alert.setFeedbackTime(feedBackDetail1.getFeedbackTime());
alert.setFeedbackPerson(feedBackDetail1.getFeedbackPerson()); } else {
alert.setFeedbackTime(feedBackDetail1.getFeedbackTime()); alert.setIsFeedback(CommonConstants.ZERO_INT);
} else {
alert.setIsFeedback(CommonConstants.ZERO_INT);
}
} }
alert.setApplyNo(contract.getApplyNo()); alert.setApplyNo(contract.getApplyNo());
// 2023-4-3 09:38:21 hgw 添加 // 2023-4-3 09:38:21 hgw 添加
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment