代码提交

liusheng

2024-07-18 27c3f725f9bbd51e97857de6cc191d016b660bd6

代码提交

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

@@ -24,10 +24,8 @@
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

import javax.annotation.Syntax;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -222,7 +220,6 @@
                        serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
                    }
                } else if (descByCode.equals("公众号")) {

                    //公众号
                    RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
                    String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
@@ -344,8 +341,8 @@
                        String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
                        SendMagParam sendMagParam = new SendMagParam();
                        sendMagParam.setType("5");
                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
                        log.info("链接完整路径：{}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
                        log.info("链接完整路径：{}", req_path + "/outsideChainxj?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
                        //这个模板ID先写死，后面做成可选
                        sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
                        Map map = new HashMap();
@@ -432,8 +429,8 @@
                        String patid = rsaPublicKeyExample.encryptedData(svyTaskSingle1.getPatid().toString(), pub_key);
                        SendMagParam sendMagParam = new SendMagParam();
                        sendMagParam.setType("5");
                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName() + "&param5=false");
                        log.info("链接完整路径：{}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName() + "&param5=false");
                        sendMagParam.setUrl(ip + ":" + req_path + "//outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName() + "&param5=false");
                        log.info("链接完整路径：{}", req_path + "//outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName() + "&param5=false");
                        //这个模板ID先写死，后面做成可选
                        sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
                        Map map = new HashMap();

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

ÎļþÒÑɾ³ý

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
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.ServiceSubtaskAnswer;
import com.smartor.service.IServiceSubtaskAnswerService;
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-07-18
 */
@RestController
@RequestMapping("/smartor/subtaskAnswer")
public class ServiceSubtaskAnswerController extends BaseController {
    @Autowired
    private IServiceSubtaskAnswerService serviceSubtaskAnswerService;

    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:answer:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceSubtaskAnswer serviceSubtaskAnswer) {
        startPage();
        List<ServiceSubtaskAnswer> list = serviceSubtaskAnswerService.selectServiceSubtaskAnswerList(serviceSubtaskAnswer);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:answer:export')")
    @Log(title = "任务问卷问题选项", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ServiceSubtaskAnswer serviceSubtaskAnswer) {
        List<ServiceSubtaskAnswer> list = serviceSubtaskAnswerService.selectServiceSubtaskAnswerList(serviceSubtaskAnswer);
        ExcelUtil<ServiceSubtaskAnswer> util = new ExcelUtil<ServiceSubtaskAnswer>(ServiceSubtaskAnswer.class);
        util.exportExcel(response, list, "任务问卷问题选项数据");
    }

    /**
     * èŽ·å–任务问卷问题选项详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:answer:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(serviceSubtaskAnswerService.selectServiceSubtaskAnswerById(id));
    }

    /**
     * æ–°å¢žä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    @PreAuthorize("@ss.hasPermi('system:answer:add')")
    @Log(title = "任务问卷问题选项", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceSubtaskAnswer serviceSubtaskAnswer) {
        return toAjax(serviceSubtaskAnswerService.insertServiceSubtaskAnswer(serviceSubtaskAnswer));
    }

    /**
     * ä¿®æ”¹ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    @PreAuthorize("@ss.hasPermi('system:answer:edit')")
    @Log(title = "任务问卷问题选项", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceSubtaskAnswer serviceSubtaskAnswer) {
        return toAjax(serviceSubtaskAnswerService.updateServiceSubtaskAnswer(serviceSubtaskAnswer));
    }

    /**
     * åˆ é™¤ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    @PreAuthorize("@ss.hasPermi('system:answer:remove')")
    @Log(title = "任务问卷问题选项", businessType = BusinessType.DELETE)
    @DeleteMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceSubtaskAnswerService.deleteServiceSubtaskAnswerByIds(ids));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,92 @@
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.ServiceSubtaskDetail;
import com.smartor.service.IServiceSubtaskDetailService;
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 smartor
 * @date 2023-03-24
 */
@RestController
@RequestMapping("/smartor/serviceSubtaskDetail")
public class ServiceSubtaskDetailController extends BaseController {
    @Autowired
    private IServiceSubtaskDetailService ServiceSubtaskDetailService;

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody ServiceSubtaskDetail serviceSubtaskDetail) {
        startPage();
        List<ServiceSubtaskDetail> list = ServiceSubtaskDetailService.selectServiceSubtaskDetailList(serviceSubtaskDetail);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºè¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:export')")
    @Log(title = "语音任务呼叫明细", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ServiceSubtaskDetail serviceSubtaskDetail) {
        List<ServiceSubtaskDetail> list = ServiceSubtaskDetailService.selectServiceSubtaskDetailList(serviceSubtaskDetail);
        ExcelUtil<ServiceSubtaskDetail> util = new ExcelUtil<ServiceSubtaskDetail>(ServiceSubtaskDetail.class);
        util.exportExcel(response, list, "语音任务呼叫明细数据");
    }

    /**
     * èŽ·å–语音任务呼叫明细详细信息
     */
    @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:query')")
    @GetMapping(value = "/{calldetailid}")
    public AjaxResult getInfo(@PathVariable("calldetailid") String calldetailid) {
        return success(ServiceSubtaskDetailService.selectServiceSubtaskDetailByCalldetailid(calldetailid));
    }

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:add')")
    @Log(title = "语音任务呼叫明细", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceSubtaskDetail serviceSubtaskDetail) {
        return toAjax(ServiceSubtaskDetailService.insertServiceSubtaskDetail(serviceSubtaskDetail));
    }

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:edit')")
    @Log(title = "语音任务呼叫明细", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceSubtaskDetail serviceSubtaskDetail) {
        return toAjax(ServiceSubtaskDetailService.updateServiceSubtaskDetail(serviceSubtaskDetail));
    }

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    @PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:remove')")
    @Log(title = "语音任务呼叫明细", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{calldetailids}")
    public AjaxResult remove(@PathVariable String[] calldetailids) {
        return toAjax(ServiceSubtaskDetailService.deleteServiceSubtaskDetailByCalldetailids(calldetailids));
    }

}

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

ÎļþÒÑɾ³ý

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

@@ -50,6 +50,13 @@
    private String scriptDesc;

    /**
     * é—®é¢˜å›¾ç‰‡è·¯å¾„
     */
    @ApiModelProperty("问题图片路径")
    @Excel(name = "问题图片路径")
    private String picturePath;

    /**
     * è¯æœ¯è¯­éŸ³
     */
    @ApiModelProperty("话术语音")

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

@@ -141,6 +141,13 @@
    private Long isabnormal;

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

    /**
     * é¢„警阀值上限
     */
    @ApiModelProperty("预警阀值上限")

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

@@ -28,7 +28,7 @@
     * ä¸»é”®
     */
    @ApiModelProperty(value = "主键")
    private Long ID;
    private Long id;

//    /**
//     * æŒ‡æ ‡id

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

@@ -26,7 +26,7 @@
     * ä¸»é”®ID
     */
    @ApiModelProperty(value = "主键")
    private Long ID;
    private Long id;

    /**
     * æ¨¡æ¿è¯æœ¯ç¼–号
@@ -40,7 +40,7 @@
     */
    @Excel(name = "模板ID")
    @ApiModelProperty(value = "模板ID")
    private Long templateID;
    private Long templateid;

    /**
     * è¯æœ¯ID
@@ -56,6 +56,13 @@
    private String scriptPoint;

    /**
     * é—®é¢˜ç±»åž‹
     */
    @Excel(name = "问题类型")
    @ApiModelProperty(value = "问题类型")
    private String scriptType;

    /**
     * è¯æœ¯å†…容
     */
    @Excel(name = "话术内容")

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

@@ -26,7 +26,7 @@
     * ä¸»é”®ID
     */
    @ApiModelProperty(value = "主键")
    private Long ID;
    private Long id;

    /**
     * æ¨¡æ¿è¯æœ¯ç¼–号
@@ -40,13 +40,13 @@
     */
    @Excel(name = "模板ID")
    @ApiModelProperty(value = "模板ID")
    private Long templateID;
    private Long templateid;

    /**
     * åŸºç¡€è¯æœ¯ID
     */
    @ApiModelProperty(value = "基础话术ID")
    private Long scriptID;
    private Long scriptid;

    /**
     * é—®é¢˜ç‚¹
@@ -174,6 +174,12 @@
    private String delFlag;

    /**
     * é—®é¢˜ç±»åž‹
     */
    @ApiModelProperty(value = "问题类型")
    private String scriptType;

    /**
     * ä¸Šä¼ æ ‡è®°
     */
    @Excel(name = " ä¸Šä¼ æ ‡è®° ")

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

@@ -1,19 +1,13 @@
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;

/**
 * é—®é¢˜å›žç­”明细
 * ç”µè¯é—®é¢˜å›žç­”明细
 *
 * @author ls
 * @date 2023-06-05
@@ -28,10 +22,7 @@
    @ApiModelProperty(value = "患者ID")
    private String param2;

    @ApiModelProperty(value = "随访问题回答明细")
    private List<IvrTaskcalldetail> ivrTaskcalldetailList;

    @ApiModelProperty(value = "问卷问题回答明细")
    private List<SvyTasksingledetail> svyTasksingledetailList;
    @ApiModelProperty(value = "电话问题回答明细")
    private List<ServiceSubtaskDetail> serviceSubtaskDetailList;

}

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

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

import java.util.Date;

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;

/**
 * ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹å¯¹è±¡ service_subtask_answer
 *
 * @author ruoyi
 * @date 2024-07-18
 */
@ApiModel(value = "ServiceSubtaskAnswer", description = "任务问卷问题选项对象")
@Data
public class ServiceSubtaskAnswer extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * ä»»åŠ¡ID
     */
    @ApiModelProperty(value = "任务ID")
    private Long taskid;

    /**
     * å­ä»»åŠ¡ID
     */
    @ApiModelProperty(value = "子任务ID")
    private Long singleid;

    /**
     * é¢˜ç›®ID
     */
    @ApiModelProperty(value = "题目ID")
    private Long scriptid;

    /**
     * é¢˜ç›®ç±»åž‹
     */
    @ApiModelProperty(value = "题目类型")
    private Long scriptType;

    /**
     * å¾—分（1、2、3，或A、B、C，或优、良、及格）
     */
    @ApiModelProperty(value = "得分")
    private String score;

    /**
     * å›žç­”（允许多选）
     */
    @ApiModelProperty(value = "回答")
    private String answer;

    /**
     * è¯„语
     */
    @ApiModelProperty(value = "评语")
    private String comment;

    /**
     * éœ€è¦è·Ÿè¿›ï¼ˆæ˜¯ï¼š1、否：0）
     */
    @ApiModelProperty(value = "需要跟进")
    private String istrack;

    /**
     * å¼‚常预警（是：1、否：0）
     */
    @ApiModelProperty(value = "异常预警")
    private String isabnormal;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡å¿—（0：未上传 1：已上传）
     */
    @ApiModelProperty(value = "上传标志")
    private Long isupload;

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

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

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


}

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

ÎļþÃû´Ó smartor/src/main/java/com/smartor/domain/IvrTaskcalldetail.java ÐÞ¸Ä
@@ -18,15 +18,15 @@
 * @date 2023-03-24
 */
@Data
@ApiModel(value = "IvrTaskcalldetail", description = "问题回答明细")
public class IvrTaskcalldetail extends BaseEntity {
@ApiModel(value = "ServiceSubtaskDetail", description = "问题回答明细")
public class ServiceSubtaskDetail extends BaseEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    private String calldetailid;
    private String id;

    @ApiModelProperty(value = "tasksingleid")
    private String callid;
    @ApiModelProperty(value = "子任务ID")
    private Long subId;

    @ApiModelProperty(value = "拨号uuid")
    private String uuid;

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

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

    /**
     * æŽ’序

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

@@ -51,6 +51,12 @@
    private String optioncode;

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

    /**
     * é€‰é¡¹å†…容
     */
    @ApiModelProperty(value = "选项内容")

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

@@ -82,7 +82,7 @@
     */
    @ApiModelProperty(value = "版本")
    @Excel(name = " ç‰ˆæœ¬ ")
    private BigDecimal version;
    private String version;

    /**
     * ä¸­å¿ƒåº“代码

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

ÎļþÒÑɾ³ý

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

@@ -20,7 +20,7 @@
     * @param ID æ¨¡ç‰ˆé—®é¢˜è¯æœ¯åº“主键
     * @return æ¨¡ç‰ˆé—®é¢˜è¯æœ¯åº“
     */
    public IvrLibaTemplateScript selectIvrLibaTemplateScriptByID(Long ID);
    public IvrLibaTemplateScript selectIvrLibaTemplateScriptByID(Long id);

    /**
     * æŸ¥è¯¢æ¨¡ç‰ˆé—®é¢˜è¯æœ¯åº“列表
@@ -52,7 +52,7 @@
     * @param ID æ¨¡ç‰ˆé—®é¢˜è¯æœ¯åº“主键
     * @return ç»“æžœ
     */
    public int deleteIvrLibaTemplateScriptByID(Long ID);
    public int deleteIvrLibaTemplateScriptByID(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡ç‰ˆé—®é¢˜è¯æœ¯åº“

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

ÎļþÒÑɾ³ý

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

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

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

import java.util.List;

/**
 * ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹Mapper接口
 *
 * @author ruoyi
 * @date 2024-07-18
 */
@Mapper
public interface ServiceSubtaskAnswerMapper {
    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param id ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¸»é”®
     * @return ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    public ServiceSubtaskAnswer selectServiceSubtaskAnswerById(Long id);

    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹åˆ—表
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹é›†åˆ
     */
    public List<ServiceSubtaskAnswer> selectServiceSubtaskAnswerList(ServiceSubtaskAnswer serviceSubtaskAnswer);

    /**
     * æ–°å¢žä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ç»“æžœ
     */
    public int insertServiceSubtaskAnswer(ServiceSubtaskAnswer serviceSubtaskAnswer);

    /**
     * ä¿®æ”¹ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ç»“æžœ
     */
    public int updateServiceSubtaskAnswer(ServiceSubtaskAnswer serviceSubtaskAnswer);

    /**
     * åˆ é™¤ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param id ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteServiceSubtaskAnswerById(Long id);

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

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

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

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

import java.util.List;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†Mapper接口
 *
 * @author smartor
 * @date 2023-03-24
 */
@Mapper
public interface ServiceSubtaskDetailMapper
{
    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param calldetailid è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¸»é”®
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    public ServiceSubtaskDetail selectServiceSubtaskDetailByCalldetailid(String calldetailid);

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†åˆ—表
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†é›†åˆ
     */
    public List<ServiceSubtaskDetail> selectServiceSubtaskDetailList(ServiceSubtaskDetail serviceSubtaskDetail);

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return ç»“æžœ
     */
    public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail);

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return ç»“æžœ
     */
    public int updateServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail);

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param calldetailid è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteServiceSubtaskDetailByCalldetailid(String calldetailid);

    /**
     * æ‰¹é‡åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param calldetailids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceSubtaskDetailByCalldetailids(String[] calldetailids);
}

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

ÎļþÒÑɾ³ý

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

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

import com.smartor.domain.IvrLibaTemplateVO;
import com.smartor.domain.IvrTaskTemplate;
import com.smartor.domain.IvrTaskTemplateVO;


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

ÎļþÒÑɾ³ý

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

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

import com.smartor.domain.ServiceSubtaskAnswer;

import java.util.List;

/**
 * ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹Service接口
 *
 * @author ruoyi
 * @date 2024-07-18
 */
public interface IServiceSubtaskAnswerService
{
    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param id ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¸»é”®
     * @return ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    public ServiceSubtaskAnswer selectServiceSubtaskAnswerById(Long id);

    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹åˆ—表
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹é›†åˆ
     */
    public List<ServiceSubtaskAnswer> selectServiceSubtaskAnswerList(ServiceSubtaskAnswer serviceSubtaskAnswer);

    /**
     * æ–°å¢žä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ç»“æžœ
     */
    public int insertServiceSubtaskAnswer(ServiceSubtaskAnswer serviceSubtaskAnswer);

    /**
     * ä¿®æ”¹ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ç»“æžœ
     */
    public int updateServiceSubtaskAnswer(ServiceSubtaskAnswer serviceSubtaskAnswer);

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

    /**
     * åˆ é™¤ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¿¡æ¯
     *
     * @param id ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteServiceSubtaskAnswerById(Long id);
}

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

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

import com.smartor.domain.ServiceSubtaskDetail;

import java.util.List;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†Service接口
 *
 * @author smartor
 * @date 2023-03-24
 */
public interface IServiceSubtaskDetailService {
    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param calldetailid è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¸»é”®
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    public ServiceSubtaskDetail selectServiceSubtaskDetailByCalldetailid(String calldetailid);

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†åˆ—表
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†é›†åˆ
     */
    public List<ServiceSubtaskDetail> selectServiceSubtaskDetailList( ServiceSubtaskDetail serviceSubtaskDetail);

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return ç»“æžœ
     */
    public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail);

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return ç»“æžœ
     */
    public int updateServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail);

    /**
     * æ‰¹é‡åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param subtaskDetails éœ€è¦åˆ é™¤çš„语音任务呼叫明细主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceSubtaskDetailByCalldetailids(String[] subtaskDetails);

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¿¡æ¯
     *
     * @param subtaskDetailid è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteServiceSubtaskDetailByCalldetailid(String subtaskDetailid);
}

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

ÎļþÒÑɾ³ý

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

@@ -128,26 +128,26 @@
            //新增
            ivrLibaTemplate.setCreateTime(new Date());
            ivrLibaTemplateMapper.insertIvrLibaTemplate(ivrLibaTemplate);
            i = ivrLibaTemplate.getID().intValue();
            i = ivrLibaTemplate.getId().intValue();
        } else if (ivrLibaTemplateVO.getIsoperation() != null && ivrLibaTemplateVO.getIsoperation() == 2) {
            //修改
            ivrLibaTemplate.setUpdateTime(new Date());
            ivrLibaTemplateMapper.updateIvrLibaTemplate(ivrLibaTemplate);
            i = ivrLibaTemplate.getID().intValue();
            i = ivrLibaTemplate.getId().intValue();
        }
        log.info("新增或修改模板详情的id为：{}", ivrLibaTemplate.getID());
        log.info("新增或修改模板详情的id为：{}", ivrLibaTemplate.getId());

        //对模板标签进行处理
        if (CollectionUtils.isNotEmpty(ivrLibaTemplateVO.getIvrLibaTemplateTagList())) {
            for (IvrLibaTemplateTag ivrLibaTemplateTag : ivrLibaTemplateVO.getIvrLibaTemplateTagList()) {
                if (ivrLibaTemplateTag.getIsoperation() != null && ivrLibaTemplateTag.getIsoperation() == 1) {
                    //新增
                    ivrLibaTemplateTag.setTemplateid(ivrLibaTemplate.getID());
                    ivrLibaTemplateTag.setTemplateid(ivrLibaTemplate.getId());
                    ivrLibaTemplateTag.setCreateTime(new Date());
                    ivrLibaTemplateTagMapper.insertIvrLibaTemplateTag(ivrLibaTemplateTag);
                } else if (ivrLibaTemplateTag.getIsoperation() != null && ivrLibaTemplateTag.getIsoperation() == 2) {
                    //修改
                    ivrLibaTemplateTag.setTemplateid(ivrLibaTemplate.getID());
                    ivrLibaTemplateTag.setTemplateid(ivrLibaTemplate.getId());
                    ivrLibaTemplateTag.setUploadTime(new Date());
                    ivrLibaTemplateTagMapper.updateIvrLibaTemplateTag(ivrLibaTemplateTag);
                } else if (ivrLibaTemplateTag.getIsoperation() != null && ivrLibaTemplateTag.getIsoperation() == 3) {
@@ -167,10 +167,10 @@
            for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateVO.getIvrLibaTemplateScriptVOList()) {
                if (ivrLibaTemplateScriptVO.getIsoperation() != null) {
                    IvrLibaTemplateScript ivrLibaTemplateScript = scriptHandle(ivrLibaTemplate, ivrLibaTemplateScriptVO, ivrLibaTemplateScriptVO.getIsoperation());
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID(),ivrLibaTemplateScriptVO.getIsoperation());
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getId(),ivrLibaTemplateScriptVO.getIsoperation());
                } else {
                    IvrLibaTemplateScript ivrLibaTemplateScript = scriptHandle(ivrLibaTemplate, ivrLibaTemplateScriptVO, ivrLibaTemplateVO.getIsoperation());
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID(),ivrLibaTemplateVO.getIsoperation());
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getId(),ivrLibaTemplateVO.getIsoperation());
                }
            }
        }
@@ -179,7 +179,7 @@
        for (TempDetpRelevance tempDetpRelevance : ivrLibaTemplateVO.getTempDetpRelevances()) {
            if (tempDetpRelevance.getId() == null) {
                //新增
                tempDetpRelevance.setTempid(ivrLibaTemplate.getID());
                tempDetpRelevance.setTempid(ivrLibaTemplate.getId());
                tempDetpRelevance.setType(2L);
                tempDetpRelevance.setCreateTime(new Date());
                tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
@@ -196,27 +196,27 @@
        IvrLibaTemplateScript ivrLibaTemplateScript = DtoConversionUtils.sourceToTarget(ivrLibaTemplateScriptVO, IvrLibaTemplateScript.class);
        if (isoperation == 1) {
            //新增
            ivrLibaTemplateScript.setTemplateID(ivrLibaTemplate.getID());
            ivrLibaTemplateScript.setTemplateid(ivrLibaTemplate.getId());
            ivrLibaTemplateScript.setCreateTime(new Date());
            ivrLibaTemplateScriptMapper.insertIvrLibaTemplateScript(ivrLibaTemplateScript);
            //对选项目进行处理
            dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID(),isoperation);
            dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getId(),isoperation);

        } else if (isoperation == 2) {
            //修改
            ivrLibaTemplateScript.setTemplateID(ivrLibaTemplate.getID());
            ivrLibaTemplateScript.setTemplateid(ivrLibaTemplate.getId());
            ivrLibaTemplateScript.setUpdateTime(new Date());
            ivrLibaTemplateScriptMapper.updateIvrLibaTemplateScript(ivrLibaTemplateScript);
            //对选项目进行处理
            dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID(), isoperation);
            dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getId(), isoperation);

        } else if (isoperation == 3) {
            //删除
            if (ivrLibaTemplateScriptVO.getID() == null) {
            if (ivrLibaTemplateScriptVO.getId() == null) {
                log.info("删除失败,模板话术id为空");
            } else {
                ivrLibaTemplateScriptVO.setUpdateTime(new Date());
                ivrLibaTemplateScriptMapper.deleteIvrLibaTemplateScriptByID(ivrLibaTemplateScriptVO.getID());
                ivrLibaTemplateScriptMapper.deleteIvrLibaTemplateScriptByID(ivrLibaTemplateScriptVO.getId());
            }
        }
        return ivrLibaTemplateScript;
@@ -243,7 +243,7 @@
                if (isoperation == 1) {
                    //新增
                    ivrLibaTemplateTargetoption.setTemplateID(tmpID);
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getID());
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getId());
                    if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getDynamiccruxs()))
                        ivrLibaTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(ivrLibaTemplateTargetoption.getDynamiccruxs()));
                    if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getNodynamiccruxs()))
@@ -252,7 +252,7 @@
                } else if (isoperation == 2) {
                    //修改
                    ivrLibaTemplateTargetoption.setTemplateID(tmpID);
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getID());
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getId());
                    if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getDynamiccruxs()))
                        ivrLibaTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(ivrLibaTemplateTargetoption.getDynamiccruxs()));
                    if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoption.getNodynamiccruxs()))
@@ -288,20 +288,20 @@

        //获取tag信息
        IvrLibaTemplateTag ivrLibaTemplateTag = new IvrLibaTemplateTag();
        ivrLibaTemplateTag.setTemplateid(ivrLibaTemplates.get(0).getID());
        ivrLibaTemplateTag.setTemplateid(ivrLibaTemplates.get(0).getId());
        List<IvrLibaTemplateTag> ivrLibaTemplateTags = ivrLibaTemplateTagMapper.selectIvrLibaTemplateTagList(ivrLibaTemplateTag);

        //查询话术
        IvrLibaTemplateScript ivrLibaTemplateScript = new IvrLibaTemplateScript();
        ivrLibaTemplateScript.setTemplateID(ivrLibaTemplates.get(0).getID());
        ivrLibaTemplateScript.setTemplateid(ivrLibaTemplates.get(0).getId());
        List<IvrLibaTemplateScript> ivrLibaTemplateScripts = ivrLibaTemplateScriptMapper.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);
        List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOS = DtoConversionUtils.sourceToTarget(ivrLibaTemplateScripts, IvrLibaTemplateScriptVO.class);

        //通过话术ID获取选项
        for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOS) {
            log.info("ivrLibaTemplateScriptVO的主键id为：{}", ivrLibaTemplateScriptVO.getID());
            log.info("ivrLibaTemplateScriptVO的主键id为：{}", ivrLibaTemplateScriptVO.getId());
            IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption = new IvrLibaTemplateTargetoption();
            ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getID());
            ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getId());
            List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptions = ivrLibaTemplateTargetOptionMapper.selectIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoption);
            for (IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption1 : ivrLibaTemplateTargetoptions) {
                ObjectMapper mapper = new ObjectMapper();

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

ÎļþÒÑɾ³ý

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.ServiceSubtaskAnswer;
import com.smartor.mapper.ServiceSubtaskAnswerMapper;
import com.smartor.service.IServiceSubtaskAnswerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹Service业务层处理
 *
 * @author ruoyi
 * @date 2024-07-18
 */
@Service
public class ServiceSubtaskAnswerServiceImpl implements IServiceSubtaskAnswerService
{
    @Autowired
    private ServiceSubtaskAnswerMapper serviceSubtaskAnswerMapper;

    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param id ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¸»é”®
     * @return ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    @Override
    public ServiceSubtaskAnswer selectServiceSubtaskAnswerById(Long id)
    {
        return serviceSubtaskAnswerMapper.selectServiceSubtaskAnswerById(id);
    }

    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹åˆ—表
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     */
    @Override
    public List<ServiceSubtaskAnswer> selectServiceSubtaskAnswerList(ServiceSubtaskAnswer serviceSubtaskAnswer)
    {
        return serviceSubtaskAnswerMapper.selectServiceSubtaskAnswerList(serviceSubtaskAnswer);
    }

    /**
     * æ–°å¢žä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceSubtaskAnswer(ServiceSubtaskAnswer serviceSubtaskAnswer)
    {
        serviceSubtaskAnswer.setCreateTime(DateUtils.getNowDate());
        return serviceSubtaskAnswerMapper.insertServiceSubtaskAnswer(serviceSubtaskAnswer);
    }

    /**
     * ä¿®æ”¹ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     *
     * @param serviceSubtaskAnswer ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹
     * @return ç»“æžœ
     */
    @Override
    public int updateServiceSubtaskAnswer(ServiceSubtaskAnswer serviceSubtaskAnswer)
    {
        serviceSubtaskAnswer.setUpdateTime(DateUtils.getNowDate());
        return serviceSubtaskAnswerMapper.updateServiceSubtaskAnswer(serviceSubtaskAnswer);
    }

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

    /**
     * åˆ é™¤ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¿¡æ¯
     *
     * @param id ä»»åŠ¡é—®å·é—®é¢˜é€‰é¡¹ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceSubtaskAnswerById(Long id)
    {
        return serviceSubtaskAnswerMapper.deleteServiceSubtaskAnswerById(id);
    }
}

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.ServiceSubtaskDetail;
import com.smartor.domain.ServiceSubtaskDetail;
import com.smartor.mapper.ServiceSubtaskDetailMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IServiceSubtaskDetailService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†Service业务层处理
 *
 * @author smartor
 * @date 2023-03-24
 */
@Slf4j
@Service
public class ServiceSubtaskDetailServiceImpl implements IServiceSubtaskDetailService {
    @Autowired
    private ServiceSubtaskDetailMapper ServiceSubtaskDetailMapper;

    @Autowired
    private ServiceSubtaskMapper ivrTaskSingleMapper;



    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param calldetailid è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¸»é”®
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    @Override
    public ServiceSubtaskDetail selectServiceSubtaskDetailByCalldetailid(String calldetailid) {
        return ServiceSubtaskDetailMapper.selectServiceSubtaskDetailByCalldetailid(calldetailid);
    }

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†åˆ—表
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     */
    @Override
    public List<ServiceSubtaskDetail> selectServiceSubtaskDetailList(ServiceSubtaskDetail serviceSubtaskDetail) {
        return ServiceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
    }

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail) {
        serviceSubtaskDetail.setCreateTime(DateUtils.getNowDate());
        return ServiceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
    }

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param serviceSubtaskDetail è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     * @return ç»“æžœ
     */
    @Override
    public int updateServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail) {
        serviceSubtaskDetail.setUpdateTime(DateUtils.getNowDate());
        return ServiceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
    }

    /**
     * æ‰¹é‡åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†
     *
     * @param calldetailids éœ€è¦åˆ é™¤çš„语音任务呼叫明细主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceSubtaskDetailByCalldetailids(String[] calldetailids) {
        return ServiceSubtaskDetailMapper.deleteServiceSubtaskDetailByCalldetailids(calldetailids);
    }

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¿¡æ¯
     *
     * @param calldetailid è¯­éŸ³ä»»åŠ¡å‘¼å«æ˜Žç»†ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceSubtaskDetailByCalldetailid(String calldetailid) {
        return ServiceSubtaskDetailMapper.deleteServiceSubtaskDetailByCalldetailid(calldetailid);
    }

}

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

@@ -42,18 +42,13 @@
    private ServiceSubtaskMapper serviceSubtaskMapper;

    @Autowired
    private IvrTaskcalldetailMapper ivrTaskcalldetailMapper;
    @Autowired
    private SvyTasksingledetailMapper svyTasksingledetailMapper;
    private ServiceSubtaskDetailMapper ivrTaskcalldetailMapper;

    @Autowired
    private IServiceTaskService serviceTaskService;

    @Autowired
    private IvrTaskTemplateTargetoptionMapper serviceTaskScriptTargetoptionMapper;

    @Autowired
    private IvrLibaTemplateScriptMapper ivrLibaTemplateScriptMapper;

    @Autowired
    private IvrTaskVisitResultMapper serviceTaskVisitResultMapper;
@@ -771,28 +766,18 @@
        ServiceSubtask ivrTaskSingle = new ServiceSubtask();
        ivrTaskSingle.setTaskid(tid);
        ivrTaskSingle.setPatid(pid);
        List<ServiceSubtask> ivrTaskSingles = serviceSubtaskMapper.selectServiceSubtaskList(ivrTaskSingle);
        if (CollectionUtils.isEmpty(ivrTaskSingles) || ivrTaskSingles.size() == 0) {
            log.error("报错了，ivrTaskSingles数据为空了：{}", ivrTaskSingle);
        List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ivrTaskSingle);
        if (CollectionUtils.isEmpty(selectServiceSubtaskList) || selectServiceSubtaskList.size() == 0) {
            log.error("报错了，selectServiceSubtaskList数据为空了：{}", ivrTaskSingle);
            return 0;
        }
        int i = 0;
        if (CollectionUtils.isNotEmpty(serviceSubTaskDetailReq.getIvrTaskcalldetailList())) {
            //随访
            for (IvrTaskcalldetail ivrTaskcalldetail : serviceSubTaskDetailReq.getIvrTaskcalldetailList()) {
                ivrTaskcalldetail.setCallid(ivrTaskSingles.get(0).getId().toString());
                ivrTaskcalldetail.setCalldetailid(UUID.randomUUID().toString());
                ivrTaskcalldetail.setCreateTime(new Date());
                i = ivrTaskcalldetailMapper.insertIvrTaskcalldetail(ivrTaskcalldetail);
            }
        } else if (CollectionUtils.isNotEmpty(serviceSubTaskDetailReq.getSvyTasksingledetailList())) {
            //问卷
            for (SvyTasksingledetail svyTasksingledetail : serviceSubTaskDetailReq.getSvyTasksingledetailList()) {
                svyTasksingledetail.setCallid(ivrTaskSingles.get(0).getId().toString());
                svyTasksingledetail.setCalldetailid(UUID.randomUUID().toString());
                svyTasksingledetail.setCreateTime(new Date());
                i = svyTasksingledetailMapper.insertSvyTasksingledetail(svyTasksingledetail);
            }
        for (ServiceSubtaskDetail serviceSubtaskDetail : serviceSubTaskDetailReq.getServiceSubtaskDetailList()) {
            serviceSubtaskDetail.setSubId(selectServiceSubtaskList.get(0).getId());
            serviceSubtaskDetail.setId(UUID.randomUUID().toString());
            serviceSubtaskDetail.setCreateTime(new Date());
            i = ivrTaskcalldetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
        }
        return i;
    }

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

@@ -171,7 +171,7 @@
    public List sfInfo(ServiceTask serviceTask, Long patid) {
        //通过模板ID获取问题信息
        IvrLibaTemplateScript ivrLibaTemplateScript = new IvrLibaTemplateScript();
        ivrLibaTemplateScript.setTemplateID(serviceTask.getTemplateid());
        ivrLibaTemplateScript.setTemplateid(serviceTask.getTemplateid());
        ivrLibaTemplateScript.setDelFlag("0");
        List<IvrLibaTemplateScript> ivrLibaTemplateScripts = ivrLibaTemplateScriptMapper.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);
        if (CollectionUtils.isEmpty(ivrLibaTemplateScripts) || ivrLibaTemplateScripts.size() == 0) {
@@ -213,7 +213,7 @@

                //获取问题选项
                IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption = new IvrLibaTemplateTargetoption();
                ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getID());
                ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getId());
                List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptions = ivrLibaTemplateTargetOptionMapper.selectIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoption);
                ivrLibaTemplateScriptVO.setIvrLibaScriptTargetoptionList(ivrLibaTemplateTargetoptions);
            }

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

ÎļþÒÑɾ³ý

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

@@ -35,11 +35,13 @@
        <result property="dynamiccruxsJson" column="dynamiccruxs"/>
        <result property="appendflag" column="appendflag"/>
        <result property="appenddesc" column="appenddesc"/>
        <result property="picturePath" column="picture_path"/>
    </resultMap>

    <sql id="selectIvrLibaScriptTargetoptionVo">
        select id,
               targetid,
               picture_path,
               targetname,
               appendflag,
               appenddesc,
@@ -86,6 +88,7 @@
            <if test="dynamiccruxsJson != null ">and dynamiccruxs = #{dynamiccruxsJson}</if>
            <if test="appendflag != null">and appendflag = #{appendflag}</if>
            <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
            <if test="picturePath != null">and picture_path = #{picturePath}</if>
        </where>
    </select>

@@ -128,6 +131,7 @@
            <if test="dynamiccruxsJson != null ">dynamiccruxs,</if>
            <if test="appendflag != null">appendflag,</if>
            <if test="appenddesc != null">appenddesc,</if>
            <if test="picturePath != null">picture_path,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -160,6 +164,7 @@
            <if test="dynamiccruxsJson != null ">#{dynamiccruxsJson},</if>
            <if test="appendflag != null">#{appendflag},</if>
            <if test="appenddesc != null">#{appenddesc},</if>
            <if test="picturePath != null">#{picturePath},</if>
        </trim>
    </insert>

@@ -195,6 +200,7 @@
            <if test="dynamiccruxsJson != null ">dynamiccruxs = #{dynamiccruxsJson},</if>
            <if test="appendflag != null">appendflag = #{appendflag},</if>
            <if test="appenddesc != null">appenddesc = #{appenddesc},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -5,10 +5,10 @@
<mapper namespace="com.smartor.mapper.IvrLibaTemplateScriptMapper">

    <resultMap type="com.smartor.domain.IvrLibaTemplateScript" id="IvrLibaTemplateScriptResult">
        <result property="ID" column="ID"/>
        <result property="id" column="id"/>
        <result property="scriptno" column="scriptno"/>
        <result property="templateID" column="templateID"/>
        <result property="scriptid" column="scriptID"/>
        <result property="templateid" column="templateid"/>
        <result property="scriptid" column="scriptid"/>
        <result property="scriptPoint" column="script_point"/>
        <result property="scriptContent" column="script_content"/>
        <result property="scriptDesc" column="script_content"/>
@@ -41,13 +41,15 @@
        <result property="otherdata" column="otherdata"/>
        <result property="isMust" column="is_must"/>
        <result property="scriptDesc" column="script_desc"/>
        <result property="scriptType" column="script_type"/>
    </resultMap>

    <sql id="selectIvrLibaTemplateScriptVo">
        select ID,
        select id,
               scriptno,
               templateID,
               scriptID,
               templateid,
               script_type,
               scriptid,
               script_point,
               script_content,
               script_desc,
@@ -89,7 +91,7 @@
            del_flag=0
            <if test="scriptno != null ">and scriptno = #{scriptno}</if>
            <if test="scriptDesc != null ">and script_desc = #{scriptDesc}</if>
            <if test="templateID != null ">and templateID = #{templateID}</if>
            <if test="templateid != null ">and templateid = #{templateid}</if>
            <if test="scriptPoint != null  and scriptPoint != ''">and script_point = #{scriptPoint}</if>
            <if test="scriptContent != null  and scriptContent != ''">and script_content = #{scriptContent}</if>
            <if test="scriptVoice != null  and scriptVoice != ''">and script_voice = #{scriptVoice}</if>
@@ -119,12 +121,13 @@
            <if test="targetid != null ">and targetid = #{targetid}</if>
            <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
            <if test="isMust != null  and isMust != ''">and is_must = #{isMust}</if>
            <if test="scriptType != null">and script_type = #{scriptType}</if>
        </where>
    </select>

    <select id="selectIvrLibaTemplateScriptByID" parameterType="Long" resultMap="IvrLibaTemplateScriptResult">
        <include refid="selectIvrLibaTemplateScriptVo"/>
        where ID = #{ID}
        where id = #{id}
    </select>

    <insert id="insertIvrLibaTemplateScript" parameterType="com.smartor.domain.IvrLibaTemplateScript"
@@ -133,8 +136,8 @@
        insert into ivr_liba_template_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="scriptno != null">scriptno,</if>
            <if test="templateID != null">templateID,</if>
            <if test="scriptid != null">scriptID,</if>
            <if test="templateid != null">templateid,</if>
            <if test="scriptid != null">scriptid,</if>
            <if test=" scriptPoint != null and  scriptPoint != ''">script_point,</if>
            <if test="scriptContent != null">script_content,</if>
            <if test="scriptVoice != null">script_voice,</if>
@@ -166,10 +169,11 @@
            <if test="otherdata != null">otherdata,</if>
            <if test="isMust != null  and isMust != ''">is_must,</if>
            <if test="scriptDesc != null ">script_desc,</if>
            <if test="scriptType != null ">script_type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="scriptno != null">#{scriptno},</if>
            <if test="templateID != null">#{templateID},</if>
            <if test="templateid != null">#{templateid},</if>
            <if test="scriptid != null">#{scriptid},</if>
            <if test="scriptPoint != null and scriptPoint != ''">#{scriptPoint},</if>
            <if test="scriptContent != null">#{scriptContent},</if>
@@ -202,6 +206,7 @@
            <if test="otherdata != null">#{otherdata},</if>
            <if test="isMust != null  and isMust != ''">#{isMust},</if>
            <if test="scriptDesc != null ">#{scriptDesc},</if>
            <if test="scriptType != null ">#{scriptType},</if>
        </trim>
    </insert>

@@ -209,8 +214,8 @@
        update ivr_liba_template_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="scriptno != null">scriptno = #{scriptno},</if>
            <if test="templateID != null">templateID = #{templateID},</if>
            <if test="scriptid != null">scriptID = #{scriptid},</if>
            <if test="templateid != null">templateid = #{templateid},</if>
            <if test="scriptid != null">scriptid = #{scriptid},</if>
            <if test="scriptPoint != null and scriptPoint != ''">script_point = #{scriptPoint},</if>
            <if test="scriptContent != null">script_content = #{scriptContent},</if>
            <if test="scriptVoice != null">script_voice = #{scriptVoice},</if>
@@ -241,6 +246,7 @@
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="isMust != null  and isMust != ''">is_must = #{isMust}</if>
            <if test="scriptDesc != null ">script_desc = #{scriptDesc}</if>
            <if test="scriptType != null ">script_type = #{scriptType}</if>
        </trim>
        where ID = #{ID}
    </update>
@@ -250,13 +256,13 @@
        <trim prefix="SET" suffixOverrides=",">
            del_flag = 1
        </trim>
        where ID = #{ID}
        where id = #{id}
    </update>

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

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,159 @@
<?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.ServiceSubtaskAnswerMapper">

    <resultMap type="com.smartor.domain.ServiceSubtaskAnswer" id="ServiceSubtaskAnswerResult">
        <result property="id" column="id"/>
        <result property="taskid" column="taskid"/>
        <result property="singleid" column="singleid"/>
        <result property="scriptid" column="scriptid"/>
        <result property="scriptType" column="script_type"/>
        <result property="score" column="score"/>
        <result property="answer" column="answer"/>
        <result property="comment" column="comment"/>
        <result property="istrack" column="istrack"/>
        <result property="isabnormal" column="isabnormal"/>
        <result property="delFlag" column="del_flag"/>
        <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="pid" column="pid"/>
        <result property="guid" column="guid"/>
    </resultMap>

    <sql id="selectServiceSubtaskAnswerVo">
        select id,
               taskid,
               singleid,
               scriptid,
               script_type,
               score,
               answer,
               comment,
               istrack,
               isabnormal,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               isupload,
               upload_time,
               pid,
               guid
        from service_subtask_answer
    </sql>

    <select id="selectServiceSubtaskAnswerList" parameterType="com.smartor.domain.ServiceSubtaskAnswer"
            resultMap="ServiceSubtaskAnswerResult">
        <include refid="selectServiceSubtaskAnswerVo"/>
        <where>
            <if test="taskid != null ">and taskid = #{taskid}</if>
            <if test="singleid != null ">and singleid = #{singleid}</if>
            <if test="scriptid != null ">and scriptid = #{scriptid}</if>
            <if test="scriptType != null ">and script_type = #{scriptType}</if>
            <if test="score != null  and score != ''">and score = #{score}</if>
            <if test="answer != null  and answer != ''">and answer = #{answer}</if>
            <if test="comment != null  and comment != ''">and comment = #{comment}</if>
            <if test="istrack != null  and istrack != ''">and istrack = #{istrack}</if>
            <if test="isabnormal != null  and isabnormal != ''">and isabnormal = #{isabnormal}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="pid != null  and pid != ''">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
        </where>
    </select>

    <select id="selectServiceSubtaskAnswerById" parameterType="Long" resultMap="ServiceSubtaskAnswerResult">
        <include refid="selectServiceSubtaskAnswerVo"/>
        where id = #{id}
    </select>

    <insert id="insertServiceSubtaskAnswer" parameterType="com.smartor.domain.ServiceSubtaskAnswer"
            useGeneratedKeys="true" keyProperty="id">
        insert into service_subtask_answer
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="taskid != null">taskid,</if>
            <if test="singleid != null">singleid,</if>
            <if test="scriptid != null">scriptid,</if>
            <if test="scriptType != null">script_type,</if>
            <if test="score != null">score,</if>
            <if test="answer != null">answer,</if>
            <if test="comment != null">comment,</if>
            <if test="istrack != null">istrack,</if>
            <if test="isabnormal != null">isabnormal,</if>
            <if test="delFlag != null">del_flag,</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="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskid != null">#{taskid},</if>
            <if test="singleid != null">#{singleid},</if>
            <if test="scriptid != null">#{scriptid},</if>
            <if test="scriptType != null">#{scriptType},</if>
            <if test="score != null">#{score},</if>
            <if test="answer != null">#{answer},</if>
            <if test="comment != null">#{comment},</if>
            <if test="istrack != null">#{istrack},</if>
            <if test="isabnormal != null">#{isabnormal},</if>
            <if test="delFlag != null">#{delFlag},</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="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
        </trim>
    </insert>

    <update id="updateServiceSubtaskAnswer" parameterType="com.smartor.domain.ServiceSubtaskAnswer">
        update service_subtask_answer
        <trim prefix="SET" suffixOverrides=",">
            <if test="taskid != null">taskid = #{taskid},</if>
            <if test="singleid != null">singleid = #{singleid},</if>
            <if test="scriptid != null">scriptid = #{scriptid},</if>
            <if test="scriptType != null">script_type = #{scriptType},</if>
            <if test="score != null">score = #{score},</if>
            <if test="answer != null">answer = #{answer},</if>
            <if test="comment != null">comment = #{comment},</if>
            <if test="istrack != null">istrack = #{istrack},</if>
            <if test="isabnormal != null">isabnormal = #{isabnormal},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</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="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteServiceSubtaskAnswerById" parameterType="Long">
        delete
        from service_subtask_answer
        where id = #{id}
    </delete>

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

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

ÎļþÃû´Ó smartor/src/main/resources/mapper/smartor/IvrTaskcalldetailMapper.xml ÐÞ¸Ä
@@ -2,11 +2,11 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.IvrTaskcalldetailMapper">
<mapper namespace="com.smartor.mapper.ServiceSubtaskDetailMapper">

    <resultMap type="com.smartor.domain.IvrTaskcalldetail" id="IvrTaskcalldetailResult">
        <result property="calldetailid" column="calldetailid"/>
        <result property="callid" column="callid"/>
    <resultMap type="com.smartor.domain.ServiceSubtaskDetail" id="ServiceSubtaskDetailResult">
        <result property="id" column="id"/>
        <result property="subId" column="sub_id"/>
        <result property="uuid" column="uuid"/>
        <result property="phone" column="phone"/>
        <result property="operate" column="operate"/>
@@ -48,9 +48,9 @@
        <result property="valueType" column="value_type"/>
    </resultMap>

    <sql id="selectIvrTaskcalldetailVo">
        select calldetailid,
               callid,
    <sql id="selectServiceSubtaskDetailVo">
        select id,
               sub_id,
               uuid,
               phone,
               operate,
@@ -93,11 +93,11 @@
        from ivr_taskcalldetail
    </sql>

    <select id="selectIvrTaskcalldetailList" parameterType="com.smartor.domain.IvrTaskcalldetail"
            resultMap="IvrTaskcalldetailResult">
        <include refid="selectIvrTaskcalldetailVo"/>
    <select id="selectServiceSubtaskDetailList" parameterType="com.smartor.domain.ServiceSubtaskDetail"
            resultMap="ServiceSubtaskDetailResult">
        <include refid="selectServiceSubtaskDetailVo"/>
        <where>
            <if test="callid != null  and callid != ''">and callid = #{callid}</if>
            <if test="subId != null">and sub_id = #{subId}</if>
            <if test="uuid != null  and uuid != ''">and uuid = #{uuid}</if>
            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
            <if test="operate != null  and operate != ''">and operate = #{operate}</if>
@@ -137,16 +137,16 @@
        </where>
    </select>

    <select id="selectIvrTaskcalldetailByCalldetailid" parameterType="String" resultMap="IvrTaskcalldetailResult">
        <include refid="selectIvrTaskcalldetailVo"/>
        where calldetailid = #{calldetailid}
    <select id="selectServiceSubtaskDetailByCalldetailid" parameterType="String" resultMap="ServiceSubtaskDetailResult">
        <include refid="selectServiceSubtaskDetailVo"/>
        where id = #{id}
    </select>

    <insert id="insertIvrTaskcalldetail" parameterType="com.smartor.domain.IvrTaskcalldetail">
    <insert id="insertServiceSubtaskDetail" parameterType="com.smartor.domain.ServiceSubtaskDetail">
        insert into ivr_taskcalldetail
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="calldetailid != null">calldetailid,</if>
            <if test="callid != null">callid,</if>
            <if test="id != null">id,</if>
            <if test="subId != null">sub_id,</if>
            <if test="uuid != null">uuid,</if>
            <if test="phone != null">phone,</if>
            <if test="operate != null">operate,</if>
@@ -188,8 +188,8 @@
            <if test="valueType != null">value_type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="calldetailid != null">#{calldetailid},</if>
            <if test="callid != null">#{callid},</if>
            <if test="id != null">#{id},</if>
            <if test="subId != null">#{subId},</if>
            <if test="uuid != null">#{uuid},</if>
            <if test="phone != null">#{phone},</if>
            <if test="operate != null">#{operate},</if>
@@ -232,10 +232,10 @@
        </trim>
    </insert>

    <update id="updateIvrTaskcalldetail" parameterType="com.smartor.domain.IvrTaskcalldetail">
    <update id="updateServiceSubtaskDetail" parameterType="com.smartor.domain.ServiceSubtaskDetail">
        update ivr_taskcalldetail
        <trim prefix="SET" suffixOverrides=",">
            <if test="callid != null">callid = #{callid},</if>
            <if test="subId != null">sub_id = #{subId},</if>
            <if test="uuid != null">uuid = #{uuid},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="operate != null">operate = #{operate},</if>
@@ -276,19 +276,19 @@
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="valueType != null">value_type = #{valueType},</if>
        </trim>
        where calldetailid = #{calldetailid}
        where id = #{id}
    </update>

    <delete id="deleteIvrTaskcalldetailByCalldetailid" parameterType="String">
    <delete id="deleteServiceSubtaskDetailByCalldetailid" parameterType="String">
        delete
        from ivr_taskcalldetail
        where calldetailid = #{calldetailid}
        where id = #{id}
    </delete>

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

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

@@ -9,7 +9,7 @@
        <result property="scriptType" column="script_type"/>
        <result property="scriptcode" column="script_code"/>
        <result property="scriptDesc" column="script_desc"/>
        <result property="scriptPicture" column="script_picture"/>
        <result property="picturePath" column="picture_path"/>
        <result property="sort" column="sort"/>
        <result property="ismandatory" column="ismandatory"/>
        <result property="ishide" column="ishide"/>
@@ -63,7 +63,7 @@
               suitway,
               isavailable,
               otherdata,
               script_picture,
               picture_path,
            language,
            icd10_name
        from svy_lib_script
@@ -126,7 +126,7 @@
            <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="picturePath != null  and picturePath != ''">picture_path,</if>
            <if test="scriptTopic != null  and scriptTopic != ''">script_topic,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -156,7 +156,7 @@
            <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="picturePath != null  and picturePath != ''">#{picturePath},</if>
            <if test="scriptTopic != null  and scriptTopic != ''">#{scriptTopic},</if>
        </trim>
    </insert>
@@ -190,7 +190,7 @@
            <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="picturePath != null  and picturePath != ''">picture_path = #{picturePath},</if>
            <if test="scriptTopic != null  and scriptTopic != ''">script_topic = #{scriptTopic},</if>
        </trim>
        where id = #{id}

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

@@ -7,6 +7,7 @@
    <resultMap type="com.smartor.domain.SvyLibScriptOption" id="SvyLibScriptOptionResult">
        <result property="id" column="id"/>
        <result property="topicid" column="topicid"/>
        <result property="picturePath" column="picture_path"/>
        <result property="svyid" column="svyid"/>
        <result property="topictype" column="topictype"/>
        <result property="optioncode" column="optioncode"/>
@@ -44,6 +45,7 @@
        select id,
               topicid,
               svyid,
               picture_path,
               appendflag,
               appenddesc,
               topictype,
@@ -109,6 +111,7 @@
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="appendflag != null">and appendflag = #{appendflag}</if>
            <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
            <if test="picturePath != null">and picture_path = #{picturePath}</if>
        </where>
    </select>

@@ -153,6 +156,7 @@
            <if test="uploadTime != null">upload_time,</if>
            <if test="appendflag != null">appendflag,</if>
            <if test="appenddesc != null">appenddesc,</if>
            <if test="picturePath != null">picture_path,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="topicid != null">#{topicid},</if>
@@ -187,6 +191,7 @@
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="appendflag != null">#{appendflag},</if>
            <if test="appenddesc != null">#{appenddesc},</if>
            <if test="picturePath != null">#{picturePath},</if>
        </trim>
    </insert>

@@ -225,6 +230,7 @@
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="appendflag != null">appendflag = #{appendflag},</if>
            <if test="appenddesc != null">appenddesc = #{appenddesc},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
        </trim>
        where id = #{id}
    </update>
@@ -243,6 +249,5 @@
            #{id}
        </foreach>
    </delete>


</mapper>

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

ÎļþÒÑɾ³ý