同义词修改

icssman-service/src/main/java/com/diagbot/dto/GetRetrievalsByTagDTO.java

@@ -36,6 +36,19 @@ public class GetRetrievalsByTagDTO {
 	@ApiModelProperty(value="同义词名称")
 	private String retrievalName;
 	
+	/**
+	 * 同义词拼音
+	 */
+	@ApiModelProperty(value="同义词拼音")
+	private String retrievalSpell;
+	
+	/**
+	 * 同义词种类,1：本体，2：同义词3：组合项目(生命体征-脉搏)
+	 */
+	@ApiModelProperty(value="同义词种类,1：本体，2：同义词3：组合项目(生命体征-脉搏)")
+	private Integer retrievalType;
+	
+	
 	
 
 }

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacede.java

@@ -63,7 +63,6 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 		if(retrieval==null){
 			retrieval = new Retrieval();
 			retrieval.setName(addTagRetrievalVO.getRetrievalName());
-			this.save(retrieval);
 		}else{
 			QueryWrapper<RetrievalMapping> queryWrapper2 = new QueryWrapper<RetrievalMapping>();
 			queryWrapper2.eq("retrieval_id", retrieval.getId());
@@ -71,9 +70,13 @@ public class RetrievalFacede extends RetrievalServiceImpl {
 			retrievalMappingFacede.remove(queryWrapper2);
 		}
 		
+		retrieval.setSpell(addTagRetrievalVO.getRetrievalSpell());
+		this.saveOrUpdate(retrieval);
+		
 		RetrievalMapping retrievalMapping = new RetrievalMapping();
 		retrievalMapping.setQuestionId(addTagRetrievalVO.getQuestionId());
 		retrievalMapping.setRetrievalId(retrieval.getId());
+		retrievalMapping.setShowType(addTagRetrievalVO.getRetrievalType());
 		retrievalMappingFacede.save(retrievalMapping);
 		
 		addTagRetrievalDTO.setRetrievalId(retrieval.getId());

icssman-service/src/main/java/com/diagbot/vo/AddTagRetrievalVO.java

@@ -33,4 +33,18 @@ public class AddTagRetrievalVO {
 	@NotBlank(message="同义词名称必传")
 	private String retrievalName;
 	
+	/**
+	 * 同义词拼音
+	 */
+	@ApiModelProperty(value="同义词拼音",required=true)
+	@NotBlank(message="同义词拼音必传")
+	private String retrievalSpell;
+	
+	/**
+	 * 同义词种类
+	 */
+	@ApiModelProperty(value="同义词种类",required=true)
+	@NotNull(message="同义词种类必传")
+	private Integer retrievalType;
+	
 }

icssman-service/src/main/resources/mapper/RetrievalMapper.xml

@@ -20,7 +20,9 @@
 		SELECT
 			c.id as retrievalId,
 			b.id as retrievalMappingId,
-			c.`name` as retrievalName
+			c.`name` as retrievalName,
+			c.spell as retrievalSpell,
+			b.show_type as retrievalType
 		FROM icss_question_info a 
 		JOIN icss_retrieval_mapping b
 		ON a.id=b.question_id