Commit 83c8de2a authored by wangzb's avatar wangzb

feature-wzb :档案和社保处Bug修复

parent d6dcde1c
...@@ -368,14 +368,13 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -368,14 +368,13 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
List<FeedBackDetail> list = feedbackDetailMapper.getAll(); List<FeedBackDetail> list = feedbackDetailMapper.getAll();
for (FeedBackDetail feedBackDetail : list) { for (FeedBackDetail feedBackDetail : list) {
FeedBackDetail feedBackDetail1 = feedbackDetailMapper.findByApplyNo(feedBackDetail.getApplyNo()); FeedBackDetail feedBackDetail1 = feedbackDetailMapper.findByApplyNo(feedBackDetail.getApplyNo());
if (Objects.equals(feedBackDetail.getApplyNo(), contract.getApplyNo())) { if(null!=feedbackDetailMapper.findByApplyNo(contract.getApplyNo())){
if (feedBackDetail1.getIsFeedback().equals(CommonConstants.ONE_INT)) { alert.setIsFeedback(feedBackDetail1.getIsFeedback());
alert.setIsFeedback(CommonConstants.ONE_INT);
alert.setFeedbackDetail(feedBackDetail1.getFeedbackDetail()); alert.setFeedbackDetail(feedBackDetail1.getFeedbackDetail());
alert.setFeedbackReason(feedBackDetail1.getFeedbackReason()); alert.setFeedbackReason(feedBackDetail1.getFeedbackReason());
alert.setFeedbackPerson(feedBackDetail1.getFeedbackPerson()); alert.setFeedbackPerson(feedBackDetail1.getFeedbackPerson());
alert.setFeedbackTime(feedBackDetail1.getFeedbackTime()); alert.setFeedbackTime(feedBackDetail1.getFeedbackTime());
}
} else { } else {
alert.setIsFeedback(CommonConstants.ZERO_INT); alert.setIsFeedback(CommonConstants.ZERO_INT);
} }
......
...@@ -150,7 +150,8 @@ public class TDispatchImportVo extends RowIndex implements Serializable { ...@@ -150,7 +150,8 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/** /**
* 通信地址 * 通信地址
*/ */
@Length(max = 200, message = "通信地址不能超过200个字符" )
@ExcelAttribute(name = "通信地址", maxLength = 200)
@Schema(description = "通信地址" ) @Schema(description = "通信地址" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("通信地址" ) @ExcelProperty("通信地址" )
......
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