任务模块、电话模块

liusheng

8 天以前 f0a09ee996ab2605869844d6a3d812709e2bf0fa

 ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml

文件名从 smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml 修改
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.ServiceTaskMapper">
<mapper namespace="com.ruoyi.task.mapper.ServiceTaskMapper">

    <resultMap type="com.smartor.domain.ServiceTask" id="ServiceTaskResult">
    <resultMap type="com.ruoyi.task.domain.ServiceTask" id="ServiceTaskResult">
        <result property="taskid" column="taskid"/>
        <result property="taskName" column="task_name"/>
        <result property="templateid" column="templateid"/>
@@ -124,7 +124,7 @@
        from service_task
    </sql>

    <select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
    <select id="selectServiceTaskList" parameterType="com.ruoyi.task.domain.ServiceTask" resultMap="ServiceTaskResult">
        <include refid="selectServiceTaskVo"/>
        where 1=1
        and del_flag = 0
@@ -200,7 +200,7 @@
        order by update_time desc,taskid desc
    </select>

    <select id="selectServiceTaskAndtaskDeptList" parameterType="com.smartor.domain.ServiceTask"
    <select id="selectServiceTaskAndtaskDeptList" parameterType="com.ruoyi.task.domain.ServiceTask"
            resultMap="ServiceTaskResult">
        select service_task.taskid,
        service_task.task_name,
@@ -432,7 +432,7 @@
        where taskid = #{taskid} and del_flag=0
    </select>

    <insert id="insertServiceTask" parameterType="com.smartor.domain.ServiceTask" useGeneratedKeys="true"
    <insert id="insertServiceTask" parameterType="com.ruoyi.task.domain.ServiceTask" useGeneratedKeys="true"
            keyProperty="taskid">
        insert into service_task
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -551,7 +551,7 @@
        </trim>
    </insert>

    <update id="updateServiceTask" parameterType="com.smartor.domain.ServiceTask">
    <update id="updateServiceTask" parameterType="com.ruoyi.task.domain.ServiceTask">
        update service_task
        <trim prefix="SET" suffixOverrides=",">
            <if test="taskName != null and taskName != ''">task_name = #{taskName},</if>