From 0ff7a8f69570b3fc7418c35f3d6e273ef4f73f20 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 10:35:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskOptionAnswer.java | 2
smartor/src/main/java/com/smartor/domain/ServiceSubtaskAnswer.java | 5 +
smartor/src/main/java/com/smartor/domain/HeLibrary.java | 6 ++
smartor/src/main/java/com/smartor/domain/HeLibraryAssortVO.java | 6 ++
smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java | 2
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java | 28 +++------
smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 2
smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml | 8 ++
smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java | 2
smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java | 8 +-
smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml | 6 -
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 45 ++++++++-------
smartor/src/main/java/com/smartor/domain/HeLibraryAssort.java | 6 ++
smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml | 8 ++
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java | 2
16 files changed, 82 insertions(+), 55 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
index 7250e3e..6c030ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
@@ -133,7 +133,7 @@
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
@PostMapping("/selectInfoByCondition")
public AjaxResult selectInfoByCondition(@RequestBody IvrLibaTemplateVO ivrLibaTemplateVO) {
- if (ivrLibaTemplateVO.getID() == null) {
+ if (ivrLibaTemplateVO.getId() == null) {
return success();
}
return success(ivrLibaTemplateService.selectInfoByCondition(ivrLibaTemplateVO));
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibrary.java b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
index 2c0911c..bf4f204 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibrary.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
@@ -28,6 +28,12 @@
private Long id;
/**
+ * 绫诲瀷锛�1瀹ｆ暀 2閫氱煡
+ */
+ @ApiModelProperty("绫诲瀷锛�1瀹ｆ暀 2閫氱煡")
+ private String hetype;
+
+ /**
* 瀹ｆ暀鍒嗙被
*/
@Excel(name = " 瀹ｆ暀鍒嗙被 ")
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibraryAssort.java b/smartor/src/main/java/com/smartor/domain/HeLibraryAssort.java
index 7831463..2fc4d15 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibraryAssort.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibraryAssort.java
@@ -49,6 +49,12 @@
private String delFlag;
/**
+ * 绫诲瀷锛�1瀹ｆ暀 2閫氱煡
+ */
+ @ApiModelProperty("绫诲瀷锛�1瀹ｆ暀 2閫氱煡")
+ private String hetype;
+
+ /**
* 涓婁紶鏍囪
*/
@Excel(name = " 涓婁紶鏍囪 ")
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibraryAssortVO.java b/smartor/src/main/java/com/smartor/domain/HeLibraryAssortVO.java
index 9bf849c..c086395 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibraryAssortVO.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibraryAssortVO.java
@@ -38,6 +38,12 @@
private String assortname;
/**
+ * 绫诲瀷锛�1瀹ｆ暀 2閫氱煡
+ */
+ @ApiModelProperty("绫诲瀷锛�1瀹ｆ暀 2閫氱煡")
+ private String hetype;
+
+ /**
* 鏈烘瀯ID
*/
@Excel(name = " 鏈烘瀯ID ")
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java
index 3f0ff55..6e1b79e 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTag.java
@@ -39,7 +39,7 @@
* 鏍囩ID
*/
@ApiModelProperty(value = "鏍囩ID")
- @Excel(name = " 鏍囩ID ")
+ @Excel(name = " baseTag鏍囩ID ")
private Long tagid;
/**
@@ -78,10 +78,10 @@
private Date uploadTime;
/**
- * 鏍囩ID
+ * 鎸囨爣ID
*/
- @ApiModelProperty(value = "鏍囩ID")
- @Excel(name = "鏍囩ID ")
+ @ApiModelProperty(value = "鎸囨爣ID")
+ @Excel(name = "鎸囨爣ID ")
private Long targetid;
/**
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
index 987bdc6..6d77ccb 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
@@ -211,7 +211,7 @@
private List<IvrLibaTargetoption> targetoptionList = new ArrayList<>();
@ApiModelProperty(value = "鏍囩闆嗗悎")
- private List<BaseTag> baseTagList = new ArrayList<>();
+ private List<IvrLibaTargetTag> ivrLibaTargetTagList = new ArrayList<>();
@ApiModelProperty(value = "鍥炲锛堟寚闂鐨勫洖澶嶏紝缁欓棶绛旈鐢ㄧ殑锛�")
private String reply;
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
index 8f224d4..70b2ebd 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
@@ -27,7 +27,7 @@
* 涓婚敭
*/
@ApiModelProperty(value = "涓婚敭")
- private Long ID;
+ private Long id;
/**
* 妯℃澘ID
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java
index f67ef27..dab5945 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java
@@ -23,7 +23,7 @@
/**
* 浠诲姟ID
*/
- @Nonnull
+
@ApiModelProperty(value = "浠诲姟ID")
private Long taskid;
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskAnswer.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskAnswer.java
index bc43e63..9691cdb 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskAnswer.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskAnswer.java
@@ -1,6 +1,7 @@
package com.smartor.domain;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -118,5 +119,9 @@
@ApiModelProperty(value = "GUID")
private String guid;
+ /**
+ * 闂绛旀
+ */
+ private List<ServiceSubtaskOptionAnswer> optionAnswer;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskOptionAnswer.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskOptionAnswer.java
index 96b6e02..c184ddd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskOptionAnswer.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskOptionAnswer.java
@@ -16,7 +16,7 @@
*/
@ApiModel(value = "ServiceSubtaskOptionAnswer", description = "澶栭摼閫夐」缁撴灉")
@Data
-public class ServiceSubtaskOptionAnswer extends BaseEntity {
+public class ServiceSubtaskOptionAnswer {
private static final long serialVersionUID = 1L;
/**
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index e31e958..ac7b3a5 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -94,8 +94,10 @@
ivrLibaTarget1.setTargetoptionList(ivrLibaTargetoptions);
}
//鑾峰彇璇ユ寚鏍囩殑鏍囩
- List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getId());
- ivrLibaTarget1.setBaseTagList(baseTags);
+ IvrLibaTargetTag ivrLibaTargetTag =new IvrLibaTargetTag();
+ ivrLibaTargetTag.setTargetid(ivrLibaTarget1.getId());
+ List<IvrLibaTargetTag> ivrLibaTargetTags = ivrLibaTargetTagMapper.selectIvrLibaTargetTagList(ivrLibaTargetTag);
+ ivrLibaTarget1.setIvrLibaTargetTagList(ivrLibaTargetTags);
}
//涓嬮潰鐢ㄥ乏澶栨劅瑙夋湁鐐归棶棰橈紝where涓殑option鐨刣el浼氬鑷村乏杈圭殑鏌ヨ涓嶅叏锛屽厛涓嶇敤鍚�
// ivrLibaTargetMapper.targetInfo(ivrLibaTarget)
@@ -117,12 +119,8 @@
ivrLibaTargetMapper.insertIvrLibaTarget(ivrLibaTarget);
//鏂板璇ユ寚鏍囧搴旂殑鏍囩淇℃伅
- for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
- IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
- ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
+ for (IvrLibaTargetTag ivrLibaTargetTag : ivrLibaTargetVO.getIvrLibaTargetTagList()) {
ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
- //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
- ivrLibaTargetTag.setTagid(baseTag.getTagid());
ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
}
@@ -159,21 +157,15 @@
ivrLibaTargetMapper.updateIvrLibaTarget(ivrLibaTarget);
}
- if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getBaseTagList())) {
- for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
- if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 1) {
+ if (CollectionUtils.isNotEmpty(ivrLibaTargetVO.getIvrLibaTargetTagList())) {
+ for (IvrLibaTargetTag ivrLibaTargetTag : ivrLibaTargetVO.getIvrLibaTargetTagList()) {
+ if (ivrLibaTargetTag.getId() == null) {
//鏂板
- IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
- ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
- //鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
- ivrLibaTargetTag.setTagid(baseTag.getTagid());
ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
- } else if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 2) {
+ } else if (ivrLibaTargetTag.getId() != null) {
//鍓嶇椤甸潰搴旇娌℃湁淇敼
- } else if (baseTag.getIsoperation() != null && baseTag.getIsoperation() == 3) {
- //鍒犻櫎
- ivrLibaTargetTagMapper.deleteIvrLibaTargetTagById(baseTag.getTagid());
+ ivrLibaTargetTagMapper.updateIvrLibaTargetTag(ivrLibaTargetTag);
}
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 5333257..ae06130 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -1,6 +1,10 @@
package com.smartor.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
@@ -116,8 +120,11 @@
if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
//闇�瑕佺珛鍗虫墽琛�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
- Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+// Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
+// Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+
+ Long tid=Long.valueOf(serviceSubTaskAnswerReq.getParam1());
+ Long pid=Long.valueOf(serviceSubTaskAnswerReq.getParam2());
allKeys = new HashSet<>();
if (serviceSubTaskAnswerReq.getType() == 1) {
@@ -185,8 +192,10 @@
@Override
public Integer saveQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
- Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
+// Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
+// Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
+ Long tid=Long.valueOf(serviceSubTaskCacheReq.getParam1());
+ Long pid=Long.valueOf(serviceSubTaskCacheReq.getParam2());
if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList())) {
//闅忚
redisCache.setCacheObject(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList());
@@ -205,12 +214,20 @@
serviceSubtaskAnswer.setPatId(serviceSubTaskQueryReq.getPatId());
serviceSubtaskAnswer.setScriptid(serviceSubTaskQueryReq.getScriptid());
List<ServiceSubtaskAnswer> serviceSubtaskAnswerList = serviceSubtaskAnswerMapper.selectServiceSubtaskAnswerList(serviceSubtaskAnswer);
+ for (ServiceSubtaskAnswer serviceSubtaskAnswer1 : serviceSubtaskAnswerList) {
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ List<ServiceSubtaskOptionAnswer> serviceSubtaskOptionAnswer = mapper.readValue(serviceSubtaskAnswer1.getAnswer(), List.class);
+ serviceSubtaskAnswer1.setOptionAnswer(serviceSubtaskOptionAnswer);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ }
return serviceSubtaskAnswerList;
}
-
private void setSFInfo(IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, Long taskid, Long patid) {
- ServiceSubtaskAnswer serviceSubtaskAnswer = null;
+ ServiceSubtaskAnswer serviceSubtaskAnswer = new ServiceSubtaskAnswer();
List<ServiceSubtaskOptionAnswer> answerList = new ArrayList<>();
if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptType()) && ivrTaskTemplateScriptVO.getScriptType().equals("1") || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptType()) && ivrTaskTemplateScriptVO.getScriptType().equals("2")) {
//1銆�2涓哄崟閫夋垨澶氶��
@@ -225,22 +242,8 @@
answerList.add(serviceSubtaskOptionAnswer);
}
}
- } else if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptType()) && ivrTaskTemplateScriptVO.getScriptType().equals("4")) {
- //濉┖
- for (IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption : ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList()) {
- log.error("ivrTaskTemplateTargetoption鐨勫�间负锛歿}", ivrTaskTemplateTargetoption);
- String[] split = ivrTaskTemplateTargetoption.getTargetvalue().split("|");
- for (String s : split) {
- ServiceSubtaskOptionAnswer serviceSubtaskOptionAnswer = new ServiceSubtaskOptionAnswer();
- serviceSubtaskOptionAnswer.setId(ivrTaskTemplateTargetoption.getId());
- serviceSubtaskOptionAnswer.setCode(ivrTaskTemplateTargetoption.getOptionCode());
- serviceSubtaskOptionAnswer.setValue(s);
- serviceSubtaskOptionAnswer.setAppenddesc(ivrTaskTemplateTargetoption.getAppenddesc());
- answerList.add(serviceSubtaskOptionAnswer);
- }
- }
} else {
- //闈炲崟澶氶�夛紙闂瓟锛�
+ //闈炲崟澶氶��
if (CollectionUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList())) {
log.error("IvrTaskScriptTargetoptionList鐨勫�间负锛歿}", ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList());
ServiceSubtaskOptionAnswer serviceSubtaskOptionAnswer = new ServiceSubtaskOptionAnswer();
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
index 4770062..c74078e 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
@@ -18,11 +18,13 @@
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="seqno" column="seqno"/>
+ <result property="hetype" column="hetype"/>
</resultMap>
<sql id="selectHeLibraryAssortVo">
select id,
assortname,
+ hetype,
orgid,
del_flag,
update_by,
@@ -49,6 +51,7 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="seqno != null ">and seqno = #{seqno}</if>
+ <if test="hetype != null ">and hetype = #{hetype}</if>
</where>
order by seqno asc
@@ -81,6 +84,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="seqno != null">seqno,</if>
+ <if test="hetype != null">hetype,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="assortname != null">#{assortname},</if>
@@ -95,6 +99,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="seqno != null">#{seqno},</if>
+ <if test="hetype != null">#{hetype},</if>
</trim>
</insert>
@@ -112,6 +117,7 @@
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
+ <if test="hetype != null">hetype = #{hetype},</if>
</trim>
where id = #{id}
</update>
@@ -130,4 +136,4 @@
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
index eb8ce08..69f4dec 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
@@ -38,11 +38,13 @@
<result property="campus" column="campus"/>
<result property="otherdata" column="otherdata"/>
<result property="richText" column="rich_text"/>
+ <result property="hetype" column="hetype"/>
</resultMap>
<sql id="selectHeLibraryVo">
select id,
classification,
+ hetype,
assortid,
preachname,
version,
@@ -112,6 +114,7 @@
<if test="labelInfo != null and labelInfo != ''">and label_info = #{labelInfo}</if>
<if test="campus != null and campus != ''">and campus = #{campus}</if>
<if test="richText != null and richText != ''">and rich_text = #{richText}</if>
+ <if test="hetype != null and hetype != ''">and hetype = #{hetype}</if>
</where>
</select>
@@ -155,6 +158,7 @@
<if test="campus != null">campus,</if>
<if test="otherdata != null">otherdata,</if>
<if test="richText != null and richText != ''">rich_text,</if>
+ <if test="hetype != null and hetype != ''">hetype,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="classification != null">#{classification},</if>
@@ -189,6 +193,7 @@
<if test="campus != null">#{campus},</if>
<if test="otherdata != null">#{otherdata},</if>
<if test="richText != null and richText != ''">#{richText},</if>
+ <if test="hetype != null and hetype != ''">#{hetype},</if>
</trim>
</insert>
@@ -227,6 +232,7 @@
<if test="campus != null">campus = #{campus},</if>
<if test="otherdata != null">otherdata = #{otherdata},</if>
<if test="richText != null and richText != ''">rich_text = #{richText},</if>
+ <if test="hetype != null and hetype != ''">hetype = #{hetype},</if>
</trim>
where id = #{id}
</update>
@@ -245,4 +251,4 @@
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
index a00925c..4333d15 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
@@ -45,6 +45,7 @@
resultMap="IvrLibaTargetTagResult">
<include refid="selectIvrLibaTargetTagVo"/>
<where>
+ del_flag=0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagid != null ">and tagid = #{tagid}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml
index e7bb891..548d86b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml
@@ -13,7 +13,7 @@
<result property="score" column="score"/>
<result property="answer" column="answer"/>
<result property="comment" column="comment"/>
- <result property="trackFlag" column="trackFlag"/>
+ <result property="trackFlag" column="track_flag"/>
<result property="warningFlag" column="warning_flag"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
@@ -37,10 +37,6 @@
score,
answer,
comment,
- track_flag,
- warning_flag,
- del_flag,
- create_by,
create_time,
update_by,
update_time,
--
Gitblit v1.9.3