smartor代码库
上一版本: 30b4fe30 | 补丁 | 提交 | 忽略空白
liusheng
2025-03-18 7469d35bf8a8f86dab3abc056eae8417fb88482d 
代码提交
已添加1个文件
已修改5个文件
87 ■■■■■ 文件已修改
.idea/jarRepositories.xml 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetail.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .idea/jarRepositories.xml


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,70 @@


<?xml version="1.0" encoding="UTF-8"?>


<project version="4">


  <component name="RemoteRepositoriesConfiguration">


    <remote-repository>


      <option name="id" value="central" />


      <option name="name" value="Central Repository" />


      <option name="url" value="https://repo.maven.apache.org/maven2" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="releases" />


      <option name="name" value="local private nexus" />


      <option name="url" value="http://122.49.30.5:8981/nexus/content/repositories/releases/" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="central" />


      <option name="name" value="Maven Central repository" />


      <option name="url" value="https://repo1.maven.org/maven2" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="aliyun" />


      <option name="name" value="aliyun" />


      <option name="url" value="https://maven.aliyun.com/repository/public" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="central" />


      <option name="name" value="central" />


      <option name="url" value="http://repo2.maven.org/maven2/" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="jcenter" />


      <option name="name" value="jcenter" />


      <option name="url" value="https://jcenter.bintray.com/" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="group_migu" />


      <option name="name" value="group_migu" />


      <option name="url" value="https://nexus.cmread.com:9343/nexus/content/groups/group_migu/" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="public" />


      <option name="name" value="aliyun nexus" />


      <option name="url" value="https://maven.aliyun.com/repository/public" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="central" />


      <option name="name" value="central" />


      <option name="url" value="https://repo.maven.apache.org/maven2" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="central" />


      <option name="name" value="Central Repository" />


      <option name="url" value="http://repo2.maven.org/maven2/" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="snapshots" />


      <option name="name" value="local private nexus snapshots" />


      <option name="url" value="http://122.49.30.5:8981/nexus/content/repositories/snapshots/" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="maven_repos" />


      <option name="name" value="maven_repos" />


      <option name="url" value="https://nexus.cmread.com:9343/nexus/content/repositories/migu" />


    </remote-repository>


    <remote-repository>


      <option name="id" value="jboss.community" />


      <option name="name" value="JBoss Community repository" />


      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />


    </remote-repository>


  </component>


</project>




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


@@ -113,6 +113,10 @@


    private String categoryname;






    @ApiModelProperty(value = "指标ID(从问题上获取)")


    private Integer targetid;






    @ApiModelProperty(value = "指标选项")


    private String targetoptions;






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


@@ -119,6 +119,9 @@


    @ApiModelProperty(value = "指标值（正则匹配的选项值）")


    private String targetvalue;




    @ApiModelProperty(value = "指标ID(问题上的)")


    private Integer targetid;






    @ApiModelProperty(value = "通过正则解析的值")


    private String matchedtext;




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


@@ -465,6 +465,7 @@


        ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid);


        serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());


        serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid));


        serviceSubtaskDetailVO.setTargetid(svyTaskTemplateScriptVO.getTargetid() != null ? svyTaskTemplateScriptVO.getTargetid().intValue() : null);


        serviceSubtaskDetailVO.setPatid(Long.valueOf(patid));


        serviceSubtaskDetailVO.setScriptid(svyTaskTemplateScriptVO.getId());


        serviceSubtaskDetailVO.setValueType(svyTaskTemplateScriptVO.getScriptType());


@@ -527,6 +528,7 @@


                }


            }


        }


        serviceSubtaskDetailVO.setTargetid(ivrTaskTemplateScriptVO.getTargetid() != null ? ivrTaskTemplateScriptVO.getTargetid().intValue() : null);


        serviceSubtaskDetailVO.setQuestiontext(ivrTaskTemplateScriptVO.getScriptContent());


        serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid));


        serviceSubtaskDetailVO.setPatid(Long.valueOf(patid));




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


@@ -2186,6 +2186,7 @@


            serviceSubtaskDetail.setTaskid(serviceSubtask1.getTaskid());


            serviceSubtaskDetail.setPatid(serviceSubtask1.getPatid());


        }


        serviceSubtaskDetail.setTargetid(ivrTaskTemplateScriptVO.getTargetid() != null ? ivrTaskTemplateScriptVO.getTargetid().intValue() : null);


        serviceSubtaskDetail.setUuid(phoneCallReqYQVO.getUuid());


        serviceSubtaskDetail.setPhone(phoneCallReqYQVO.getPhone());


        serviceSubtaskDetail.setOperate(serviceSubtask.getCreateBy());




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


@@ -7,6 +7,7 @@


    <resultMap type="com.smartor.domain.ServiceSubtaskDetail" id="ServiceSubtaskDetailResult">


        <result property="id" column="id"/>


        <result property="subId" column="sub_id"/>


        <result property="targetid" column="targetid"/>


        <result property="taskid" column="taskid"/>


        <result property="uuid" column="uuid"/>


        <result property="phone" column="phone"/>


@@ -58,6 +59,7 @@


    <sql id="selectServiceSubtaskDetailVo">


        select id,


               sub_id,


               targetid,


               answerps,


               scriptid,


               extemplate_text,


@@ -112,6 +114,7 @@


        <include refid="selectServiceSubtaskDetailVo"/>


        <where>


            <if test="subId != null">and sub_id = #{subId}</if>


            <if test="targetid != null">and targetid = #{targetid}</if>


            <if test="extemplateText != null">and extemplate_text = #{extemplateText}</if>


            <if test="taskid != null">and taskid = #{taskid}</if>


            <if test="uuid != null  and uuid != ''">and uuid = #{uuid}</if>


@@ -167,6 +170,7 @@


        <trim prefix="(" suffix=")" suffixOverrides=",">


            <if test="id != null">id,</if>


            <if test="subId != null">sub_id,</if>


            <if test="targetid != null">targetid,</if>


            <if test="taskid != null">taskid,</if>


            <if test="uuid != null">uuid,</if>


            <if test="phone != null">phone,</if>


@@ -217,6 +221,7 @@


        <trim prefix="values (" suffix=")" suffixOverrides=",">


            <if test="id != null">#{id},</if>


            <if test="subId != null">#{subId},</if>


            <if test="targetid != null">#{targetid},</if>


            <if test="taskid != null">#{taskid},</if>


            <if test="uuid != null">#{uuid},</if>


            <if test="phone != null">#{phone},</if>


@@ -271,6 +276,7 @@


        <trim prefix="SET" suffixOverrides=",">


            <if test="subId != null">sub_id = #{subId},</if>


            <if test="taskid != null">taskid = #{taskid},</if>


            <if test="targetid != null">targetid = #{targetid},</if>


            <if test="uuid != null">uuid = #{uuid},</if>


            <if test="phone != null">phone = #{phone},</if>


            <if test="operate != null">operate = #{operate},</if>


@@ -326,6 +332,7 @@


        <trim prefix="SET" suffixOverrides=",">


            <if test="subId != null">sub_id = #{subId},</if>


            <if test="taskid != null">taskid = #{taskid},</if>


            <if test="targetid != null">targetid = #{targetid},</if>


            <if test="uuid != null">uuid = #{uuid},</if>


            <if test="phone != null">phone = #{phone},</if>


            <if test="operate != null">operate = #{operate},</if>