fix:修改结构

This commit is contained in:
zhangqinlin
2022-07-14 18:17:13 +08:00
parent 9497e40b1e
commit 411334d789
21 changed files with 516 additions and 68 deletions
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.system.base.entity.JeroEntity;
import com.jero.meeting.entity.PayMeetingStandard;
import com.jero.standards.jiudian.hotelcontact.entity.HotelContact;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -300,9 +301,9 @@ public class StableCrossTraining extends JeroEntity {
@ApiModelProperty(value = "是否需要问题征集")
private String isAddQuestion;
/**征集问题text*/
@TableField(exist = false)
@ApiModelProperty(value = "征集问题text")
private String questions;
private List<PayMeetingStandard> questionList;
/**征集截止日期*/
@Excel(name = "征集截止日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -121,7 +121,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
stableCrossTraining.setHotelList(hotelList);
//问题征集
stableCrossTraining.setIsAddQuestion(payMeeting.getIsAddQuestion());
stableCrossTraining.setQuestions(payMeeting.getQuestions());
stableCrossTraining.setQuestionList(payMeeting.getQuestionList());
stableCrossTraining.setEndTimeAddQuestion(payMeeting.getEndTimeAddQuestion());
return stableCrossTraining;
}