问卷题目增加字段 questionNameAlias
This commit is contained in:
zhuangyuanke
parent
a972c21e81
commit
e68836950c
@ -51,8 +51,8 @@ public class QuestionSubject extends BaseEntity {
|
||||
* 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT，
|
||||
* 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT
|
||||
*/
|
||||
@ApiModelProperty(value = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS，组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT")
|
||||
@Excel(name = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT")
|
||||
@ApiModelProperty(value = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS，组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT;反馈填空题：FEEDBACK_BLANKS_SUBJECT")
|
||||
@Excel(name = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT;反馈填空题：FEEDBACK_BLANKS_SUBJECT")
|
||||
private String questionType;
|
||||
|
||||
/**
|
||||
@ -62,6 +62,14 @@ public class QuestionSubject extends BaseEntity {
|
||||
@Excel(name = "题目名称")
|
||||
private String questionName;
|
||||
|
||||
/**
|
||||
* 题目名称别名
|
||||
*/
|
||||
@ApiModelProperty(value = "题目名称")
|
||||
@Excel(name = "题目名称")
|
||||
private String questionNameAlias;
|
||||
|
||||
|
||||
/**
|
||||
* 题目说明
|
||||
*/
|
||||
|
||||
@ -591,12 +591,12 @@ public class AIOBServiceImpl implements IAIOBService {
|
||||
List<QuestionSubjectVO> questionSubjectList = questionSubjectMapper.selectQuestionSubjectBy(node.getQuestionInfoId());
|
||||
questionSubjectList.forEach(questionSubjectVO -> {
|
||||
// 判断问题中有无变量，有变量替换变量
|
||||
String questionName = replaceQuestionName(questionSubjectVO.getQuestionName(), labelFieldContentList);
|
||||
String questionNameAlias = replaceQuestionName(questionSubjectVO.getQuestionNameAlias(), labelFieldContentList);
|
||||
// 根据通话记录筛查是否询问该问题
|
||||
boolean hasQuestion = false;
|
||||
String aiobQuestionName = "";
|
||||
for (String questionContent : contextMap.keySet()) {
|
||||
if (questionContent.replaceAll("\\p{P}", "").contains(questionName.replaceAll("\\p{P}", ""))) {
|
||||
if (questionContent.replaceAll("\\p{P}", "").contains(questionNameAlias.replaceAll("\\p{P}", ""))) {
|
||||
hasQuestion = true;
|
||||
aiobQuestionName = questionContent;
|
||||
break;
|
||||
@ -702,16 +702,16 @@ public class AIOBServiceImpl implements IAIOBService {
|
||||
return null;
|
||||
}
|
||||
|
||||
private String replaceQuestionName(String questionName, List<LabelFieldInfoContentVo> labelFieldContentList) {
|
||||
private String replaceQuestionName(String questionNameAlias, List<LabelFieldInfoContentVo> labelFieldContentList) {
|
||||
Pattern pattern = Pattern.compile("\\{%\\s*&[\\s\\S]*?\\s*%}");
|
||||
Matcher matcher = pattern.matcher(questionName);
|
||||
Matcher matcher = pattern.matcher(questionNameAlias);
|
||||
while (matcher.find()) {
|
||||
LabelFieldInfoContentVo labelFieldContent = labelFieldContentList.stream().filter(s -> Objects.equals(s.getFieldCode(), matcher.group(1).replaceAll("_", "").toUpperCase())).findFirst().orElse(null);
|
||||
if (ObjectUtils.isNotEmpty(labelFieldContent)) {
|
||||
questionName = questionName.replaceAll("\\{%\\s*&[\\s\\S]*?\\s*%}", ObjectUtils.isEmpty(labelFieldContent) ? "" : labelFieldContent.getFieldValue());
|
||||
questionNameAlias = questionNameAlias.replaceAll("\\{%\\s*&[\\s\\S]*?\\s*%}", ObjectUtils.isEmpty(labelFieldContent) ? "" : labelFieldContent.getFieldValue());
|
||||
}
|
||||
}
|
||||
return questionName;
|
||||
return questionNameAlias;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
<result property="questionNumber" column="question_number"/>
|
||||
<result property="questionType" column="question_type"/>
|
||||
<result property="questionName" column="question_name"/>
|
||||
<result property="questionNameAlias" column="question_name_alias"/>
|
||||
<result property="questionDescription" column="question_description"/>
|
||||
<result property="writeDescription" column="write_description"/>
|
||||
<result property="fillBlanksAnswer" column="fill_blanks_answer"/>
|
||||
@ -35,6 +36,7 @@
|
||||
question_number,
|
||||
question_type,
|
||||
question_name,
|
||||
question_name_alias,
|
||||
question_description,
|
||||
write_description,
|
||||
fill_blanks_answer,
|
||||
@ -70,6 +72,9 @@
|
||||
<if test="questionName != null and questionName != ''">
|
||||
and question_name like concat('%', #{questionName}, '%')
|
||||
</if>
|
||||
<if test="questionNameAlias != null and questionNameAlias != ''">
|
||||
and question_name_alias like concat('%', #{questionNameAlias}, '%')
|
||||
</if>
|
||||
<if test="questionDescription != null and questionDescription != ''">
|
||||
and question_description = #{questionDescription}
|
||||
</if>
|
||||
@ -130,6 +135,8 @@
|
||||
</if>
|
||||
<if test="questionName != null">question_name,
|
||||
</if>
|
||||
<if test="questionNameAlias != null">question_name_alias,
|
||||
</if>
|
||||
<if test="questionDescription != null">question_description,
|
||||
</if>
|
||||
<if test="writeDescription != null">write_description,
|
||||
@ -174,6 +181,8 @@
|
||||
</if>
|
||||
<if test="questionName != null">#{questionName},
|
||||
</if>
|
||||
<if test="questionNameAlias != null">#{questionNameAlias},
|
||||
</if>
|
||||
<if test="questionDescription != null">#{questionDescription},
|
||||
</if>
|
||||
<if test="writeDescription != null">#{writeDescription},
|
||||
@ -226,6 +235,9 @@
|
||||
<if test="questionName != null">question_name =
|
||||
#{questionName},
|
||||
</if>
|
||||
<if test="questionNameAlias != null">question_name_alias =
|
||||
#{questionNameAlias},
|
||||
</if>
|
||||
<if test="questionDescription != null">question_description =
|
||||
#{questionDescription},
|
||||
</if>
|
||||
@ -300,6 +312,7 @@
|
||||
question_number,
|
||||
question_type,
|
||||
question_name,
|
||||
question_name_alias,
|
||||
question_description,
|
||||
write_description,
|
||||
fill_blanks_answer,
|
||||
@ -322,6 +335,7 @@
|
||||
#{QuestionSubject.questionNumber},
|
||||
#{QuestionSubject.questionType},
|
||||
#{QuestionSubject.questionName},
|
||||
#{QuestionSubject.questionNameAlias},
|
||||
#{QuestionSubject.questionDescription},
|
||||
#{QuestionSubject.writeDescription},
|
||||
#{QuestionSubject.fillBlanksAnswer},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user