代码提交

liusheng

2024-06-19 e52b0e34fc06372aab64c30b526ec289b99c9af7

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -97,6 +97,11 @@
    public void onMessage(Message message, byte[] pattern) {
        log.info("监听Redis key过期，key：{}，channel：{}", message.toString(), new String(pattern));
        String content = message.toString();
        //判断是不是任务信息，如果不是，直接返回，不需要执行
        if (!content.contains("taskid")) {
            log.info("不是任务信息");
            return;
        }
        IvrTaskcallMQ ivrTaskcallMQ = null;
        try {
            ObjectMapper mapper = new ObjectMapper();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/QRCodeController.java

@@ -5,6 +5,9 @@
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.mchange.v2.uid.UidUtils;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.config.ServerConfig;
import com.smartor.domain.Question;
import com.smartor.domain.SvyLibTemplate;
import freemarker.template.Configuration;
@@ -12,6 +15,9 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;

@@ -19,11 +25,9 @@
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@Slf4j
@Api(description = "问卷二维码")
@RestController
@RequestMapping("/qrcode")
@@ -34,6 +38,12 @@
    public QRCodeController(Configuration configuration) {
        this.configuration = configuration;
    }

    @Value("${ruoyi.profile}")
    private String profile;

    @Autowired
    private ServerConfig serverConfig;

    /**
     * é—®å·é¢˜ç›®
@@ -105,18 +115,22 @@
    }

    /**
     * @param reqid  é—®å·ID
     * @param userid ç”¨æˆ·ID
     * @param url é—®å·ID
     * @param url ç”¨æˆ·ID
     */
    @ApiOperation("获取问卷二维码")
    @GetMapping(value = "/getQRcode/{reqid}/{userid}")
    public void getQRcode(@PathVariable("reqid") String reqid, @PathVariable("userid") String userid) {
        String url = "http://192.168.2.10:8080/smartor/svytitle/generateStaticHtml";
        String filePath = "D:\\daima\\qrcode.png"; // ä¿å­˜äºŒç»´ç å›¾åƒçš„文件路径

    @PostMapping(value = "/getQRcode")
    public AjaxResult getQRcode(@RequestParam("url") String url) {
        log.info("获取问卷二维码的入参：{}", url);
        String uuid = UUID.randomUUID().toString().replace("-", "");
        String filePath = profile + "\\qrpath" + "\\" + uuid + ".png"; // ä¿å­˜äºŒç»´ç å›¾åƒçš„文件路径
        //判断文件夹是否存在
        File file = new File(profile + "\\qrpath");
        if (!file.exists()) {
            file.mkdirs();
        }
        generateQRCode(url, filePath);

        System.out.println("QR Code generated successfully!");
        return AjaxResult.success(serverConfig.getUrl() + "/profile/qrpath/" + uuid + ".png");
    }

    private void generateQRCode(String url, String filePath) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java

@@ -55,14 +55,14 @@
//        return success(svyLibTemplateService.selectSvyLibTemplateBySvyid(svyid));
//    }

    /**
     * æ–°å¢žé—®å·
     */
    @ApiOperation("新增问卷")
    @PostMapping("/addSvyLibTemplate")
    public AjaxResult addSvyLibTemplate(@RequestBody SvyLibTemplate svyLibTemplate) {
        return toAjax(svyLibTemplateService.insertSvyLibTemplate(svyLibTemplate));
    }
//    /**
//     * æ–°å¢žé—®å·
//     */
//    @ApiOperation("新增问卷")
//    @PostMapping("/addSvyLibTemplate")
//    public AjaxResult addSvyLibTemplate(@RequestBody SvyLibTemplate svyLibTemplate) {
//        return toAjax(svyLibTemplateService.insertSvyLibTemplate(svyLibTemplate));
//    }

    /**
     * æ–°å¢žæˆ–修改问卷模板信息

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.SvyLibTemplateScript;
import com.smartor.service.ISvyLibTemplateScriptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * æ¨¡æ¿é—®å·é¢˜ç›®Controller
 *
 * @author ls
 * @date 2024-06-18
 */
@RestController
@RequestMapping("/smartor/svytemplatescript")
public class SvyLibTemplateScriptController extends BaseController
{
    @Autowired
    private ISvyLibTemplateScriptService svyLibTemplateScriptService;

    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:script:list')")
    @GetMapping("/list")
    public TableDataInfo list(SvyLibTemplateScript svyLibTemplateScript)
    {
        startPage();
        List<SvyLibTemplateScript> list = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ¨¡æ¿é—®å·é¢˜ç›®åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:script:export')")
    @Log(title = "模板问卷题目", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SvyLibTemplateScript svyLibTemplateScript)
    {
        List<SvyLibTemplateScript> list = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        ExcelUtil<SvyLibTemplateScript> util = new ExcelUtil<SvyLibTemplateScript>(SvyLibTemplateScript.class);
        util.exportExcel(response, list, "模板问卷题目数据");
    }

    /**
     * èŽ·å–模板问卷题目详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:script:query')")
    @GetMapping(value = "/{topicid}")
    public AjaxResult getInfo(@PathVariable("topicid") Long topicid)
    {
        return success(svyLibTemplateScriptService.selectSvyLibTemplateScriptByTopicid(topicid));
    }

    /**
     * æ–°å¢žæ¨¡æ¿é—®å·é¢˜ç›®
     */
    @PreAuthorize("@ss.hasPermi('system:script:add')")
    @Log(title = "模板问卷题目", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
    {
        return toAjax(svyLibTemplateScriptService.insertSvyLibTemplateScript(svyLibTemplateScript));
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿é—®å·é¢˜ç›®
     */
    @PreAuthorize("@ss.hasPermi('system:script:edit')")
    @Log(title = "模板问卷题目", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
    {
        return toAjax(svyLibTemplateScriptService.updateSvyLibTemplateScript(svyLibTemplateScript));
    }

    /**
     * åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®
     */
    @PreAuthorize("@ss.hasPermi('system:script:remove')")
    @Log(title = "模板问卷题目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{topicids}")
    public AjaxResult remove(@PathVariable Long[] topicids)
    {
        return toAjax(svyLibTemplateScriptService.deleteSvyLibTemplateScriptByTopicids(topicids));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.SvyLibTemplateTargetoption;
import com.smartor.service.ISvyLibTemplateTargetoptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“Controller
 *
 * @author ruoyi
 * @date 2024-06-18
 */
@RestController
@RequestMapping("/smartor/svytargetoption")
public class SvyLibTemplateTargetoptionController extends BaseController
{
    @Autowired
    private ISvyLibTemplateTargetoptionService svyLibTemplateTargetoptionService;

    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“列表
     */
    @PreAuthorize("@ss.hasPermi('system:targetoption:list')")
    @GetMapping("/list")
    public TableDataInfo list(SvyLibTemplateTargetoption svyLibTemplateTargetoption)
    {
        startPage();
        List<SvyLibTemplateTargetoption> list = svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºé—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“列表
     */
    @PreAuthorize("@ss.hasPermi('system:targetoption:export')")
    @Log(title = "问卷问题指标选项库", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SvyLibTemplateTargetoption svyLibTemplateTargetoption)
    {
        List<SvyLibTemplateTargetoption> list = svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
        ExcelUtil<SvyLibTemplateTargetoption> util = new ExcelUtil<SvyLibTemplateTargetoption>(SvyLibTemplateTargetoption.class);
        util.exportExcel(response, list, "问卷问题指标选项库数据");
    }

    /**
     * èŽ·å–问卷问题指标选项库详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:targetoption:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionById(id));
    }

    /**
     * æ–°å¢žé—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    @PreAuthorize("@ss.hasPermi('system:targetoption:add')")
    @Log(title = "问卷问题指标选项库", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
    {
        return toAjax(svyLibTemplateTargetoptionService.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption));
    }

    /**
     * ä¿®æ”¹é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    @PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
    @Log(title = "问卷问题指标选项库", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
    {
        return toAjax(svyLibTemplateTargetoptionService.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption));
    }

    /**
     * åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    @PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
    @Log(title = "问卷问题指标选项库", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(svyLibTemplateTargetoptionService.deleteSvyLibTemplateTargetoptionByIds(ids));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/socket/SocketCommunication.java

@@ -7,7 +7,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.smartor.service.impl.RemoteDataSaveServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RestController;

@@ -15,14 +14,9 @@
import java.net.ServerSocket;
import java.net.Socket;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@RestController
@Slf4j

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -101,8 +101,8 @@
    timeout=60000:


accessKeyId: LTAI4G5zjJRkun2eRdzU8GhR
accessKeySecret: 6EIRr9uZeRobvHBRqskyGwjTLKpHYv
accessKeyId: LTAI5tPfc1VJzz7VuhzcBwug
accessKeySecret: gG1srKxPFDBNWe2oHfqmK1qsSQkf1e
signName: æ­å·žåˆ©æ¹–科技

#智能呼叫(上海)
@@ -132,3 +132,6 @@

#请求IP和端口号
req_path: 192.168.2.10:8099

#二维码路径
qrpath: D:\qrcode

 smartor/src/main/java/com/smartor/domain/IvrLibaScript.java

@@ -127,6 +127,13 @@
    private String targettype;

    /**
     * æŒ‡æ ‡æè¿°
     */
    @Excel(name = "指标描述")
    @ApiModelProperty(value = "指标描述")
    private String targetdesc;

    /**
     * æŒ‡æ ‡åç§°
     */
    @ApiModelProperty("指标名称")

 smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java

@@ -142,6 +142,13 @@
    private String targettype;

    /**
     * æŒ‡æ ‡æè¿°
     */
    @Excel(name = "指标描述")
    @ApiModelProperty(value = "指标描述")
    private String targetdesc;

    /**
     * æŒ‡æ ‡åç§°
     */
    @ApiModelProperty("指标名称")

 smartor/src/main/java/com/smartor/domain/SvyLibScript.java

@@ -65,6 +65,12 @@
    @Excel(name = " é¢˜ç›® ")
    @ApiModelProperty("题目")
    private String script;
    /**
     * é¢˜ç›®
     */
    @Excel(name = " é¢˜ç›®å›¾ç‰‡ ")
    @ApiModelProperty("题目图片")
    private String scriptPicture;

    /**
     * æŽ’序
@@ -174,6 +180,21 @@
    @ApiModelProperty(value = "回复（指问题的回复，给问答题用的）")
    private String reply;

    @ApiModelProperty(value = "分值类型：1：数字，2：等级")
    private String scoretype;

    @ApiModelProperty(value = "题目分值：数字1,2等；字母A、B，C，D等；")
    private String score;

    @ApiModelProperty(value = "适用疾病")
    private String icd10Name;

    @ApiModelProperty(value = "问题主题")
    private String topic;

    @ApiModelProperty(value = "适用疾病（数组）")
    private List<String> icd10NameList;

    /**
     * pageNum
     */

 smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java

@@ -157,7 +157,7 @@
     * é—®å·é¢˜ç›®é›†åˆ
     */
    @ApiModelProperty(value = "问卷题目集合")
    private List<SvyLibScript> svyLibTopics;
    private List<SvyLibTemplateScript> svyLibScripts;

    /**
     * æ¨¡æ¿ç§‘室关联集合
@@ -206,6 +206,12 @@
    private String otherdata = "";

    /**
     * é—®é¢˜æ€»åˆ†å€¼
     */
    @ApiModelProperty("问题总分值")
    private String scriptScore;

    /**
     * å€¼ç±»åž‹ï¼ˆ1 é€‰é¡¹  2 æ–‡æœ¬  3 æ•°å€¼ï¼‰
     */
    @ApiModelProperty(value = "值类型（1 é€‰é¡¹  2 æ–‡æœ¬  3 æ•°å€¼ï¼‰")
@@ -216,6 +222,9 @@
    @ApiModelProperty(value = "回复（指问题的回复，给问答题用的）")
    private String reply;

    @ApiModelProperty(value = "分数类型（数字，字母，等级）")
    private String scoreType;


    public SvyLibTemplate() {
    }

 smartor/src/main/java/com/smartor/domain/SvyLibTemplateScript.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,233 @@
package com.smartor.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.util.Date;
import java.util.List;

/**
 * æ¨¡æ¿é—®å·é¢˜ç›®å¯¹è±¡ svy_lib_template_script
 *
 * @author ruoyi
 * @date 2024-06-18
 */
@Data
@ApiModel(value = "SvyLibTemplateScript", description = "模板问卷题目对象")
public class SvyLibTemplateScript extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty("自增ID")
    private Long id;

    /**
     * è€ç‰ˆæœ¬ID
     */
    @Excel(name = " è€ç‰ˆæœ¬ID ")
    @ApiModelProperty("老版本ID")
    private Long oldid;

    /**
     * é—®å·ID
     */
    @Excel(name = " é—®å·ID ")
    @ApiModelProperty("问卷ID")
    private Long svyid;

    /**
     * é¢˜ç›®ç±»åž‹;枚举 1.单选 2多选 3填空 4其它
     */
    @Excel(name = " é¢˜ç›®ç±»åž‹;枚举 1.单选 2多选 3填空 4其它")
    @ApiModelProperty("题目类型;枚举 1.单选 2多选 3填空 4其它")
    private String scriptType;

    /**
     * é¢˜ç›®Code
     */
    @Excel(name = " é¢˜ç›®Code ")
    @ApiModelProperty("题目Code")
    private String scriptCode;

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    private Integer isoperation;

    /**
     * é¢˜ç›®
     */
    @Excel(name = " é¢˜ç›® ")
    @ApiModelProperty("题目")
    private String script;

    /**
     * é¢˜ç›®æ ‡ç­¾
     */
    @Excel(name = "题目标签")
    @ApiModelProperty("题目标签")
    private String tag;

    /**
     * æŽ’序
     */
    @Excel(name = " æŽ’序 ")
    @ApiModelProperty("排序")
    private Long sort;

    /**
     * æ˜¯å¦å¿…å¡«   0必填   1不必填
     */
    @Excel(name = " æ˜¯å¦å¿…å¡«   0必填   1不必填")
    @ApiModelProperty("是否必填   0必填   1不必填")
    private String ismandatory;

    /**
     * æ˜¯å¦éšè—
     */
    @Excel(name = " æ˜¯å¦éšè— ")
    @ApiModelProperty("是否隐藏")
    private Long ishide;

    /**
     * åˆ é™¤æ ‡è®°
     */
    @ApiModelProperty("删除标记")
    private String delFlag;

    /**
     * æœºæž„ID
     */
    @Excel(name = " æœºæž„ID ")
    @ApiModelProperty("机构ID")
    private String orgid;

    /**
     * ä¸Šä¼ æ ‡è®°
     */
    @Excel(name = " ä¸Šä¼ æ ‡è®° ")
    @ApiModelProperty("上传标记")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " ä¸Šä¼ æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty("上传时间")
    private Date uploadTime;

    /**
     * åºŸå¼ƒ
     */
    @ApiModelProperty("（废弃）")
    private Long svyTopicid;

    /**
     * çˆ¶ID
     */
    @Excel(name = "父ID")
    @ApiModelProperty("父ID")
    private Long pid;

    /**
     * GUID
     */
    @Excel(name = "GUID")
    @ApiModelProperty("GUID")
    private String guid;

    /**
     * åˆ†ç±»id
     */
    @Excel(name = "分类id")
    @ApiModelProperty("分类id")
    private Long categoryid;

    /**
     * é¢˜ç›®å†…容
     */
    @Excel(name = "题目内容")
    @ApiModelProperty("题目描述")
    private String scriptContent;

    /**
     * é¢˜ç›®å›¾ç‰‡
     */
    @Excel(name = "题目图片")
    @ApiModelProperty("题目图片")
    private String scriptPicture;

    /**
     * é€‚用方式：调查表1，智能语音2、人工3
     */
    @Excel(name = "适用方式：调查表1，智能语音2、人工3")
    @ApiModelProperty("适用方式：调查表1，智能语音2、人工3")
    private String suitway;

    /**
     * æ˜¯å¦å¯ç”¨ 0可用  1不可用
     */
    @Excel(name = "是否可用 0可用  1不可用")
    @ApiModelProperty("是否可用 0可用  1不可用")
    private String isavailable;

    /**
     * è¯­è¨€
     */
    @Excel(name = "语言")
    @ApiModelProperty("语言")
    private String language;

    /**
     * å…¶å®ƒæ•°æ®ï¼ˆå­˜å‚¨å˜é‡ï¼‰
     */
    @Excel(name = "其它数据", readConverterExp = "存=储变量")
    @ApiModelProperty("其它数据（存储变量）")
    private String otherdata;

    /**
     * å€¼ç±»åž‹ï¼ˆ1 é€‰é¡¹  2 æ–‡æœ¬  3 æ•°å€¼ï¼‰
     */
    @Excel(name = "值类型", readConverterExp = "1=,选=项,2=,文=本,3=,数=值")
    @ApiModelProperty("值类型（1 é€‰é¡¹  2 æ–‡æœ¬  3 æ•°å€¼ï¼‰")
    private String valueType;

    /**
     * å›žå¤ï¼ˆæŒ‡é—®é¢˜çš„回复，给问答题用的）
     */
    @Excel(name = "回复", readConverterExp = "指=问题的回复，给问答题用的")
    @ApiModelProperty("回复（指问题的回复，给问答题用的）")
    private String reply;

    /**
     * åˆ†å€¼ç±»åž‹ï¼š1：数字，2：等级
     */
    @Excel(name = "分值类型：1：数字，2：等级")
    @ApiModelProperty("分值类型：1：数字，2：等级")
    private String scoretype;

    /**
     * æ¨¡æ¿é—®é¢˜é€‰é¡¹é›†åˆ
     */
    @Excel(name = "模板问题选项集合")
    @ApiModelProperty("模板问题选项集合")
    private List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions;

    /**
     * é¢˜ç›®åˆ†å€¼ï¼šæ•°å­—1,2等；字母A、B，C，D等；
     */
    @Excel(name = "题目分值：数字1,2等；字母A、B，C，D等；")
    @ApiModelProperty("题目分值：数字1,2等；字母A、B，C，D等；")
    private String score;

}

 smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,239 @@
package com.smartor.domain;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“对象 svy_liba_template_targetoption
 *
 * @author ruoyi
 * @date 2024-06-18
 */
@Data
@ApiModel(value = "SvyLibTemplateTargetoption", description = "问卷问题指标选项库对象")
public class SvyLibTemplateTargetoption extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * ä¸»é”®
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * æ¨¡æ¿æŒ‡æ ‡ID
     */
    @Excel(name = "模板指标ID")
    @ApiModelProperty(value = "模板指标ID")
    private Long targetid;

    /**
     * æŒ‡æ ‡åç§°
     */
    @Excel(name = "指标名称")
    @ApiModelProperty(value = "指标名称")
    private String targetname;

    /**
     * æ¨¡æ¿ID
     */
    @Excel(name = "模板ID")
    @ApiModelProperty(value = "模板ID")
    private Long templateID;

    /**
     * è¯æœ¯ID
     */
    @Excel(name = "话术ID")
    @ApiModelProperty(value = "话术ID")
    private Long scriptid;

    /**
     * è¯æœ¯ID
     */
    @Excel(name = "预警阀值上限")
    @ApiModelProperty(value = "预警阀值上限")
    private Long warnup;

    /**
     * è¯æœ¯ID
     */
    @Excel(name = "预警阀值下限")
    @ApiModelProperty(value = "预警阀值下限")
    private Long warndown;

    /**
     * æ¨¡æ¿æŒ‡æ ‡ç±»åž‹
     */
    @Excel(name = "模板指标类型")
    @ApiModelProperty(value = "模板指标类型")
    private String targettype;

    /**
     * ç±»åˆ«åç§°
     */
    @Excel(name = "类别名称")
    @ApiModelProperty(value = "类别名称")
    private String categoryName = null;

    /**
     * æ¨¡æ¿æŒ‡æ ‡å€¼
     */
    @Excel(name = "模板指标值")
    @ApiModelProperty(value = "模板指标值")
    private String targetvalue;

    /**
     * æ¨¡æ¿æŒ‡æ ‡æ­£åˆ™
     */
    @Excel(name = "模板指标正则")
    @ApiModelProperty(value = "模板指标正则")
    private String targetregex;

    /**
     * æ¨¡æ¿æŒ‡æ ‡æ­£åˆ™
     */
    @Excel(name = "模板指标正则2")
    @ApiModelProperty(value = "模板指标正则2")
    private String targetregex2;

    @Excel(name = "正则关键字集合(含)")
    private String nodynamiccruxsJson;

    @Excel(name = "正则关键字集合(不含)")
    private String dynamiccruxsJson;

    @ApiModelProperty(value = "正则关键字(含)")
    @Excel(name = "正则关键字(含)")
    private List<String> nodynamiccruxs = new ArrayList<>();

    @ApiModelProperty(value = "正则关键字(不含)")
    @Excel(name = "正则关键字(不含)")
    private List<String> dynamiccruxs = new ArrayList<>();

    /**
     * é€‰é¡¹æè¿°
     */
    @Excel(name = "选项描述")
    @ApiModelProperty(value = "选项描述")
    private String optiondesc;

    /**
     * è¯­è¨€
     */
    @Excel(name = "语言")
    @ApiModelProperty(value = "语言")
    private String language;

    /**
     * ç‰ˆæœ¬
     */
    @Excel(name = "版本")
    @ApiModelProperty(value = "版本")
    private String version;

    /**
     * åˆ†ç»„ID
     */
    @Excel(name = "分组ID")
    @ApiModelProperty(value = "分组ID")
    private String groupid;

    /**
     * æ˜¯å¦å¼‚常标识
     */
    @Excel(name = "是否异常标识")
    @ApiModelProperty(value = "是否异常标识")
    private Long isabnormal;

//    /**
//     * é¢„警阀值上限
//     */
//    @Excel(name = "预警阀值上限")
//    @ApiModelProperty(value = "预警阀值上限")
//    private Long warnup;
//
//    /**
//     * é¢„警阀值下限
//     */
//    @Excel(name = "预警阀值下限")
//    @ApiModelProperty(value = "预警阀值下限")
//    private Long warndown;

    /**
     * åˆ é™¤æ ‡è®°
     */
    @ApiModelProperty(value = "删除标记")
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡è®°
     */
    @Excel(name = " ä¸Šä¼ æ ‡è®° ")
    @ApiModelProperty(value = "上传标记")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " ä¸Šä¼ æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "上传时间")
    private Date uploadTime;

    /**
     * æœºæž„ID
     */
    @Excel(name = " æœºæž„ID ")
    @ApiModelProperty(value = "机构ID")
    private String orgid;

    /**
     * çˆ¶ID
     */
    @Excel(name = "父ID")
    @ApiModelProperty(value = "父ID")
    private Long pid;

    /**
     * GUID
     */
    @Excel(name = "GUID")
    @ApiModelProperty(value = "GUID")
    private String guid;

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    private Integer isoperation;

    /**
     * æ˜¯å¦æ˜¯ç”¨æˆ·é€‰æ‹©çš„选项
     */
    @ApiModelProperty(value = "是否是用户选择的选项")
    private Boolean isUserOperation = false;


    /**
     * ä¸‹ä¸€é¢˜
     */
    @ApiModelProperty(value = "下一题")
    private Integer nextQuestion;

    /**
     * é€‰é¡¹å›¾ç‰‡è·¯å¾„
     */
    @ApiModelProperty(value = "选项图片路径")
    private String picturePath;

}

 smartor/src/main/java/com/smartor/domain/SvyTaskScript.java

@@ -176,8 +176,8 @@
    /**
     * é¢˜ç›®å›¾ç‰‡è·¯å¾„
     */
    @Excel(name = "题目图片路径")
    @ApiModelProperty(value = "题目图片路径")
    private String picturePath;
    @Excel(name = "题目图片")
    @ApiModelProperty(value = "题目图片")
    private String scriptPicture;

}

 smartor/src/main/java/com/smartor/mapper/SvyLibTemplateScriptMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.smartor.mapper;

import com.smartor.domain.SvyLibTemplateScript;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æ¨¡æ¿é—®å·é¢˜ç›®Mapper接口
 *
 * @author ls
 * @date 2024-06-18
 */
@Mapper
public interface SvyLibTemplateScriptMapper {
    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicid æ¨¡æ¿é—®å·é¢˜ç›®ä¸»é”®
     * @return æ¨¡æ¿é—®å·é¢˜ç›®
     */
    public SvyLibTemplateScript selectSvyLibTemplateScriptByTopicid(Long topicid);

    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®åˆ—表
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return æ¨¡æ¿é—®å·é¢˜ç›®é›†åˆ
     */
    public List<SvyLibTemplateScript> selectSvyLibTemplateScriptList(SvyLibTemplateScript svyLibTemplateScript);

    /**
     * æ–°å¢žæ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return ç»“æžœ
     */
    public int insertSvyLibTemplateScript(SvyLibTemplateScript svyLibTemplateScript);

    /**
     * ä¿®æ”¹æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return ç»“æžœ
     */
    public int updateSvyLibTemplateScript(SvyLibTemplateScript svyLibTemplateScript);

    /**
     * åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicid æ¨¡æ¿é—®å·é¢˜ç›®ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateScriptByTopicid(Long topicid);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateScriptByTopicids(Long[] topicids);
}

 smartor/src/main/java/com/smartor/mapper/SvyLibTemplateTargetoptionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.smartor.mapper;

import com.smartor.domain.SvyLibTemplateTargetoption;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“Mapper接口
 *
 * @author ruoyi
 * @date 2024-06-18
 */
@Mapper
public interface SvyLibTemplateTargetoptionMapper {
    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param id é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    public SvyLibTemplateTargetoption selectSvyLibTemplateTargetoptionById(Long id);

    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“列表
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“集合
     */
    public List<SvyLibTemplateTargetoption> selectSvyLibTemplateTargetoptionList(SvyLibTemplateTargetoption svyLibTemplateTargetoption);

    /**
     * æ–°å¢žé—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    public int insertSvyLibTemplateTargetoption(SvyLibTemplateTargetoption svyLibTemplateTargetoption);

    /**
     * ä¿®æ”¹é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    public int updateSvyLibTemplateTargetoption(SvyLibTemplateTargetoption svyLibTemplateTargetoption);

    /**
     * åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param id é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateTargetoptionById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateTargetoptionByIds(Long[] ids);
}

 smartor/src/main/java/com/smartor/service/ISvyLibTemplateScriptService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.smartor.service;

import com.smartor.domain.SvyLibTemplateScript;

import java.util.List;

/**
 * æ¨¡æ¿é—®å·é¢˜ç›®Service接口
 *
 * @author ruoyi
 * @date 2024-06-18
 */
public interface ISvyLibTemplateScriptService
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicid æ¨¡æ¿é—®å·é¢˜ç›®ä¸»é”®
     * @return æ¨¡æ¿é—®å·é¢˜ç›®
     */
    public SvyLibTemplateScript selectSvyLibTemplateScriptByTopicid(Long topicid);

    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®åˆ—表
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return æ¨¡æ¿é—®å·é¢˜ç›®é›†åˆ
     */
    public List<SvyLibTemplateScript> selectSvyLibTemplateScriptList(SvyLibTemplateScript svyLibTemplateScript);

    /**
     * æ–°å¢žæ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return ç»“æžœ
     */
    public int insertSvyLibTemplateScript(SvyLibTemplateScript svyLibTemplateScript);

    /**
     * ä¿®æ”¹æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return ç»“æžœ
     */
    public int updateSvyLibTemplateScript(SvyLibTemplateScript svyLibTemplateScript);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicids éœ€è¦åˆ é™¤çš„模板问卷题目主键集合
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateScriptByTopicids(Long[] topicids);

    /**
     * åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®ä¿¡æ¯
     *
     * @param topicid æ¨¡æ¿é—®å·é¢˜ç›®ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateScriptByTopicid(Long topicid);
}

 smartor/src/main/java/com/smartor/service/ISvyLibTemplateService.java

@@ -30,13 +30,13 @@
     */
    public List<SvyLibTemplate> selectSvyLibTemplateList(SvyLibTemplateReq svyLibTemplateReq);

    /**
     * æ–°å¢žé—®å·
     *
     * @param svyLibTemplate é—®å·
     * @return ç»“æžœ
     */
    public int insertSvyLibTemplate(SvyLibTemplate svyLibTemplate);
//    /**
//     * æ–°å¢žé—®å·
//     *
//     * @param svyLibTemplate é—®å·
//     * @return ç»“æžœ
//     */
//    public int insertSvyLibTemplate(SvyLibTemplate svyLibTemplate);

    /**
     * æ–°å¢žæˆ–修改问卷模板信息

 smartor/src/main/java/com/smartor/service/ISvyLibTemplateTargetoptionService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.smartor.service;

import com.smartor.domain.SvyLibTemplateTargetoption;

import java.util.List;

/**
 * é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“Service接口
 *
 * @author ruoyi
 * @date 2024-06-18
 */
public interface ISvyLibTemplateTargetoptionService {
    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param id é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    public SvyLibTemplateTargetoption selectSvyLibTemplateTargetoptionById(Long id);

    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“列表
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“集合
     */
    public List<SvyLibTemplateTargetoption> selectSvyLibTemplateTargetoptionList(SvyLibTemplateTargetoption svyLibTemplateTargetoption);

    /**
     * æ–°å¢žé—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    public int insertSvyLibTemplateTargetoption(SvyLibTemplateTargetoption svyLibTemplateTargetoption);

    /**
     * ä¿®æ”¹é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    public int updateSvyLibTemplateTargetoption(SvyLibTemplateTargetoption svyLibTemplateTargetoption);

    /**
     * æ‰¹é‡åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param ids éœ€è¦åˆ é™¤çš„问卷问题指标选项库主键集合
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateTargetoptionByIds(Long[] ids);

    /**
     * åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“信息
     *
     * @param id é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return ç»“æžœ
     */
    public int deleteSvyLibTemplateTargetoptionById(Long id);
}

 smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java

@@ -1,6 +1,7 @@
package com.smartor.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -19,9 +20,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
 * æŒ‡æ ‡é€‰é¡¹åº“Service业务层处理
@@ -68,6 +73,8 @@
        List<IvrLibaTarget> ivrLibaTargets = ivrLibaTargetMapper.selectIvrLibaTargetList(ivrLibaTarget);
        List<IvrLibaTargetVO> ivrLibaTargetVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargets, IvrLibaTargetVO.class);
        for (IvrLibaTargetVO ivrLibaTarget1 : ivrLibaTargetVOS) {
            ivrLibaTarget1.setSuitWayList(JSONArray.parseArray(ivrLibaTarget1.getSuitWay(), String.class));

            IvrLibaTargetoption ivrLibaTargetoption = new IvrLibaTargetoption();
            ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getId());
            //获取该指标的选项
@@ -141,7 +148,7 @@
    @Transactional(rollbackFor = Exception.class)
    public int saveOrupdateIvrLibaTarget(IvrLibaTargetVO ivrLibaTargetVO) {
        IvrLibaTarget ivrLibaTarget = DtoConversionUtils.sourceToTarget(ivrLibaTargetVO, IvrLibaTarget.class);
        if (ObjectUtils.isEmpty(ivrLibaTargetVO.getSuitWayList()))
        if (ObjectUtils.isNotEmpty(ivrLibaTargetVO.getSuitWayList()))
            ivrLibaTarget.setSuitWay(JSON.toJSONString(ivrLibaTargetVO.getSuitWayList()));
        ivrLibaTarget.setUpdateTime(DateUtils.getNowDate());
        if (ivrLibaTargetVO.getIsoperation() != null && ivrLibaTargetVO.getIsoperation() == 1) {

 smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java

@@ -1,5 +1,7 @@
package com.smartor.service.impl;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.SvyLibScript;
@@ -13,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

@@ -57,6 +60,9 @@

        for (int j = 0; j < svyLibTopics.size(); j++) {
            log.info("问题id为：{}", svyLibTopics.get(j).getSvyscriptId());
            if (StringUtils.isNotEmpty(svyLibTopics.get(j).getIcd10Name()))
                svyLibTopics.get(j).setIcd10NameList(JSONArray.parseArray(svyLibTopics.get(j).getIcd10Name(), String.class));

            if (StringUtils.isNotEmpty(svyLibTopics.get(j).getScripttype()) && svyLibTopics.get(j).getScripttype().equals("3") || svyLibTopics.get(j).getId() == null) {
                //作答题，不需要选项
                continue;
@@ -87,6 +93,10 @@
    @Override
    public Integer saveOrUpdateScript(SvyLibScript svyLibTopic) {
        Integer i = null;
        if (CollectionUtils.isNotEmpty(svyLibTopic.getIcd10NameList()) && svyLibTopic.getIcd10NameList().size() > 0) {
            //将数组转成字符串
            svyLibTopic.setIcd10Name(JSON.toJSONString(svyLibTopic.getIcd10NameList()));
        }

        //对题目进行处理
        if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) {

 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateScriptServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.SvyLibTemplateScript;
import com.smartor.mapper.SvyLibTemplateScriptMapper;
import com.smartor.service.ISvyLibTemplateScriptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ¨¡æ¿é—®å·é¢˜ç›®Service业务层处理
 *
 * @author ruoyi
 * @date 2024-06-18
 */
@Service
public class SvyLibTemplateScriptServiceImpl implements ISvyLibTemplateScriptService
{
    @Autowired
    private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;

    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicid æ¨¡æ¿é—®å·é¢˜ç›®ä¸»é”®
     * @return æ¨¡æ¿é—®å·é¢˜ç›®
     */
    @Override
    public SvyLibTemplateScript selectSvyLibTemplateScriptByTopicid(Long topicid)
    {
        return svyLibTemplateScriptMapper.selectSvyLibTemplateScriptByTopicid(topicid);
    }

    /**
     * æŸ¥è¯¢æ¨¡æ¿é—®å·é¢˜ç›®åˆ—表
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return æ¨¡æ¿é—®å·é¢˜ç›®
     */
    @Override
    public List<SvyLibTemplateScript> selectSvyLibTemplateScriptList(SvyLibTemplateScript svyLibTemplateScript)
    {
        return svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
    }

    /**
     * æ–°å¢žæ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return ç»“æžœ
     */
    @Override
    public int insertSvyLibTemplateScript(SvyLibTemplateScript svyLibTemplateScript)
    {
        svyLibTemplateScript.setCreateTime(DateUtils.getNowDate());
        return svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibTemplateScript);
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param svyLibTemplateScript æ¨¡æ¿é—®å·é¢˜ç›®
     * @return ç»“æžœ
     */
    @Override
    public int updateSvyLibTemplateScript(SvyLibTemplateScript svyLibTemplateScript)
    {
        svyLibTemplateScript.setUpdateTime(DateUtils.getNowDate());
        return svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibTemplateScript);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®
     *
     * @param topicids éœ€è¦åˆ é™¤çš„模板问卷题目主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteSvyLibTemplateScriptByTopicids(Long[] topicids)
    {
        return svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicids(topicids);
    }

    /**
     * åˆ é™¤æ¨¡æ¿é—®å·é¢˜ç›®ä¿¡æ¯
     *
     * @param topicid æ¨¡æ¿é—®å·é¢˜ç›®ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteSvyLibTemplateScriptByTopicid(Long topicid)
    {
        return svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(topicid);
    }
}

 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java

@@ -1,21 +1,21 @@
package com.smartor.service.impl;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import com.smartor.service.ISvyLibTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.service.ISvyLibTemplateService;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * é—®å·Service业务层处理
@@ -31,9 +31,9 @@
    @Autowired
    private Icd10AssociationMapper icd10AssociationMapper;
    @Autowired
    private SvyLibScriptMapper svyLibScriptMapper;
    private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
    @Autowired
    private SvyLibScriptOptionMapper svyLibTopicoptionMapper;
    private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
    @Autowired
    private TempDetpRelevanceMapper tempDetpRelevanceMapper;

@@ -59,26 +59,29 @@
        List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
        //添加题目
        for (int i = 0; i < svyLibTemplates.size(); i++) {
            SvyLibScript svyLibTopic = new SvyLibScript();
            svyLibTopic.setSvyid(svyLibTemplates.get(i).getSvyid());
            List<SvyLibScript> svyLibTopics = svyLibScriptMapper.selectSvyLibScriptList(svyLibTopic);
//            SvyLibScript svyLibScript = new SvyLibScript();
//            svyLibScript.setSvyid(svyLibTemplates.get(i).getSvyid());
//            List<SvyLibScript> svyLibTopics = svyLibScriptMapper.selectSvyLibScriptList(svyLibScript);
            SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
            svyLibTemplateScript.setSvyid(svyLibTemplates.get(i).getSvyid());
            List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
            //获取题目选项
            a:
            for (int j = 0; j < svyLibTopics.size(); j++) {
                log.info("问题id为：{}", svyLibTopics.get(j).getSvyscriptId());
                if (StringUtils.isNotEmpty(svyLibTopics.get(j).getScripttype()) && svyLibTopics.get(j).getScripttype().equals("3") || svyLibTopics.get(j).getSvyscriptId() == null) {
            for (int j = 0; j < svyLibTemplateScripts.size(); j++) {
                log.info("问题id为：{}", svyLibTemplateScripts.get(j).getId());
                if (StringUtils.isNotEmpty(svyLibTemplateScripts.get(j).getScriptType()) && svyLibTemplateScripts.get(j).getScriptType().equals("3") || svyLibTemplateScripts.get(j).getId() == null) {
                    //作答题，不需要选项
                    continue a;
                } else {
                    SvyLibScriptOption svyLibTopicoption = new SvyLibScriptOption();
                    svyLibTopicoption.setTopicid(svyLibTopics.get(j).getSvyscriptId());
                    List<SvyLibScriptOption> svyLibTopicoptions = svyLibTopicoptionMapper.selectSvyLibScriptOptionList(svyLibTopicoption);
                    SvyLibTemplateTargetoption svyLibTopicoption = new SvyLibTemplateTargetoption();
                    svyLibTopicoption.setScriptid(svyLibTemplateScripts.get(j).getId());
                    List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTopicoption);
                    //将查询出的选项目放到题目中
                    svyLibTopics.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
                    svyLibTemplateScripts.get(j).setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
                }
            }
            //将题目放到问卷列表中
            svyLibTemplates.get(i).setSvyLibTopics(svyLibTopics);
            svyLibTemplates.get(i).setSvyLibScripts(svyLibTemplateScripts);

            //获取每个问卷对应的科室
            TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
@@ -105,33 +108,33 @@
        return libTemplates;
    }

    /**
     * æ–°å¢žé—®å·
     *
     * @param svyLibTemplate é—®å·
     * @return ç»“æžœ
     */
    @Transactional
    @Override
    public int insertSvyLibTemplate(SvyLibTemplate svyLibTemplate) {
        svyLibTemplate.setCreateTime(DateUtils.getNowDate());
        svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
        //关联问卷疾病
        for (String icdId : svyLibTemplate.getIcdID()) {
            Icd10Association icd10Association = new Icd10Association();
            icd10Association.setIcd10code(icdId);
            icd10Association.setSvyid(svyLibTemplate.getSvyid());
            icd10AssociationMapper.insertIcd10Association(icd10Association);
        }
        //新增问题题目
        for (int i = 0; i < svyLibTemplate.getSvyLibTopics().size(); i++) {
            SvyLibScript svyLibScript = svyLibTemplate.getSvyLibTopics().get(i);
            svyLibScript.setSvyid(svyLibTemplate.getSvyid());
            //题目的选项目，直接用svy_topicoption表，用svyTopicidf去关联
            svyLibScriptMapper.insertSvyLibScript(svyLibScript);
        }
        return 1;
    }
//    /**
//     * æ–°å¢žé—®å·
//     *
//     * @param svyLibTemplate é—®å·
//     * @return ç»“æžœ
//     */
//    @Transactional
//    @Override
//    public int insertSvyLibTemplate(SvyLibTemplate svyLibTemplate) {
//        svyLibTemplate.setCreateTime(DateUtils.getNowDate());
//        svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
//        //关联问卷疾病
//        for (String icdId : svyLibTemplate.getIcdID()) {
//            Icd10Association icd10Association = new Icd10Association();
//            icd10Association.setIcd10code(icdId);
//            icd10Association.setSvyid(svyLibTemplate.getSvyid());
//            icd10AssociationMapper.insertIcd10Association(icd10Association);
//        }
//        //新增问题题目
//        for (int i = 0; i < svyLibTemplate.getSvyLibScripts().size(); i++) {
//            SvyLibScript svyLibScript = svyLibTemplate.getSvyLibScripts().get(i);
//            svyLibScript.setSvyid(svyLibTemplate.getSvyid());
//            //题目的选项目，直接用svy_topicoption表，用svyTopicidf去关联
//            svyLibScriptMapper.insertSvyLibScript(svyLibScript);
//        }
//        return 1;
//    }

    /**
     * æ–°å¢žæˆ–修改问卷模板信息
@@ -153,31 +156,33 @@
        }

        //处理题目
        if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibTopics())) {
            for (SvyLibScript svyLibTopic : svyLibTemplate.getSvyLibTopics()) {
        if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
            for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
                SvyLibTemplateScript svyLibTemplateScript = DtoConversionUtils.sourceToTarget(svyLibScript, SvyLibTemplateScript.class);
                //对题目进行处理
                if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) {
                if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 1) {
                    //新增
                    svyLibTopic.setSvyid(svyLibTemplate.getSvyid());
                    //题目的选项目，直接用svy_topicoption表，用svyTopicid去关联
                    svyLibScriptMapper.insertSvyLibScript(svyLibTopic);
                } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
                    svyLibTemplateScript.setSvyid(svyLibTemplate.getSvyid());
                    svyLibTemplateScript.setId(null);
                    svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibTemplateScript);

                } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 2) {
                    //修改
                    svyLibTopic.setSvyid(svyLibTemplate.getSvyid());
                    svyLibScriptMapper.updateSvyLibScript(svyLibTopic);
                    svyLibTemplateScript.setSvyid(svyLibTemplate.getSvyid());
                    svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibTemplateScript);
                }

                //对题目选项进行处理
                if (CollectionUtils.isNotEmpty(svyLibTopic.getSvyLibScriptOptions())) {
                    for (SvyLibScriptOption svyLibTopicoption : svyLibTopic.getSvyLibScriptOptions()) {
                        if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 1) {
                if (CollectionUtils.isNotEmpty(svyLibScript.getSvyLibTemplateTargetoptions())) {
                    for (SvyLibTemplateTargetoption svyLibTemplateTargetoption : svyLibScript.getSvyLibTemplateTargetoptions()) {
                        if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 1) {
                            //新增
                            svyLibTopicoption.setTopicid(svyLibTopic.getId());
                            svyLibTopicoptionMapper.insertSvyLibScriptOption(svyLibTopicoption);
                        } else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 2) {
                            svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
                            svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
                        } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 2) {
                            //修改
                            svyLibTopicoption.setTopicid(svyLibTopic.getId());
                            svyLibTopicoptionMapper.updateSvyLibScriptOption(svyLibTopicoption);
                            svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
                            svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
                        }
                    }


 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateTargetoptionServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.SvyLibTemplateTargetoption;
import com.smartor.mapper.SvyLibTemplateTargetoptionMapper;
import com.smartor.service.ISvyLibTemplateTargetoptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“Service业务层处理
 *
 * @author ruoyi
 * @date 2024-06-18
 */
@Service
public class SvyLibTemplateTargetoptionServiceImpl implements ISvyLibTemplateTargetoptionService {
    @Autowired
    private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;

    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param id é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    @Override
    public SvyLibTemplateTargetoption selectSvyLibTemplateTargetoptionById(Long id) {
        return svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionById(id);
    }

    /**
     * æŸ¥è¯¢é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“列表
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     */
    @Override
    public List<SvyLibTemplateTargetoption> selectSvyLibTemplateTargetoptionList(SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
        return svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
    }

    /**
     * æ–°å¢žé—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    @Override
    public int insertSvyLibTemplateTargetoption(SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
        svyLibTemplateTargetoption.setCreateTime(DateUtils.getNowDate());
        return svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
    }

    /**
     * ä¿®æ”¹é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param svyLibTemplateTargetoption é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    @Override
    public int updateSvyLibTemplateTargetoption(SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
        svyLibTemplateTargetoption.setUpdateTime(DateUtils.getNowDate());
        return svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
    }

    /**
     * æ‰¹é‡åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“
     *
     * @param ids éœ€è¦åˆ é™¤çš„问卷问题指标选项库主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteSvyLibTemplateTargetoptionByIds(Long[] ids) {
        return svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionByIds(ids);
    }

    /**
     * åˆ é™¤é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“信息
     *
     * @param id é—®å·é—®é¢˜æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteSvyLibTemplateTargetoptionById(Long id) {
        return svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(id);
    }
}

 smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml

@@ -49,11 +49,13 @@
        <result property="tag" column="tag"/>
        <result property="valueType" column="value_type"/>
        <result property="reply" column="reply"/>
        <result property="targetdesc" column="targetdesc"/>
    </resultMap>

    <sql id="selectIvrLibaScriptVo">
        select id,
               suitway,
               targetdesc,
               campus,
               deptNames,
               deptIds,
@@ -176,6 +178,7 @@
            <if test="otherdata != null">otherdata,</if>
            <if test="valueType != null">value_type,</if>
            <if test="reply != null">reply,</if>
            <if test="targetdesc != null">targetdesc,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="questiontitle != null">#{questiontitle},</if>
@@ -222,6 +225,7 @@
            <if test="otherdata != null">#{otherdata},</if>
            <if test="valueType != null">#{valueType},</if>
            <if test="reply != null">#{reply},</if>
            <if test="targetdesc != null">#{targetdesc},</if>
        </trim>
    </insert>

@@ -273,6 +277,7 @@
            <if test="tag != null">tag = #{tag},</if>
            <if test="valueType != null">value_type = #{valueType},</if>
            <if test="reply != null">reply = #{reply},</if>
            <if test="targetdesc != null">targetdesc = #{targetdesc},</if>
        </trim>
        where id = #{id}
    </update>

 smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml

@@ -11,6 +11,7 @@
        <result property="scripttype" column="script_type"/>
        <result property="scriptcode" column="script_code"/>
        <result property="script" column="script"/>
        <result property="scriptPicture" column="script_picture"/>
        <result property="sort" column="sort"/>
        <result property="ismandatory" column="ismandatory"/>
        <result property="ishide" column="ishide"/>
@@ -31,17 +32,24 @@
        <result property="otherdata" column="otherdata"/>
        <result property="valueType" column="value_type"/>
        <result property="reply" column="reply"/>
        <result property="scoretype" column="scoretype"/>
        <result property="score" column="score"/>
        <result property="icd10Name" column="icd10_name"/>
        <result property="topic" column="topic"/>
    </resultMap>

    <sql id="selectSvyLibScriptVo">
        select id,
               oldid,
               scoretype,
               score,
               value_type,
               reply,
               svyid,
               script_type,
               script_code,
               script,
               topic,
               sort,
               ismandatory,
               ishide,
@@ -59,7 +67,9 @@
               suitway,
               isavailable,
               otherdata,
               script_picture,
            language,
            icd10_name,
            svy_scriptid as svyscriptId
        from svy_lib_script
    </sql>
@@ -73,6 +83,7 @@
            <if test="scripttype != null and scripttype != ''">and script_type = #{scripttype}</if>
            <if test="categoryid != null ">and categoryid = #{categoryid}</if>
            <if test="script != null  and script != ''">and script like concat('%', #{script}, '%')</if>
            <if test="icd10Name != null  and icd10Name != ''">and icd10_name like concat('%', #{icd10Name}, '%')</if>

            <if test="ishide != null ">and ishide = #{ishide}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
@@ -81,6 +92,9 @@
            <if test="suitway != null  and suitway != ''">and suitway = #{suitway}</if>
            <if test="isavailable != null  and isavailable != ''">and isavailable = #{isavailable}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="scoretype != null  and scoretype != ''">and scoretype = #{scoretype}</if>
            <if test="score != null  and score != ''">and score = #{score}</if>
            <if test="topic != null  and topic != ''">and topic = #{topic}</if>
        </where>
    </select>

@@ -119,6 +133,11 @@
            <if test="otherdata != null and otherdata!=''">otherdata,</if>
            <if test="valueType != null and valueType!=''">value_type,</if>
            <if test="reply != null and reply!=''">otherdata,</if>
            <if test="scoretype != null and scoretype!=''">scoretype,</if>
            <if test="score != null and score!=''">score,</if>
            <if test="icd10Name != null and icd10Name!=''">icd10_name,</if>
            <if test="scriptPicture != null  and scriptPicture != ''">script_picture,</if>
            <if test="topic != null  and topic != ''">topic,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="oldid != null">#{oldid},</if>
@@ -147,6 +166,11 @@
            <if test="otherdata != null and otherdata!=''">#{otherdata},</if>
            <if test="valueType != null and valueType!=''">#{valueType},</if>
            <if test="reply != null and reply!=''">#{therdata},</if>
            <if test="scoretype != null and scoretype!=''">#{scoretype},</if>
            <if test="score != null and score!=''">#{score},</if>
            <if test="icd10Name != null and icd10Name!=''">#{icd10Name},</if>
            <if test="scriptPicture != null  and scriptPicture != ''">#{scriptPicture},</if>
            <if test="topic != null  and topic != ''">#{topic},</if>
        </trim>
    </insert>

@@ -178,6 +202,11 @@
            <if test="otherdata != null and otherdata!=''">otherdata = #{otherdata},</if>
            <if test="valueType != null and valueType!=''">value_type = #{valueType},</if>
            <if test="reply != null and reply!=''">therdata =#{therdata},</if>
            <if test="scoretype != null and scoretype!=''">scoretype = #{scoretype},</if>
            <if test="score != null and score!=''">score = #{score},</if>
            <if test="icd10Name != null and icd10Name!=''">icd10_name = #{icd10Name},</if>
            <if test="scriptPicture != null  and scriptPicture != ''">script_picture = #{scriptPicture},</if>
            <if test="topic != null  and topic != ''">topic = #{topic},</if>
        </trim>
        where id = #{id}
    </update>

 smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml

@@ -33,6 +33,8 @@
        <result property="otherdata" column="otherdata"/>
        <result property="valueType" column="value_type"/>
        <result property="reply" column="reply"/>
        <result property="scriptScore" column="script_score"/>
        <result property="scoreType" column="score_type"/>
    </resultMap>

    <sql id="selectSvyLibTemplateVo">
@@ -40,6 +42,7 @@
               categoryid,
               value_type,
               reply,
               score_type,
               svycode,
               svyname,
               description,
@@ -63,6 +66,7 @@
               label_info,
               campus,
               suitway,
               script_score,
               otherdata
        from svy_lib_template
    </sql>
@@ -72,7 +76,7 @@
        a.version,a.centerlibrarycode, a.centerlibraryid, a.islocal, a.isenable, a.orgid, a.del_flag, a.create_by,
        a.create_time, a.update_by, a.update_time, a.isupload,
        a.upload_time,a.dept_names,a.value_type,a.label_info,a.reply,
        a.campus,a.suitway,a.otherdata
        a.campus,a.suitway,a.script_score,a.score_type,a.otherdata
        ,c.icdname from svy_lib_template
        a,icd10_association b,icd10 c
        <where>
@@ -122,6 +126,8 @@
            <if test="otherdata != null">otherdata,</if>
            <if test="valueType != null">value_type,</if>
            <if test="reply != null">reply,</if>
            <if test="scriptScore != null">script_score,</if>
            <if test="scoreType != null">score_type,</if>
            value_type,
            reply,
        </trim>
@@ -153,6 +159,8 @@
            <if test="otherdata != null">#{otherdata},</if>
            <if test="valueType != null">#{valueType},</if>
            <if test="reply != null">#{reply},</if>
            <if test="scriptScore != null">#{scriptScore},</if>
            <if test="scoreType != null">#{scoreType},</if>
        </trim>
    </insert>

@@ -186,6 +194,8 @@
            <if test="otherdata != null">otherdata=#{otherdata},</if>
            <if test="valueType != null">value_type = #{valueType},</if>
            <if test="reply != null">reply = #{reply},</if>
            <if test="scriptScore != null">script_score = #{scriptScore},</if>
            <if test="scoreType != null">score_type = #{scoreType},</if>
        </trim>
        where svyid = #{svyid}
    </update>

 smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,230 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.SvyLibTemplateScriptMapper">

    <resultMap type="com.smartor.domain.SvyLibTemplateScript" id="SvyLibTemplateScriptResult">
        <result property="id" column="id"/>
        <result property="oldid" column="oldid"/>
        <result property="svyid" column="svyid"/>
        <result property="scriptType" column="script_type"/>
        <result property="scriptCode" column="script_code"/>
        <result property="script" column="script"/>
        <result property="tag" column="tag"/>
        <result property="sort" column="sort"/>
        <result property="ismandatory" column="ismandatory"/>
        <result property="ishide" column="ishide"/>
        <result property="delFlag" column="del_flag"/>
        <result property="orgid" column="orgid"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="svyTopicid" column="svy_topicid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="categoryid" column="categoryid"/>
        <result property="scriptContent" column="script_content"/>
        <result property="suitway" column="suitway"/>
        <result property="isavailable" column="isavailable"/>
        <result property="language" column="language"/>
        <result property="otherdata" column="otherdata"/>
        <result property="valueType" column="value_type"/>
        <result property="reply" column="reply"/>
        <result property="scoretype" column="scoretype"/>
        <result property="score" column="score"/>
        <result property="scriptPicture" column="script_picture"/>
    </resultMap>

    <sql id="selectSvyLibTemplateScriptVo">
        select id,
               oldid,
               svyid,
               script_type,
               script_code,
               script,
               tag,
               sort,
               ismandatory,
               ishide,
               del_flag,
               orgid,
               create_by,
               create_time,
               update_by,
               update_time,
               isupload,
               upload_time,
               svy_topicid,
               pid,
               guid,
               categoryid,
               script_content,
               suitway,
               script_picture,
               isavailable, language, otherdata, value_type, reply, scoretype, score
        from svy_lib_template_script
    </sql>

    <select id="selectSvyLibTemplateScriptList" parameterType="com.smartor.domain.SvyLibTemplateScript"
            resultMap="SvyLibTemplateScriptResult">
        <include refid="selectSvyLibTemplateScriptVo"/>
        <where>
            <if test="oldid != null ">and oldid = #{oldid}</if>
            <if test="svyid != null ">and svyid = #{svyid}</if>
            <if test="scriptType != null  and scriptType != ''">and script_type = #{scriptType}</if>
            <if test="scriptCode != null  and scriptCode != ''">and script_code = #{scriptCode}</if>
            <if test="script != null  and script != ''">and script = #{script}</if>
            <if test="tag != null  and tag != ''">and tag = #{tag}</if>
            <if test="sort != null ">and sort = #{sort}</if>
            <if test="ismandatory != null  and ismandatory != ''">and ismandatory = #{ismandatory}</if>
            <if test="ishide != null ">and ishide = #{ishide}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="svyTopicid != null ">and svy_topicid = #{svyTopicid}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="categoryid != null ">and categoryid = #{categoryid}</if>
            <if test="scriptContent != null  and scriptContent != ''">and script_content = #{scriptContent}</if>
            <if test="suitway != null  and suitway != ''">and suitway = #{suitway}</if>
            <if test="isavailable != null  and isavailable != ''">and isavailable = #{isavailable}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="otherdata != null  and otherdata != ''">and otherdata = #{otherdata}</if>
            <if test="valueType != null  and valueType != ''">and value_type = #{valueType}</if>
            <if test="reply != null  and reply != ''">and reply = #{reply}</if>
            <if test="scoretype != null  and scoretype != ''">and scoretype = #{scoretype}</if>
            <if test="score != null  and score != ''">and score = #{score}</if>
        </where>
    </select>

    <select id="selectSvyLibTemplateScriptByTopicid" parameterType="Long" resultMap="SvyLibTemplateScriptResult">
        <include refid="selectSvyLibTemplateScriptVo"/>
        where id = #{id}
    </select>

    <insert id="insertSvyLibTemplateScript" parameterType="com.smartor.domain.SvyLibTemplateScript"
            useGeneratedKeys="true" keyProperty="id">
        insert into svy_lib_template_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="oldid != null">oldid,</if>
            <if test="svyid != null">svyid,</if>
            <if test="scriptType != null">script_type,</if>
            <if test="scriptCode != null">script_code,</if>
            <if test="script != null">script,</if>
            <if test="tag != null">tag,</if>
            <if test="sort != null">sort,</if>
            <if test="ismandatory != null">ismandatory,</if>
            <if test="ishide != null">ishide,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="orgid != null">orgid,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="svyTopicid != null">svy_topicid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="categoryid != null">categoryid,</if>
            <if test="scriptContent != null">script_content,</if>
            <if test="suitway != null">suitway,</if>
            <if test="isavailable != null">isavailable,</if>
            <if test="language != null">language,</if>
            <if test="otherdata != null">otherdata,</if>
            <if test="valueType != null">value_type,</if>
            <if test="reply != null">reply,</if>
            <if test="scoretype != null">scoretype,</if>
            <if test="score != null">score,</if>
            <if test="scriptPicture != null">script_picture,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="oldid != null">#{oldid},</if>
            <if test="svyid != null">#{svyid},</if>
            <if test="scriptType != null">#{scriptType},</if>
            <if test="scriptCode != null">#{scriptCode},</if>
            <if test="script != null">#{script},</if>
            <if test="tag != null">#{tag},</if>
            <if test="sort != null">#{sort},</if>
            <if test="ismandatory != null">#{ismandatory},</if>
            <if test="ishide != null">#{ishide},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="svyTopicid != null">#{svyTopicid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="categoryid != null">#{categoryid},</if>
            <if test="scriptContent != null">#{scriptContent},</if>
            <if test="suitway != null">#{suitway},</if>
            <if test="isavailable != null">#{isavailable},</if>
            <if test="language != null">#{language},</if>
            <if test="otherdata != null">#{otherdata},</if>
            <if test="valueType != null">#{valueType},</if>
            <if test="reply != null">#{reply},</if>
            <if test="scoretype != null">#{scoretype},</if>
            <if test="score != null">#{score},</if>
            <if test="scriptPicture != null">#{scriptPicture},</if>
        </trim>
    </insert>

    <update id="updateSvyLibTemplateScript" parameterType="com.smartor.domain.SvyLibTemplateScript">
        update svy_lib_template_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="oldid != null">oldid = #{oldid},</if>
            <if test="svyid != null">svyid = #{svyid},</if>
            <if test="scriptType != null">script_type = #{scriptType},</if>
            <if test="scriptCode != null">script_code = #{scriptCode},</if>
            <if test="script != null">script = #{script},</if>
            <if test="tag != null">tag = #{tag},</if>
            <if test="sort != null">sort = #{sort},</if>
            <if test="ismandatory != null">ismandatory = #{ismandatory},</if>
            <if test="ishide != null">ishide = #{ishide},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="svyTopicid != null">svy_topicid = #{svyTopicid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="categoryid != null">categoryid = #{categoryid},</if>
            <if test="scriptContent != null">script_content = #{scriptContent},</if>
            <if test="suitway != null">suitway = #{suitway},</if>
            <if test="isavailable != null">isavailable = #{isavailable},</if>
            <if test="language != null">language = #{language},</if>
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="valueType != null">value_type = #{valueType},</if>
            <if test="reply != null">reply = #{reply},</if>
            <if test="scoretype != null">scoretype = #{scoretype},</if>
            <if test="score != null">score = #{score},</if>
            <if test="scriptPicture != null">script_picture = #{scriptPicture},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteSvyLibTemplateScriptByTopicid" parameterType="Long">
        delete
        from svy_lib_template_script
        where id = #{id}
    </delete>

    <delete id="deleteSvyLibTemplateScriptByTopicids" parameterType="String">
        delete from svy_lib_template_script where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,222 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.SvyLibTemplateTargetoptionMapper">

    <resultMap type="com.smartor.domain.SvyLibTemplateTargetoption" id="SvyLibTemplateTargetoptionResult">
        <result property="id" column="id"/>
        <result property="groupid" column="groupid"/>
        <result property="categoryName" column="categoryName"/>
        <result property="scriptid" column="scriptid"/>
        <result property="templateID" column="templateID"/>
        <result property="targettype" column="targettype"/>
        <result property="targetid" column="targetid"/>
        <result property="targetname" column="targetname"/>
        <result property="targetvalue" column="targetvalue"/>
        <result property="isabnormal" column="isabnormal"/>
        <result property="warnup" column="warnup"/>
        <result property="warndown" column="warndown"/>
        <result property="targetregex" column="targetregex"/>
        <result property="targetregex2" column="targetregex2"/>
        <result property="dynamiccruxsJson" column="dynamiccruxs"/>
        <result property="nodynamiccruxsJson" column="nodynamiccruxs"/>
        <result property="optiondesc" column="optiondesc"/>
        <result property="nextQuestion" column="next_question"/>
        <result property="language" column="language"/>
        <result property="version" column="version"/>
        <result property="delFlag" column="del_flag"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="orgid" column="orgid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="picturePath" column="picture_path"/>
    </resultMap>

    <sql id="selectSvyLibTemplateTargetoptionVo">
        select id,
               groupid,
               categoryName,
               scriptid,
               templateID,
               targettype,
               targetid,
               targetname,
               targetvalue,
               isabnormal,
               warnup,
               warndown,
               targetregex,
               targetregex2,
               dynamiccruxs,
               nodynamiccruxs,
               optiondesc,
               next_question, language, version, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, picture_path
        from svy_lib_template_targetoption
    </sql>

    <select id="selectSvyLibTemplateTargetoptionList" parameterType="com.smartor.domain.SvyLibTemplateTargetoption"
            resultMap="SvyLibTemplateTargetoptionResult">
        <include refid="selectSvyLibTemplateTargetoptionVo"/>
        <where>
            <if test="groupid != null  and groupid != ''">and groupid = #{groupid}</if>
            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
                '%')
            </if>
            <if test="scriptid != null ">and scriptid = #{scriptid}</if>
            <if test="templateID != null ">and templateID = #{templateID}</if>
            <if test="targettype != null  and targettype != ''">and targettype = #{targettype}</if>
            <if test="targetid != null ">and targetid = #{targetid}</if>
            <if test="targetname != null  and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
            <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
            <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
            <if test="warnup != null ">and warnup = #{warnup}</if>
            <if test="warndown != null ">and warndown = #{warndown}</if>
            <if test="targetregex != null  and targetregex != ''">and targetregex = #{targetregex}</if>
            <if test="targetregex2 != null  and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
            <if test="dynamiccruxsJson != null  and dynamiccruxsJson != ''">and dynamiccruxs = #{dynamiccruxsJson}</if>
            <if test="nodynamiccruxsJson != null  and nodynamiccruxsJson != ''">and nodynamiccruxs =
                #{nodynamiccruxsJson}
            </if>
            <if test="optiondesc != null  and optiondesc != ''">and optiondesc = #{optiondesc}</if>
            <if test="nextQuestion != null ">and next_question = #{nextQuestion}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="version != null  and version != ''">and version = #{version}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="picturePath != null  and picturePath != ''">and picture_path = #{picturePath}</if>
        </where>
    </select>

    <select id="selectSvyLibTemplateTargetoptionById" parameterType="Long" resultMap="SvyLibTemplateTargetoptionResult">
        <include refid="selectSvyLibTemplateTargetoptionVo"/>
        where id = #{id}
    </select>

    <insert id="insertSvyLibTemplateTargetoption" parameterType="com.smartor.domain.SvyLibTemplateTargetoption"
            useGeneratedKeys="true" keyProperty="id">
        insert into svy_lib_template_targetoption
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="groupid != null">groupid,</if>
            <if test="categoryName != null">categoryName,</if>
            <if test="scriptid != null">scriptid,</if>
            <if test="templateID != null">templateID,</if>
            <if test="targettype != null">targettype,</if>
            <if test="targetid != null">targetid,</if>
            <if test="targetname != null">targetname,</if>
            <if test="targetvalue != null">targetvalue,</if>
            <if test="isabnormal != null">isabnormal,</if>
            <if test="warnup != null">warnup,</if>
            <if test="warndown != null">warndown,</if>
            <if test="targetregex != null">targetregex,</if>
            <if test="targetregex2 != null">targetregex2,</if>
            <if test="dynamiccruxs != null">dynamiccruxs,</if>
            <if test="nodynamiccruxs != null">nodynamiccruxs,</if>
            <if test="optiondesc != null">optiondesc,</if>
            <if test="nextQuestion != null">next_question,</if>
            <if test="language != null">language,</if>
            <if test="version != null">version,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="picturePath != null">picture_path,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="groupid != null">#{groupid},</if>
            <if test="categoryName != null">#{categoryName},</if>
            <if test="scriptid != null">#{scriptid},</if>
            <if test="templateID != null">#{templateID},</if>
            <if test="targettype != null">#{targettype},</if>
            <if test="targetid != null">#{targetid},</if>
            <if test="targetname != null">#{targetname},</if>
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="isabnormal != null">#{isabnormal},</if>
            <if test="warnup != null">#{warnup},</if>
            <if test="warndown != null">#{warndown},</if>
            <if test="targetregex != null">#{targetregex},</if>
            <if test="targetregex2 != null">#{targetregex2},</if>
            <if test="dynamiccruxs != null">#{dynamiccruxsJson},</if>
            <if test="nodynamiccruxs != null">#{nodynamiccruxsJson},</if>
            <if test="optiondesc != null">#{optiondesc},</if>
            <if test="nextQuestion != null">#{nextQuestion},</if>
            <if test="language != null">#{language},</if>
            <if test="version != null">#{version},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="picturePath != null">#{picturePath},</if>
        </trim>
    </insert>

    <update id="updateSvyLibTemplateTargetoption" parameterType="com.smartor.domain.SvyLibTemplateTargetoption">
        update svy_lib_template_targetoption
        <trim prefix="SET" suffixOverrides=",">
            <if test="groupid != null">groupid = #{groupid},</if>
            <if test="categoryName != null">categoryName = #{categoryName},</if>
            <if test="scriptid != null">scriptid = #{scriptid},</if>
            <if test="templateID != null">templateID = #{templateID},</if>
            <if test="targettype != null">targettype = #{targettype},</if>
            <if test="targetid != null">targetid = #{targetid},</if>
            <if test="targetname != null">targetname = #{targetname},</if>
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="isabnormal != null">isabnormal = #{isabnormal},</if>
            <if test="warnup != null">warnup = #{warnup},</if>
            <if test="warndown != null">warndown = #{warndown},</if>
            <if test="targetregex != null">targetregex = #{targetregex},</if>
            <if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
            <if test="dynamiccruxs != null">dynamiccruxs = #{dynamiccruxsJson},</if>
            <if test="nodynamiccruxs != null">nodynamiccruxs = #{nodynamiccruxsJson},</if>
            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
            <if test="nextQuestion != null">next_question = #{nextQuestion},</if>
            <if test="language != null">language = #{language},</if>
            <if test="version != null">version = #{version},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteSvyLibTemplateTargetoptionById" parameterType="Long">
        delete
        from svy_lib_template_targetoption
        where id = #{id}
    </delete>

    <delete id="deleteSvyLibTemplateTargetoptionByIds" parameterType="String">
        delete from svy_lib_template_targetoption where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>

 smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml

@@ -31,11 +31,11 @@
        <result property="scoretype"    column="scoretype"    />
        <result property="score"    column="score"    />
        <result property="showtype"    column="showtype"    />
        <result property="picturePath"    column="picture_path"    />
        <result property="scriptPicture"    column="script_picture"    />
    </resultMap>

    <sql id="selectSvyTaskScriptVo">
        select id, script_type, script_code, script, tag, sort, ismandatory, ishide, del_flag, orgid, create_by, create_time, update_by, update_time, isupload, upload_time, answer, pid, guid, taskid, optiondesc, nexttopicid, nexttopicsort, scoretype, score, showtype, picture_path from svy_task_script
        select id, script_type, script_code, script, tag, sort, ismandatory, ishide, del_flag, orgid, create_by, create_time, update_by, update_time, isupload, upload_time, answer, pid, guid, taskid, optiondesc, nexttopicid, nexttopicsort, scoretype, score, showtype, script_picture from svy_task_script
    </sql>

    <select id="selectSvyTaskScriptList" parameterType="com.smartor.domain.SvyTaskScript" resultMap="SvyTaskScriptResult">
@@ -98,7 +98,7 @@
            <if test="scoretype != null">scoretype,</if>
            <if test="score != null">score,</if>
            <if test="showtype != null">showtype,</if>
            <if test="picturePath != null">picture_path,</if>
            <if test="scriptPicture != null">script_picture,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="scriptType != null">#{scriptType},</if>
@@ -126,7 +126,7 @@
            <if test="scoretype != null">#{scoretype},</if>
            <if test="score != null">#{score},</if>
            <if test="showtype != null">#{showtype},</if>
            <if test="picturePath != null">#{picturePath},</if>
            <if test="scriptPicture != null">#{scriptPicture},</if>
         </trim>
    </insert>

@@ -159,6 +159,7 @@
            <if test="score != null">score = #{score},</if>
            <if test="showtype != null">showtype = #{showtype},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
            <if test="scriptPicture != null">script_picture = #{scriptPicture},</if>
        </trim>
        where id = #{id}
    </update>