新增短信

ruoyi-system/src/main/resources/mapper/system/InvestigateTableMapper.xml

@@ -1,46 +1,56 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.InvestigateTableMapper">
-    
+
     <resultMap type="InvestigateTable" id="InvestigateTableResult">
-        <result property="investigateTableId"    column="investigate_table_id"    />
-        <result property="investigateName"    column="investigate_name"    />
-        <result property="content"    column="content"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="cipher"    column="cipher"    />
-        <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="remark"    column="remark"    />
-        <collection  property="investigateUserList"   javaType="java.util.List"  resultMap="InvestigateUserResult" />
+        <result property="investigateTableId" column="investigate_table_id"/>
+        <result property="investigateName" column="investigate_name"/>
+        <result property="content" column="content"/>
+        <result property="endTime" column="end_time"/>
+        <result property="cipher" column="cipher"/>
+        <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="remark" column="remark"/>
+        <collection property="investigateUserList" javaType="java.util.List" resultMap="InvestigateUserResult"/>
     </resultMap>
 
     <resultMap type="InvestigateDispositionTable" id="InvestigateDispositionTableResult">
-        <result property="investigateTableId"    column="investigate_table_id"    />
-        <result property="investigateDispositionId"    column="investigate_disposition_id"    />
-        <result property="url"    column="url"    />
-        <result property="title"    column="title"    />
+        <result property="investigateTableId" column="investigate_table_id"/>
+        <result property="investigateDispositionId" column="investigate_disposition_id"/>
+        <result property="url" column="url"/>
+        <result property="title" column="title"/>
     </resultMap>
 
     <resultMap type="InvestigateUser" id="InvestigateUserResult">
-        <result property="id"    column="id"    />
-        <result property="investigateId"    column="investigate_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="phonenumber"    column="phonenumber"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="duty"    column="duty"    />
-        <result property="loginDate"    column="login_date"    />
-        <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="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="investigateId" column="investigate_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="phonenumber" column="phonenumber"/>
+        <result property="idCard" column="id_card"/>
+        <result property="duty" column="duty"/>
+        <result property="loginDate" column="login_date"/>
+        <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="remark" column="remark"/>
     </resultMap>
     <sql id="selectInvestigateTableVo">
-        select investigate_table_id, investigate_name, content, end_time, cipher, create_by, create_time, update_by, update_time, remark from investigate_table
+        select investigate_table_id,
+               investigate_name,
+               content,
+               end_time,
+               cipher,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from investigate_table
     </sql>
 
     <select id="selectInvestigateTableList" parameterType="InvestigateTable" resultMap="InvestigateTableResult">
@@ -63,21 +73,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         investigate_table t
         left join investigate_user u on t.investigate_table_id = u.investigate_id
-        <where>  
-            <if test="investigateName != null  and investigateName != ''"> and t.investigate_name like concat('%', #{investigateName}, '%')</if>
-            <if test="content != null  and content != ''"> and t.content = #{content}</if>
-            <if test="endTime != null "> and t.end_time = #{endTime}</if>
-            <if test="cipher != null  and cipher != ''"> and t.cipher = #{cipher}</if>
+        <where>
+            <if test="investigateName != null  and investigateName != ''">and t.investigate_name like concat('%',
+                #{investigateName}, '%')
+            </if>
+            <if test="content != null  and content != ''">and t.content = #{content}</if>
+            <if test="endTime != null ">and t.end_time = #{endTime}</if>
+            <if test="cipher != null  and cipher != ''">and t.cipher = #{cipher}</if>
         </where>
-        order  by t.create_time  desc
+        order by t.create_time desc
     </select>
-    
+
     <select id="selectInvestigateTableById" parameterType="Long" resultMap="InvestigateTableResult">
-        <include refid="selectInvestigateTableVo"/>
-        where investigate_table_id = #{investigateTableId}
+        SELECT t.investigate_table_id,
+               t.investigate_name,
+               t.content,
+               t.end_time,
+               t.CIPHER,
+               t.create_by,
+               t.create_time,
+               t.update_by,
+               t.update_time,
+               u.id,
+               u.investigate_id,
+               u.user_name,
+               u.phonenumber,
+               u.id_card,
+               u.duty
+        FROM investigate_table t
+                 left join investigate_user u on t.investigate_table_id = u.investigate_id
+        where t.investigate_table_id = #{investigateTableId}
     </select>
-        
-    <insert id="insertInvestigateTable" parameterType="InvestigateTable" useGeneratedKeys="true" keyProperty="investigateTableId">
+
+    <insert id="insertInvestigateTable" parameterType="InvestigateTable" useGeneratedKeys="true"
+            keyProperty="investigateTableId">
         insert into investigate_table
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="investigateName != null">investigate_name,</if>
@@ -89,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="investigateName != null">#{investigateName},</if>
             <if test="content != null">#{content},</if>
@@ -100,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateInvestigateTable" parameterType="InvestigateTable">
@@ -120,7 +149,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteInvestigateTableById" parameterType="Long">
-        delete from investigate_table where investigate_table_id = #{investigateTableId}
+        delete
+        from investigate_table
+        where investigate_table_id = #{investigateTableId}
     </delete>
 
     <delete id="deleteInvestigateTableByIds" parameterType="String">