达梦数据库格式修改

PHM-admin/phm-manage/src/main/resources/mapper/manage/AfterAnalysisResultMapper.xml

@@ -1,35 +1,37 @@
 <?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.phm.manage.mapper.AfterAnalysisResultMapper">
-    
+
     <resultMap type="AfterAnalysisResult" id="AfterAnalysisResultResult">
-        <result property="id"    column="id"    />
-        <result property="remark"    column="remark"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="createdBy"    column="created_by"    />
-        <result property="createdTime"    column="created_time"    />
-        <result property="updatedBy"    column="updated_by"    />
-        <result property="updatedTime"    column="updated_time"    />
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
     </resultMap>
 
     <sql id="selectAfterAnalysisResultVo">
-        select id, remark, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_AFTER_ANALYSIS_RESULT
+        select id, remark, is_delete, create_by, create_time, update_by, update_time
+        from PHM.PHM_AFTER_ANALYSIS_RESULT
     </sql>
 
-    <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult" resultMap="AfterAnalysisResultResult">
+    <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult"
+            resultMap="AfterAnalysisResultResult">
         <include refid="selectAfterAnalysisResultVo"/>
-        <where>  
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectAfterAnalysisResultById" parameterType="Long" resultMap="AfterAnalysisResultResult">
         <include refid="selectAfterAnalysisResultVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult">
         insert into PHM.PHM_AFTER_ANALYSIS_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -40,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="remark != null">#{remark},</if>
@@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAfterAnalysisResult" parameterType="AfterAnalysisResult">
@@ -66,11 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAfterAnalysisResultById" parameterType="Long">
-        delete from PHM.PHM_AFTER_ANALYSIS_RESULT where id = #{id}
+        delete
+        from PHM.PHM_AFTER_ANALYSIS_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deleteAfterAnalysisResultByIds" parameterType="String">
-        delete from PHM.PHM_AFTER_ANALYSIS_RESULT where id in 
+        delete from PHM.PHM_AFTER_ANALYSIS_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AircraftMapper.xml

@@ -5,29 +5,39 @@
 <mapper namespace="com.phm.manage.mapper.AircraftMapper">
 
     <resultMap type="Aircraft" id="AircraftResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="number"    column="number"    />
-        <result property="fleetId"    column="fleet_id"    />
-        <result property="aircraftTypeId"    column="aircraft_type_id"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="number" column="number"/>
+        <result property="fleetId" column="fleet_id"/>
+        <result property="aircraftTypeId" column="aircraft_type_id"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectAircraftVo">
-        select id, name, number, fleet_id, aircraft_type_id, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_AIRCRAFT
+        select id,
+               name,
+               number,
+               fleet_id,
+               aircraft_type_id,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_AIRCRAFT
     </sql>
 
     <select id="selectAircraftList" parameterType="Aircraft" resultMap="AircraftResult">
         <include refid="selectAircraftVo"/>
         <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="number != null  and number != ''"> and number like concat('%', #{number}, '%')</if>
-            <if test="fleetId != null  and fleetId != ''"> and fleet_id = #{fleetId}</if>
-            <if test="aircraftTypeId != null  and aircraftTypeId != ''"> and aircraft_type_id = #{aircraftTypeId}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="number != null  and number != ''">and number like concat('%', #{number}, '%')</if>
+            <if test="fleetId != null  and fleetId != ''">and fleet_id = #{fleetId}</if>
+            <if test="aircraftTypeId != null  and aircraftTypeId != ''">and aircraft_type_id = #{aircraftTypeId}</if>
         </where>
     </select>
 
@@ -35,7 +45,7 @@
         <include refid="selectAircraftVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertAircraft" parameterType="Aircraft">
         insert into PHM.PHM_AIRCRAFT
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -81,11 +91,13 @@
     </update>
 
     <delete id="deleteAircraftById" parameterType="Long">
-        delete from PHM.PHM_AIRCRAFT where id = #{id}
+        delete
+        from PHM.PHM_AIRCRAFT
+        where id = #{id}
     </delete>
 
     <delete id="deleteAircraftByIds" parameterType="String">
-        delete from PHM.PHM_AIRCRAFT where id in 
+        delete from PHM.PHM_AIRCRAFT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeCourseLogMapper.xml

@@ -1,41 +1,52 @@
 <?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.phm.manage.mapper.AnalyzeCourseLogMapper">
-    
+
     <resultMap type="AnalyzeCourseLog" id="AnalyzeCourseLogResult">
-        <result property="id"    column="id"    />
-        <result property="moduleName"    column="module_name"    />
-        <result property="moduleType"    column="module_type"    />
-        <result property="courseContent"    column="course_content"    />
-        <result property="status"    column="status"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="moduleName" column="module_name"/>
+        <result property="moduleType" column="module_type"/>
+        <result property="courseContent" column="course_content"/>
+        <result property="status" column="status"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectAnalyzeCourseLogVo">
-        select id, module_name, module_type, course_content, status, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ANALYZE_COURSE_LOG
+        select id,
+               module_name,
+               module_type,
+               course_content,
+               status,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_ANALYZE_COURSE_LOG
     </sql>
 
     <select id="selectAnalyzeCourseLogList" parameterType="AnalyzeCourseLog" resultMap="AnalyzeCourseLogResult">
         <include refid="selectAnalyzeCourseLogVo"/>
-        <where>  
-            <if test="moduleName != null  and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
-            <if test="moduleType != null  and moduleType != ''"> and module_type = #{moduleType}</if>
-            <if test="courseContent != null  and courseContent != ''"> and course_content = #{courseContent}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+        <where>
+            <if test="moduleName != null  and moduleName != ''">and module_name like concat('%', #{moduleName}, '%')
+            </if>
+            <if test="moduleType != null  and moduleType != ''">and module_type = #{moduleType}</if>
+            <if test="courseContent != null  and courseContent != ''">and course_content = #{courseContent}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
         </where>
     </select>
-    
+
     <select id="selectAnalyzeCourseLogById" parameterType="Long" resultMap="AnalyzeCourseLogResult">
         <include refid="selectAnalyzeCourseLogVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
         insert into PHM.PHM_ANALYZE_COURSE_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -49,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="moduleName != null">#{moduleName},</if>
@@ -61,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
@@ -81,11 +92,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAnalyzeCourseLogById" parameterType="Long">
-        delete from PHM.PHM_ANALYZE_COURSE_LOG where id = #{id}
+        delete
+        from PHM.PHM_ANALYZE_COURSE_LOG
+        where id = #{id}
     </delete>
 
     <delete id="deleteAnalyzeCourseLogByIds" parameterType="String">
-        delete from PHM.PHM_ANALYZE_COURSE_LOG where id in 
+        delete from PHM.PHM_ANALYZE_COURSE_LOG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeDownLogMapper.xml

@@ -1,42 +1,52 @@
 <?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.phm.manage.mapper.AnalyzeDownLogMapper">
-    
+
     <resultMap type="AnalyzeDownLog" id="AnalyzeDownLogResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="path"    column="path"    />
-        <result property="status"    column="status"    />
-        <result property="fault"    column="fault"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="path" column="path"/>
+        <result property="status" column="status"/>
+        <result property="fault" column="fault"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectAnalyzeDownLogVo">
-        select id, name, path, status, fault, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ANALYZE_DOWN_LOG
+        select id,
+               name,
+               path,
+               status,
+               fault,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_ANALYZE_DOWN_LOG
     </sql>
 
     <select id="selectAnalyzeDownLogList" parameterType="AnalyzeDownLog" resultMap="AnalyzeDownLogResult">
         <include refid="selectAnalyzeDownLogVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="path != null  and path != ''"> and path = #{path}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="fault != null  and fault != ''"> and fault = #{fault}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="path != null  and path != ''">and path = #{path}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="fault != null  and fault != ''">and fault = #{fault}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectAnalyzeDownLogById" parameterType="Long" resultMap="AnalyzeDownLogResult">
         <include refid="selectAnalyzeDownLogVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertAnalyzeDownLog" parameterType="AnalyzeDownLog">
         insert into PHM.PHM_ANALYZE_DOWN_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -50,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
@@ -62,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAnalyzeDownLog" parameterType="AnalyzeDownLog">
@@ -82,11 +92,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAnalyzeDownLogById" parameterType="Long">
-        delete from PHM.PHM_ANALYZE_DOWN_LOG where id = #{id}
+        delete
+        from PHM.PHM_ANALYZE_DOWN_LOG
+        where id = #{id}
     </delete>
 
     <delete id="deleteAnalyzeDownLogByIds" parameterType="String">
-        delete from PHM.PHM_ANALYZE_DOWN_LOG where id in 
+        delete from PHM.PHM_ANALYZE_DOWN_LOG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeResultMapper.xml

@@ -1,35 +1,36 @@
 <?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.phm.manage.mapper.AnalyzeResultMapper">
-    
+
     <resultMap type="AnalyzeResult" id="AnalyzeResultResult">
-        <result property="id"    column="id"    />
-        <result property="remark"    column="remark"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectAnalyzeResultVo">
-        select id, remark, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ANALYZE_RESULT
+        select id, remark, is_delete, create_by, create_time, update_by, update_time
+        from PHM.PHM_ANALYZE_RESULT
     </sql>
 
     <select id="selectAnalyzeResultList" parameterType="AnalyzeResult" resultMap="AnalyzeResultResult">
         <include refid="selectAnalyzeResultVo"/>
-        <where>  
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectAnalyzeResultById" parameterType="Long" resultMap="AnalyzeResultResult">
         <include refid="selectAnalyzeResultVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertAnalyzeResult" parameterType="AnalyzeResult">
         insert into PHM.PHM_ANALYZE_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="remark != null">#{remark},</if>
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAnalyzeResult" parameterType="AnalyzeResult">
@@ -66,11 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAnalyzeResultById" parameterType="Long">
-        delete from PHM.PHM_ANALYZE_RESULT where id = #{id}
+        delete
+        from PHM.PHM_ANALYZE_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deleteAnalyzeResultByIds" parameterType="String">
-        delete from PHM.PHM_ANALYZE_RESULT where id in 
+        delete from PHM.PHM_ANALYZE_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DataDownResultMapper.xml

@@ -1,41 +1,43 @@
 <?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.phm.manage.mapper.DataDownResultMapper">
-    
+
     <resultMap type="DataDownResult" id="DataDownResultResult">
-        <result property="id"    column="id"    />
-        <result property="order"    column="order"    />
-        <result property="name"    column="name"    />
-        <result property="path"    column="path"    />
-        <result property="remark"    column="remark"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="order" column="order"/>
+        <result property="name" column="name"/>
+        <result property="path" column="path"/>
+        <result property="remark" column="remark"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectDataDownResultVo">
-        select id, order, name, path, remark, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DATA_DOWN_RESULT
+        select id,
+        order, name, path, remark, is_delete, create_by, create_time, update_by, update_time
+        from PHM.PHM_DATA_DOWN_RESULT
     </sql>
 
     <select id="selectDataDownResultList" parameterType="DataDownResult" resultMap="DataDownResultResult">
         <include refid="selectDataDownResultVo"/>
-        <where>  
-            <if test="order != null  and order != ''"> and order = #{order}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="path != null  and path != ''"> and path = #{path}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="order != null  and order != ''">and order = #{order}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="path != null  and path != ''">and path = #{path}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectDataDownResultById" parameterType="Long" resultMap="DataDownResultResult">
         <include refid="selectDataDownResultVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertDataDownResult" parameterType="DataDownResult">
         insert into PHM.PHM_DATA_DOWN_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="order != null">#{order},</if>
@@ -61,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDataDownResult" parameterType="DataDownResult">
@@ -81,11 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDataDownResultById" parameterType="Long">
-        delete from PHM.PHM_DATA_DOWN_RESULT where id = #{id}
+        delete
+        from PHM.PHM_DATA_DOWN_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deleteDataDownResultByIds" parameterType="String">
-        delete from PHM.PHM_DATA_DOWN_RESULT where id in 
+        delete from PHM.PHM_DATA_DOWN_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DeepIsolationModelMapper.xml

@@ -1,40 +1,49 @@
 <?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.phm.manage.mapper.DeepIsolationModelMapper">
-    
+
     <resultMap type="DeepIsolationModel" id="DeepIsolationModelResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="faultEquation"    column="fault_equation"    />
-        <result property="faultLru"    column="fault_lru"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="faultEquation" column="fault_equation"/>
+        <result property="faultLru" column="fault_lru"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectDeepIsolationModelVo">
-        select id, code, fault_equation, fault_lru, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DATA_DOWN_RESULT
+        select id,
+               code,
+               fault_equation,
+               fault_lru,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_DATA_DOWN_RESULT
     </sql>
 
     <select id="selectDeepIsolationModelList" parameterType="DeepIsolationModel" resultMap="DeepIsolationModelResult">
         <include refid="selectDeepIsolationModelVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="faultEquation != null  and faultEquation != ''"> and fault_equation = #{faultEquation}</if>
-            <if test="faultLru != null  and faultLru != ''"> and fault_lru = #{faultLru}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="code != null  and code != ''">and code = #{code}</if>
+            <if test="faultEquation != null  and faultEquation != ''">and fault_equation = #{faultEquation}</if>
+            <if test="faultLru != null  and faultLru != ''">and fault_lru = #{faultLru}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectDeepIsolationModelById" parameterType="Long" resultMap="DeepIsolationModelResult">
         <include refid="selectDeepIsolationModelVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertDeepIsolationModel" parameterType="DeepIsolationModel">
         insert into PHM.PHM_DATA_DOWN_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -47,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
@@ -58,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDeepIsolationModel" parameterType="DeepIsolationModel">
@@ -77,11 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDeepIsolationModelById" parameterType="Long">
-        delete from PHM.PHM_DATA_DOWN_RESULT where id = #{id}
+        delete
+        from PHM.PHM_DATA_DOWN_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deleteDeepIsolationModelByIds" parameterType="String">
-        delete from PHM.PHM_DATA_DOWN_RESULT where id in 
+        delete from PHM.PHM_DATA_DOWN_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DeriveParameterMapper.xml

@@ -1,38 +1,46 @@
 <?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.phm.manage.mapper.DeriveParameterMapper">
-    
+
     <resultMap type="DeriveParameter" id="DeriveParameterResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="expression"    column="expression"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="expression" column="expression"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectDeriveParameterVo">
-        select id, name, expression, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DERIVE_PARAMETER
+        select id,
+               name,
+               expression,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_DERIVE_PARAMETER
     </sql>
 
     <select id="selectDeriveParameterList" parameterType="DeriveParameter" resultMap="DeriveParameterResult">
         <include refid="selectDeriveParameterVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="expression != null  and expression != ''"> and expression = #{expression}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="expression != null  and expression != ''">and expression = #{expression}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectDeriveParameterById" parameterType="Long" resultMap="DeriveParameterResult">
         <include refid="selectDeriveParameterVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertDeriveParameter" parameterType="DeriveParameter">
         insert into PHM.PHM_DERIVE_PARAMETER
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -44,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
@@ -54,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDeriveParameter" parameterType="DeriveParameter">
@@ -72,11 +80,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDeriveParameterById" parameterType="Long">
-        delete from PHM.PHM_DERIVE_PARAMETER where id = #{id}
+        delete
+        from PHM.PHM_DERIVE_PARAMETER
+        where id = #{id}
     </delete>
 
     <delete id="deleteDeriveParameterByIds" parameterType="String">
-        delete from PHM.PHM_DERIVE_PARAMETER where id in 
+        delete from PHM.PHM_DERIVE_PARAMETER where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DiagnoseResultMapper.xml

@@ -1,46 +1,58 @@
 <?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.phm.manage.mapper.DiagnoseResultMapper">
-    
+
     <resultMap type="DiagnoseResult" id="DiagnoseResultResult">
-        <result property="id"    column="id"    />
-        <result property="faultMode"    column="fault_mode"    />
-        <result property="faultObject"    column="fault_object"    />
-        <result property="faultCode"    column="fault_code"    />
-        <result property="faultSource"    column="fault_source"    />
-        <result property="analysisTime"    column="analysis_time"    />
-        <result property="comment"    column="comment"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="faultMode" column="fault_mode"/>
+        <result property="faultObject" column="fault_object"/>
+        <result property="faultCode" column="fault_code"/>
+        <result property="faultSource" column="fault_source"/>
+        <result property="analysisTime" column="analysis_time"/>
+        <result property="comment" column="comment"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectDiagnoseResultVo">
-        select id, fault_mode, fault_object, fault_code, fault_source, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DERIVE_PARAMETER
+        select id,
+               fault_mode,
+               fault_object,
+               fault_code,
+               fault_source,
+               analysis_time,
+               comment,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_DERIVE_PARAMETER
     </sql>
 
     <select id="selectDiagnoseResultList" parameterType="DiagnoseResult" resultMap="DiagnoseResultResult">
         <include refid="selectDiagnoseResultVo"/>
-        <where>  
-            <if test="faultMode != null  and faultMode != ''"> and fault_mode = #{faultMode}</if>
-            <if test="faultObject != null  and faultObject != ''"> and fault_object = #{faultObject}</if>
-            <if test="faultCode != null  and faultCode != ''"> and fault_code = #{faultCode}</if>
-            <if test="faultSource != null  and faultSource != ''"> and fault_source = #{faultSource}</if>
-            <if test="analysisTime != null "> and analysis_time = #{analysisTime}</if>
-            <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="faultMode != null  and faultMode != ''">and fault_mode = #{faultMode}</if>
+            <if test="faultObject != null  and faultObject != ''">and fault_object = #{faultObject}</if>
+            <if test="faultCode != null  and faultCode != ''">and fault_code = #{faultCode}</if>
+            <if test="faultSource != null  and faultSource != ''">and fault_source = #{faultSource}</if>
+            <if test="analysisTime != null ">and analysis_time = #{analysisTime}</if>
+            <if test="comment != null  and comment != ''">and comment = #{comment}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectDiagnoseResultById" parameterType="Long" resultMap="DiagnoseResultResult">
         <include refid="selectDiagnoseResultVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertDiagnoseResult" parameterType="DiagnoseResult">
         insert into PHM.PHM_DERIVE_PARAMETER
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -56,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="faultMode != null">#{faultMode},</if>
@@ -70,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDiagnoseResult" parameterType="DiagnoseResult">
@@ -92,11 +104,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDiagnoseResultById" parameterType="Long">
-        delete from PHM.PHM_DERIVE_PARAMETER where id = #{id}
+        delete
+        from PHM.PHM_DERIVE_PARAMETER
+        where id = #{id}
     </delete>
 
     <delete id="deleteDiagnoseResultByIds" parameterType="String">
-        delete from PHM.PHM_DERIVE_PARAMETER where id in 
+        delete from PHM.PHM_DERIVE_PARAMETER where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ExternalInterfaceLogMapper.xml

@@ -1,44 +1,54 @@
 <?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.phm.manage.mapper.ExternalInterfaceLogMapper">
-    
+
     <resultMap type="ExternalInterfaceLog" id="ExternalInterfaceLogResult">
-        <result property="id"    column="id"    />
-        <result property="result"    column="result"    />
-        <result property="name"    column="name"    />
-        <result property="url"    column="url"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="result" column="result"/>
+        <result property="name" column="name"/>
+        <result property="url" column="url"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectExternalInterfaceLogVo">
-        select id, result, name, url, is_delete, create_by, create_time, update_by, update_time from PHM.SYS_EXTERNAL_INTERFACE_LOG
+        select id,
+               result,
+               name,
+               url,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.SYS_EXTERNAL_INTERFACE_LOG
     </sql>
 
-    <select id="selectExternalInterfaceLogList" parameterType="ExternalInterfaceLog" resultMap="ExternalInterfaceLogResult">
+    <select id="selectExternalInterfaceLogList" parameterType="ExternalInterfaceLog"
+            resultMap="ExternalInterfaceLogResult">
         <include refid="selectExternalInterfaceLogVo"/>
-        <where>  
-            <if test="result != null  and result != ''"> and result = #{result}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="url != null  and url != ''"> and url = #{url}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="result != null  and result != ''">and result = #{result}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="url != null  and url != ''">and url = #{url}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectExternalInterfaceLogById" parameterType="Long" resultMap="ExternalInterfaceLogResult">
         <include refid="selectExternalInterfaceLogVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertExternalInterfaceLog" parameterType="ExternalInterfaceLog">
         insert into PHM.SYS_EXTERNAL_INTERFACE_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -51,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="result != null">#{result},</if>
@@ -62,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateExternalInterfaceLog" parameterType="ExternalInterfaceLog">
@@ -81,11 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteExternalInterfaceLogById" parameterType="Long">
-        delete from PHM.SYS_EXTERNAL_INTERFACE_LOG where id = #{id}
+        delete
+        from PHM.SYS_EXTERNAL_INTERFACE_LOG
+        where id = #{id}
     </delete>
 
     <delete id="deleteExternalInterfaceLogByIds" parameterType="String">
-        delete from PHM.SYS_EXTERNAL_INTERFACE_LOG where id in 
+        delete from PHM.SYS_EXTERNAL_INTERFACE_LOG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FalseAlarmRestrainModelMapper.xml

@@ -1,40 +1,52 @@
 <?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.phm.manage.mapper.FalseAlarmRestrainModelMapper">
-    
+
     <resultMap type="FalseAlarmRestrainModel" id="FalseAlarmRestrainModelResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="restrainCriteria"    column="restrain_criteria"    />
-        <result property="minDuration"    column="min_duration"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="restrainCriteria" column="restrain_criteria"/>
+        <result property="minDuration" column="min_duration"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectFalseAlarmRestrainModelVo">
-        select id, code, restrain_criteria, min_duration, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
+        select id,
+               code,
+               restrain_criteria,
+               min_duration,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
     </sql>
 
-    <select id="selectFalseAlarmRestrainModelList" parameterType="FalseAlarmRestrainModel" resultMap="FalseAlarmRestrainModelResult">
+    <select id="selectFalseAlarmRestrainModelList" parameterType="FalseAlarmRestrainModel"
+            resultMap="FalseAlarmRestrainModelResult">
         <include refid="selectFalseAlarmRestrainModelVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="restrainCriteria != null  and restrainCriteria != ''"> and restrain_criteria = #{restrainCriteria}</if>
-            <if test="minDuration != null  and minDuration != ''"> and min_duration = #{minDuration}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
+        <where>
+            <if test="code != null  and code != ''">and code = #{code}</if>
+            <if test="restrainCriteria != null  and restrainCriteria != ''">and restrain_criteria =
+                #{restrainCriteria}
+            </if>
+            <if test="minDuration != null  and minDuration != ''">and min_duration = #{minDuration}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectFalseAlarmRestrainModelById" parameterType="Long" resultMap="FalseAlarmRestrainModelResult">
         <include refid="selectFalseAlarmRestrainModelVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
         insert into PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -47,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
@@ -58,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
@@ -77,11 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteFalseAlarmRestrainModelById" parameterType="Long">
-        delete from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL where id = #{id}
+        delete
+        from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
+        where id = #{id}
     </delete>
 
     <delete id="deleteFalseAlarmRestrainModelByIds" parameterType="String">
-        delete from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL where id in 
+        delete from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultAnalyzeResultMapper.xml

@@ -1,47 +1,58 @@
 <?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.phm.manage.mapper.FaultAnalyzeResultMapper">
-    
+
     <resultMap type="FaultAnalyzeResult" id="FaultAnalyzeResultResult">
-        <result property="id"    column="id"    />
-        <result property="moduleName"    column="module_name"    />
-        <result property="moduleType"    column="module_type"    />
-        <result property="analyzeInfo"    column="analyze_info"    />
-        <result property="comment"    column="comment"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="moduleName" column="module_name"/>
+        <result property="moduleType" column="module_type"/>
+        <result property="analyzeInfo" column="analyze_info"/>
+        <result property="comment" column="comment"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectFaultAnalyzeResultVo">
-        select id, module_name, module_type, analyze_info, comment, is_delete, create_by, create_time, update_by, update_time from PHM.phm_fault_analyze_result
+        select id,
+               module_name,
+               module_type,
+               analyze_info,
+               comment,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.phm_fault_analyze_result
     </sql>
 
     <select id="selectFaultAnalyzeResultList" parameterType="FaultAnalyzeResult" resultMap="FaultAnalyzeResultResult">
         <include refid="selectFaultAnalyzeResultVo"/>
-        <where>  
-            <if test="moduleName != null  and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
-            <if test="moduleType != null  and moduleType != ''"> and module_type = #{moduleType}</if>
-            <if test="analyzeInfo != null  and analyzeInfo != ''"> and analyze_info = #{analyzeInfo}</if>
-            <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="moduleName != null  and moduleName != ''">and module_name like concat('%', #{moduleName}, '%')
+            </if>
+            <if test="moduleType != null  and moduleType != ''">and module_type = #{moduleType}</if>
+            <if test="analyzeInfo != null  and analyzeInfo != ''">and analyze_info = #{analyzeInfo}</if>
+            <if test="comment != null  and comment != ''">and comment = #{comment}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectFaultAnalyzeResultById" parameterType="Long" resultMap="FaultAnalyzeResultResult">
         <include refid="selectFaultAnalyzeResultVo"/>
         where id = #{id}
     </select>
-        
-    <insert id="insertFaultAnalyzeResult" parameterType="FaultAnalyzeResult" >
+
+    <insert id="insertFaultAnalyzeResult" parameterType="FaultAnalyzeResult">
         insert into PHM.phm_fault_analyze_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -54,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="moduleName != null">#{moduleName},</if>
@@ -66,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateFaultAnalyzeResult" parameterType="FaultAnalyzeResult">
@@ -86,11 +97,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteFaultAnalyzeResultById" parameterType="Long">
-        delete from PHM.phm_fault_analyze_result where id = #{id}
+        delete
+        from PHM.phm_fault_analyze_result
+        where id = #{id}
     </delete>
 
     <delete id="deleteFaultAnalyzeResultByIds" parameterType="String">
-        delete from PHM.phm_fault_analyze_result where id in 
+        delete from PHM.phm_fault_analyze_result where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultCaseMapper.xml

@@ -1,51 +1,64 @@
 <?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.phm.manage.mapper.FaultCaseMapper">
-    
+
     <resultMap type="FaultCase" id="FaultCaseResult">
-        <result property="id"    column="id"    />
-        <result property="caseName"    column="case_name"    />
-        <result property="caseFileName"    column="case_file_name"    />
-        <result property="description"    column="description"    />
-        <result property="caseNumber"    column="case_number"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="parameter"    column="parameter"    />
-        <result property="location"    column="location"    />
-        <result property="solution"    column="solution"    />
+        <result property="id" column="id"/>
+        <result property="caseName" column="case_name"/>
+        <result property="caseFileName" column="case_file_name"/>
+        <result property="description" column="description"/>
+        <result property="caseNumber" column="case_number"/>
+        <result property="isDelete" column="is_delete"/>
+        <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="parameter" column="parameter"/>
+        <result property="location" column="location"/>
+        <result property="solution" column="solution"/>
     </resultMap>
 
     <sql id="selectFaultCaseVo">
-        select id, case_file_name, case_name, description, case_number, is_delete, create_by, create_time, update_by, update_time, parameter, location, solution from PHM.PHM_FAULT_CASE
+        select id,
+               case_file_name,
+               case_name,
+               description,
+               case_number,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               parameter,
+               location,
+               solution
+        from PHM.PHM_FAULT_CASE
     </sql>
 
     <select id="selectFaultCaseList" parameterType="FaultCase" resultMap="FaultCaseResult">
         <include refid="selectFaultCaseVo"/>
-        <where>  
-            <if test="caseName != null  and caseName != ''"> and case_name like concat('%', #{caseName}, '%')</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="caseNumber != null  and caseNumber != ''"> and case_number = #{caseNumber}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="parameter != null  and parameter != ''"> and parameter = #{parameter}</if>
-            <if test="location != null  and location != ''"> and location = #{location}</if>
-            <if test="solution != null  and solution != ''"> and solution = #{solution}</if>
+        <where>
+            <if test="caseName != null  and caseName != ''">and case_name like concat('%', #{caseName}, '%')</if>
+            <if test="description != null  and description != ''">and description = #{description}</if>
+            <if test="caseNumber != null  and caseNumber != ''">and case_number = #{caseNumber}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
+            <if test="parameter != null  and parameter != ''">and parameter = #{parameter}</if>
+            <if test="location != null  and location != ''">and location = #{location}</if>
+            <if test="solution != null  and solution != ''">and solution = #{solution}</if>
         </where>
     </select>
-    
+
     <select id="selectFaultCaseById" parameterType="Long" resultMap="FaultCaseResult">
         <include refid="selectFaultCaseVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertFaultCase" parameterType="FaultCase">
         insert into PHM.PHM_FAULT_CASE
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -62,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parameter != null">parameter,</if>
             <if test="location != null">location,</if>
             <if test="solution != null">solution,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="caseFileName != null">#{caseFileName},</if>
@@ -77,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parameter != null">#{parameter},</if>
             <if test="location != null">#{location},</if>
             <if test="solution != null">#{solution},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateFaultCase" parameterType="FaultCase">
@@ -100,11 +113,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteFaultCaseById" parameterType="Long">
-        delete from PHM.PHM_FAULT_CASE where id = #{id}
+        delete
+        from PHM.PHM_FAULT_CASE
+        where id = #{id}
     </delete>
 
     <delete id="deleteFaultCaseByIds" parameterType="String">
-        delete from PHM.PHM_FAULT_CASE where id in 
+        delete from PHM.PHM_FAULT_CASE where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FeedbackRawDataMapper.xml

@@ -1,38 +1,39 @@
 <?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.phm.manage.mapper.FeedbackRawDataMapper">
-    
+
     <resultMap type="FeedbackRawData" id="FeedbackRawDataResult">
-        <result property="id"    column="id"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectFeedbackRawDataVo">
-        select id, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FEEDBACK_RAW_DATA
+        select id, is_delete, create_by, create_time, update_by, update_time
+        from PHM.PHM_FEEDBACK_RAW_DATA
     </sql>
 
     <select id="selectFeedbackRawDataList" parameterType="FeedbackRawData" resultMap="FeedbackRawDataResult">
         <include refid="selectFeedbackRawDataVo"/>
-        <where>  
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectFeedbackRawDataById" parameterType="Long" resultMap="FeedbackRawDataResult">
         <include refid="selectFeedbackRawDataVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertFeedbackRawData" parameterType="FeedbackRawData">
         insert into PHM.PHM_FEEDBACK_RAW_DATA
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="isDelete != null">#{isDelete},</if>
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateFeedbackRawData" parameterType="FeedbackRawData">
@@ -66,11 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteFeedbackRawDataById" parameterType="Long">
-        delete from PHM.PHM_FEEDBACK_RAW_DATA where id = #{id}
+        delete
+        from PHM.PHM_FEEDBACK_RAW_DATA
+        where id = #{id}
     </delete>
 
     <delete id="deleteFeedbackRawDataByIds" parameterType="String">
-        delete from PHM.PHM_FEEDBACK_RAW_DATA where id in 
+        delete from PHM.PHM_FEEDBACK_RAW_DATA where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FleetMapper.xml

@@ -1,44 +1,53 @@
 <?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.phm.manage.mapper.FleetMapper">
-    
+
     <resultMap type="Fleet" id="FleetResult">
-        <result property="id"    column="id"    />
-        <result property="fleetName"    column="fleet_name"    />
-        <result property="fleetCode"    column="fleet_code"    />
-        <result property="gather"    column="gather"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="fleetName" column="fleet_name"/>
+        <result property="fleetCode" column="fleet_code"/>
+        <result property="gather" column="gather"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectFleetVo">
-        select id, fleet_name, fleet_code, gather, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FLEET
+        select id,
+               fleet_name,
+               fleet_code,
+               gather,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_FLEET
     </sql>
 
     <select id="selectFleetList" parameterType="Fleet" resultMap="FleetResult">
         <include refid="selectFleetVo"/>
-        <where>  
-            <if test="fleetName != null  and fleetName != ''"> and fleet_name like concat('%', #{fleetName}, '%')</if>
-            <if test="fleetCode != null  and fleetCode != ''"> and fleet_code = #{fleetCode}</if>
-            <if test="gather != null  and gather != ''"> and gather = #{gather}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="fleetName != null  and fleetName != ''">and fleet_name like concat('%', #{fleetName}, '%')</if>
+            <if test="fleetCode != null  and fleetCode != ''">and fleet_code = #{fleetCode}</if>
+            <if test="gather != null  and gather != ''">and gather = #{gather}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectFleetById" parameterType="Long" resultMap="FleetResult">
         <include refid="selectFleetVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertFleet" parameterType="Fleet">
         insert into PHM.PHM_FLEET
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -51,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="fleetName != null">#{fleetName},</if>
@@ -62,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateFleet" parameterType="Fleet">
@@ -81,11 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteFleetById" parameterType="Long">
-        delete from PHM.PHM_FLEET where id = #{id}
+        delete
+        from PHM.PHM_FLEET
+        where id = #{id}
     </delete>
 
     <delete id="deleteFleetByIds" parameterType="String">
-        delete from PHM.PHM_FLEET where id in 
+        delete from PHM.PHM_FLEET where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastModelMapper.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.phm.manage.mapper.ForecastModelMapper">
-    
+
     <resultMap type="ForecastModel" id="ForecastModelResult">
-        <result property="id"    column="id"    />
-        <result property="object"    column="object"    />
-        <result property="method"    column="method"    />
-        <result property="trainsRange"    column="trains_range"    />
-        <result property="accuracy"    column="accuracy"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="object" column="object"/>
+        <result property="method" column="method"/>
+        <result property="trainsRange" column="trains_range"/>
+        <result property="accuracy" column="accuracy"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectForecastModelVo">
-        select id, object, method, trains_range, accuracy, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FORECAST_MODEL
+        select id,
+               object,
+               method,
+               trains_range,
+               accuracy,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_FORECAST_MODEL
     </sql>
 
     <select id="selectForecastModelList" parameterType="ForecastModel" resultMap="ForecastModelResult">
         <include refid="selectForecastModelVo"/>
-        <where>  
-            <if test="object != null  and object != ''"> and object = #{object}</if>
-            <if test="method != null  and method != ''"> and method = #{method}</if>
-            <if test="trainsRange != null  and trainsRange != ''"> and trains_range = #{trainsRange}</if>
-            <if test="accuracy != null  and accuracy != ''"> and accuracy = #{accuracy}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="object != null  and object != ''">and object = #{object}</if>
+            <if test="method != null  and method != ''">and method = #{method}</if>
+            <if test="trainsRange != null  and trainsRange != ''">and trains_range = #{trainsRange}</if>
+            <if test="accuracy != null  and accuracy != ''">and accuracy = #{accuracy}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectForecastModelById" parameterType="Long" resultMap="ForecastModelResult">
         <include refid="selectForecastModelVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertForecastModel" parameterType="ForecastModel">
         insert into PHM.PHM_FORECAST_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="object != null">#{object},</if>
@@ -66,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateForecastModel" parameterType="ForecastModel">
@@ -86,11 +96,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteForecastModelById" parameterType="Long">
-        delete from PHM.PHM_FORECAST_MODEL where id = #{id}
+        delete
+        from PHM.PHM_FORECAST_MODEL
+        where id = #{id}
     </delete>
 
     <delete id="deleteForecastModelByIds" parameterType="String">
-        delete from PHM.PHM_FORECAST_MODEL where id in 
+        delete from PHM.PHM_FORECAST_MODEL where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastResultMapper.xml

@@ -1,44 +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.phm.manage.mapper.ForecastResultMapper">
-    
+
     <resultMap type="ForecastResult" id="ForecastResultResult">
-        <result property="id"    column="id"    />
-        <result property="unitName"    column="unit_name"    />
-        <result property="studyObject"    column="study_object"    />
-        <result property="snsCode"    column="sns_code"    />
-        <result property="forecastFault"    column="forecast_fault"    />
-        <result property="analysisTime"    column="analysis_time"    />
-        <result property="comment"    column="comment"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="unitName" column="unit_name"/>
+        <result property="studyObject" column="study_object"/>
+        <result property="snsCode" column="sns_code"/>
+        <result property="forecastFault" column="forecast_fault"/>
+        <result property="analysisTime" column="analysis_time"/>
+        <result property="comment" column="comment"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectForecastResultVo">
-        select id, unit_name, study_object, sns_code, forecast_fault, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FORECAST_RESULT
+        select id,
+               unit_name,
+               study_object,
+               sns_code,
+               forecast_fault,
+               analysis_time,
+               comment,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_FORECAST_RESULT
     </sql>
 
     <select id="selectForecastResultList" parameterType="ForecastResult" resultMap="ForecastResultResult">
         <include refid="selectForecastResultVo"/>
-        <where>  
-            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
-            <if test="studyObject != null  and studyObject != ''"> and study_object = #{studyObject}</if>
-            <if test="snsCode != null  and snsCode != ''"> and sns_code = #{snsCode}</if>
-            <if test="forecastFault != null  and forecastFault != ''"> and forecast_fault = #{forecastFault}</if>
-            <if test="analysisTime != null "> and analysis_time = #{analysisTime}</if>
+        <where>
+            <if test="unitName != null  and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="studyObject != null  and studyObject != ''">and study_object = #{studyObject}</if>
+            <if test="snsCode != null  and snsCode != ''">and sns_code = #{snsCode}</if>
+            <if test="forecastFault != null  and forecastFault != ''">and forecast_fault = #{forecastFault}</if>
+            <if test="analysisTime != null ">and analysis_time = #{analysisTime}</if>
         </where>
     </select>
-    
+
     <select id="selectForecastResultById" parameterType="Long" resultMap="ForecastResultResult">
         <include refid="selectForecastResultVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertForecastResult" parameterType="ForecastResult">
         insert into PHM.PHM_FORECAST_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="unitName != null">#{unitName},</if>
@@ -68,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateForecastResult" parameterType="ForecastResult">
@@ -90,11 +102,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteForecastResultById" parameterType="Long">
-        delete from PHM.PHM_FORECAST_RESULT where id = #{id}
+        delete
+        from PHM.PHM_FORECAST_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deleteForecastResultByIds" parameterType="String">
-        delete from PHM.PHM_FORECAST_RESULT where id in 
+        delete from PHM.PHM_FORECAST_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/GlobalIdRegisterMapper.xml

@@ -1,29 +1,30 @@
 <?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.phm.manage.mapper.GlobalIdRegisterMapper">
-    
+
     <resultMap type="GlobalIdRegister" id="GlobalIdRegisterResult">
-        <result property="id"    column="id"    />
-        <result property="machine"    column="machine"    />
-        <result property="machineId"    column="machine_id"    />
-        <result property="datacenterId"    column="datacenter_id"    />
+        <result property="id" column="id"/>
+        <result property="machine" column="machine"/>
+        <result property="machineId" column="machine_id"/>
+        <result property="datacenterId" column="datacenter_id"/>
     </resultMap>
 
     <sql id="selectGlobalIdRegisterVo">
-        select id, machine, machine_id, datacenter_id from PHM.PHM_GLOBAL_ID_REGISTER
+        select id, machine, machine_id, datacenter_id
+        from PHM.PHM_GLOBAL_ID_REGISTER
     </sql>
 
     <select id="selectGlobalIdRegisterList" parameterType="GlobalIdRegister" resultMap="GlobalIdRegisterResult">
         <include refid="selectGlobalIdRegisterVo"/>
-        <where>  
-            <if test="machine != null "> and machine = #{machine}</if>
-            <if test="machineId != null "> and machine_id = #{machineId}</if>
-            <if test="datacenterId != null "> and datacenter_id = #{datacenterId}</if>
+        <where>
+            <if test="machine != null ">and machine = #{machine}</if>
+            <if test="machineId != null ">and machine_id = #{machineId}</if>
+            <if test="datacenterId != null ">and datacenter_id = #{datacenterId}</if>
         </where>
     </select>
-    
+
     <select id="selectGlobalIdRegisterById" parameterType="Long" resultMap="GlobalIdRegisterResult">
         <include refid="selectGlobalIdRegisterVo"/>
         where id = #{id}
@@ -32,19 +33,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectGlobalIdRegisterVo"/>
         order by machine_id,datacenter_id limit 1
     </select>
-        
+
     <insert id="insertGlobalIdRegister" parameterType="GlobalIdRegister" useGeneratedKeys="true" keyProperty="id">
         insert into PHM.PHM_GLOBAL_ID_REGISTER
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="machine != null and machine != ''">machine,</if>
             <if test="machineId != null">machine_id,</if>
             <if test="datacenterId != null">datacenter_id,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="machine != null and machine != ''">#{machine},</if>
             <if test="machineId != null">#{machineId},</if>
             <if test="datacenterId != null">#{datacenterId},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateGlobalIdRegister" parameterType="GlobalIdRegister">
@@ -58,11 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteGlobalIdRegisterById" parameterType="Long">
-        delete from PHM.PHM_GLOBAL_ID_REGISTER where id = #{id}
+        delete
+        from PHM.PHM_GLOBAL_ID_REGISTER
+        where id = #{id}
     </delete>
 
     <delete id="deleteGlobalIdRegisterByIds" parameterType="String">
-        delete from PHM.PHM_GLOBAL_ID_REGISTER where id in 
+        delete from PHM.PHM_GLOBAL_ID_REGISTER where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/GroundDiagnosisModelMapper.xml

@@ -1,48 +1,60 @@
 <?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.phm.manage.mapper.GroundDiagnosisModelMapper">
-    
+
     <resultMap type="GroundDiagnosisModel" id="GroundDiagnosisModelResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="criteria"    column="criteria"    />
-        <result property="minDuration"    column="min_duration"    />
-        <result property="systemSource"    column="system_source"    />
-        <result property="lruSource"    column="lru_source"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="criteria" column="criteria"/>
+        <result property="minDuration" column="min_duration"/>
+        <result property="systemSource" column="system_source"/>
+        <result property="lruSource" column="lru_source"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectGroundDiagnosisModelVo">
-        select id, code, criteria, min_duration, system_source, lru_source, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_GROUND_DIAGNOSIS_MODEL
+        select id,
+               code,
+               criteria,
+               min_duration,
+               system_source,
+               lru_source,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_GROUND_DIAGNOSIS_MODEL
     </sql>
 
-    <select id="selectGroundDiagnosisModelList" parameterType="GroundDiagnosisModel" resultMap="GroundDiagnosisModelResult">
+    <select id="selectGroundDiagnosisModelList" parameterType="GroundDiagnosisModel"
+            resultMap="GroundDiagnosisModelResult">
         <include refid="selectGroundDiagnosisModelVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="criteria != null  and criteria != ''"> and criteria = #{criteria}</if>
-            <if test="minDuration != null  and minDuration != ''"> and min_duration = #{minDuration}</if>
-            <if test="systemSource != null  and systemSource != ''"> and system_source = #{systemSource}</if>
-            <if test="lruSource != null  and lruSource != ''"> and lru_source = #{lruSource}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="code != null  and code != ''">and code = #{code}</if>
+            <if test="criteria != null  and criteria != ''">and criteria = #{criteria}</if>
+            <if test="minDuration != null  and minDuration != ''">and min_duration = #{minDuration}</if>
+            <if test="systemSource != null  and systemSource != ''">and system_source = #{systemSource}</if>
+            <if test="lruSource != null  and lruSource != ''">and lru_source = #{lruSource}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectGroundDiagnosisModelById" parameterType="Long" resultMap="GroundDiagnosisModelResult">
         <include refid="selectGroundDiagnosisModelVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
         insert into PHM.PHM_GROUND_DIAGNOSIS_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -57,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
@@ -70,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
@@ -91,11 +103,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteGroundDiagnosisModelById" parameterType="Long">
-        delete from PHM.PHM_GROUND_DIAGNOSIS_MODEL where id = #{id}
+        delete
+        from PHM.PHM_GROUND_DIAGNOSIS_MODEL
+        where id = #{id}
     </delete>
 
     <delete id="deleteGroundDiagnosisModelByIds" parameterType="String">
-        delete from PHM.PHM_GROUND_DIAGNOSIS_MODEL where id in 
+        delete from PHM.PHM_GROUND_DIAGNOSIS_MODEL where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ImportExportLogMapper.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.phm.manage.mapper.ImportExportLogMapper">
-    
+
     <resultMap type="ImportExportLog" id="ImportExportLogResult">
-        <result property="id"    column="id"    />
-        <result property="modelName"    column="model_name"    />
-        <result property="name"    column="name"    />
-        <result property="error"    column="error"    />
-        <result property="status"    column="status"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="modelName" column="model_name"/>
+        <result property="name" column="name"/>
+        <result property="error" column="error"/>
+        <result property="status" column="status"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectImportExportLogVo">
-        select id, model_name, name, error, status, is_delete, create_by, create_time, update_by, update_time from PHM.SYS_IMPORT_EXPORT_LOG
+        select id,
+               model_name,
+               name,
+               error,
+               status,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.SYS_IMPORT_EXPORT_LOG
     </sql>
 
     <select id="selectImportExportLogList" parameterType="ImportExportLog" resultMap="ImportExportLogResult">
         <include refid="selectImportExportLogVo"/>
-        <where>  
-            <if test="modelName != null  and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="error != null  and error != ''"> and error = #{error}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="modelName != null  and modelName != ''">and model_name like concat('%', #{modelName}, '%')</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="error != null  and error != ''">and error = #{error}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectImportExportLogById" parameterType="Long" resultMap="ImportExportLogResult">
         <include refid="selectImportExportLogVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertImportExportLog" parameterType="ImportExportLog">
         insert into PHM.SYS_IMPORT_EXPORT_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="modelName != null">#{modelName},</if>
@@ -66,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateImportExportLog" parameterType="ImportExportLog">
@@ -86,11 +96,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteImportExportLogById" parameterType="Long">
-        delete from PHM.SYS_IMPORT_EXPORT_LOG where id = #{id}
+        delete
+        from PHM.SYS_IMPORT_EXPORT_LOG
+        where id = #{id}
     </delete>
 
     <delete id="deleteImportExportLogByIds" parameterType="String">
-        delete from PHM.SYS_IMPORT_EXPORT_LOG where id in 
+        delete from PHM.SYS_IMPORT_EXPORT_LOG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/InstructionInfoMapper.xml

@@ -1,42 +1,50 @@
 <?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.phm.manage.mapper.InstructionInfoMapper">
-    
+
     <resultMap type="InstructionInfo" id="InstructionInfoResult">
-        <result property="id"    column="id"    />
-        <result property="attribute"    column="attribute"    />
-        <result property="content"    column="content"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="attribute" column="attribute"/>
+        <result property="content" column="content"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectInstructionInfoVo">
-        select id, attribute, content, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_INSTRUCTION_INFO
+        select id,
+               attribute,
+               content,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_INSTRUCTION_INFO
     </sql>
 
     <select id="selectInstructionInfoList" parameterType="InstructionInfo" resultMap="InstructionInfoResult">
         <include refid="selectInstructionInfoVo"/>
-        <where>  
-            <if test="attribute != null  and attribute != ''"> and attribute = #{attribute}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="attribute != null  and attribute != ''">and attribute = #{attribute}</if>
+            <if test="content != null  and content != ''">and content = #{content}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectInstructionInfoById" parameterType="Long" resultMap="InstructionInfoResult">
         <include refid="selectInstructionInfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertInstructionInfo" parameterType="InstructionInfo">
         insert into PHM.PHM_INSTRUCTION_INFO
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -48,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="attribute != null">#{attribute},</if>
@@ -58,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateInstructionInfo" parameterType="InstructionInfo">
@@ -76,11 +84,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteInstructionInfoById" parameterType="Long">
-        delete from PHM.PHM_INSTRUCTION_INFO where id = #{id}
+        delete
+        from PHM.PHM_INSTRUCTION_INFO
+        where id = #{id}
     </delete>
 
     <delete id="deleteInstructionInfoByIds" parameterType="String">
-        delete from PHM.PHM_INSTRUCTION_INFO where id in 
+        delete from PHM.PHM_INSTRUCTION_INFO where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/LifePartConfigMapper.xml

@@ -1,34 +1,37 @@
 <?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.phm.manage.mapper.LifePartConfigMapper">
-    
+
     <resultMap type="LifePartConfig" id="LifePartConfigResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="monitorName"    column="monitor_name"    />
-        <result property="unit"    column="unit"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="monitorName" column="monitor_name"/>
+        <result property="unit" column="unit"/>
     </resultMap>
 
     <sql id="selectLifePartConfigVo">
-        select id, name, monitor_name, unit from PHM.PHM_LIFE_PART_CONFIG
+        select id, name, monitor_name, unit
+        from PHM.PHM_LIFE_PART_CONFIG
     </sql>
 
     <select id="selectLifePartConfigList" parameterType="LifePartConfig" resultMap="LifePartConfigResult">
         <include refid="selectLifePartConfigVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="monitorName != null  and monitorName != ''"> and monitor_name like concat('%', #{monitorName}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="monitorName != null  and monitorName != ''">and monitor_name like concat('%', #{monitorName},
+                '%')
+            </if>
+            <if test="unit != null  and unit != ''">and unit = #{unit}</if>
         </where>
     </select>
-    
+
     <select id="selectLifePartConfigById" parameterType="Long" resultMap="LifePartConfigResult">
         <include refid="selectLifePartConfigVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertLifePartConfig" parameterType="LifePartConfig">
         insert into PHM.PHM_LIFE_PART_CONFIG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -36,13 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null">name,</if>
             <if test="monitorName != null">monitor_name,</if>
             <if test="unit != null">unit,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="monitorName != null">#{monitorName},</if>
             <if test="unit != null">#{unit},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateLifePartConfig" parameterType="LifePartConfig">
@@ -56,11 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteLifePartConfigById" parameterType="Long">
-        delete from PHM.PHM_LIFE_PART_CONFIG where id = #{id}
+        delete
+        from PHM.PHM_LIFE_PART_CONFIG
+        where id = #{id}
     </delete>
 
     <delete id="deleteLifePartConfigByIds" parameterType="String">
-        delete from PHM.PHM_LIFE_PART_CONFIG where id in 
+        delete from PHM.PHM_LIFE_PART_CONFIG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceMapper.xml

@@ -1,50 +1,64 @@
 <?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.phm.manage.mapper.MaintenanceMapper">
-    
+
     <resultMap type="Maintenance" id="MaintenanceResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="description"    column="description"    />
-        <result property="grade"    column="grade"    />
-        <result property="faultSource"    column="fault_source"    />
-        <result property="treatmentMeasure"    column="treatment_measure"    />
-        <result property="faultCode"    column="fault_code"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="description" column="description"/>
+        <result property="grade" column="grade"/>
+        <result property="faultSource" column="fault_source"/>
+        <result property="treatmentMeasure" column="treatment_measure"/>
+        <result property="faultCode" column="fault_code"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectMaintenanceVo">
-        select id, code, description, grade, fault_source, treatment_measure, fault_code, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_MAINTENANCE
+        select id,
+               code,
+               description,
+               grade,
+               fault_source,
+               treatment_measure,
+               fault_code,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_MAINTENANCE
     </sql>
 
     <select id="selectMaintenanceList" parameterType="Maintenance" resultMap="MaintenanceResult">
         <include refid="selectMaintenanceVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
-            <if test="faultSource != null  and faultSource != ''"> and fault_source = #{faultSource}</if>
-            <if test="treatmentMeasure != null  and treatmentMeasure != ''"> and treatment_measure = #{treatmentMeasure}</if>
-            <if test="faultCode != null  and faultCode != ''"> and fault_code = #{faultCode}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="code != null  and code != ''">and code = #{code}</if>
+            <if test="description != null  and description != ''">and description = #{description}</if>
+            <if test="grade != null  and grade != ''">and grade = #{grade}</if>
+            <if test="faultSource != null  and faultSource != ''">and fault_source = #{faultSource}</if>
+            <if test="treatmentMeasure != null  and treatmentMeasure != ''">and treatment_measure =
+                #{treatmentMeasure}
+            </if>
+            <if test="faultCode != null  and faultCode != ''">and fault_code = #{faultCode}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectMaintenanceById" parameterType="Long" resultMap="MaintenanceResult">
         <include refid="selectMaintenanceVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertMaintenance" parameterType="Maintenance">
         insert into PHM.PHM_MAINTENANCE
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -60,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
@@ -74,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateMaintenance" parameterType="Maintenance">
@@ -96,11 +110,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteMaintenanceById" parameterType="Long">
-        delete from PHM.PHM_MAINTENANCE where id = #{id}
+        delete
+        from PHM.PHM_MAINTENANCE
+        where id = #{id}
     </delete>
 
     <delete id="deleteMaintenanceByIds" parameterType="String">
-        delete from PHM.PHM_MAINTENANCE where id in 
+        delete from PHM.PHM_MAINTENANCE where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceTestControlMapper.xml

@@ -1,50 +1,65 @@
 <?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.phm.manage.mapper.MaintenanceTestControlMapper">
-    
+
     <resultMap type="MaintenanceTestControl" id="MaintenanceTestControlResult">
-        <result property="id"    column="id"    />
-        <result property="maintenanceControl"    column="maintenance_control"    />
-        <result property="object"    column="object"    />
-        <result property="name"    column="name"    />
-        <result property="applicationDoc"    column="application_doc"    />
-        <result property="faultData"    column="fault_data"    />
-        <result property="version"    column="version"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="maintenanceControl" column="maintenance_control"/>
+        <result property="object" column="object"/>
+        <result property="name" column="name"/>
+        <result property="applicationDoc" column="application_doc"/>
+        <result property="faultData" column="fault_data"/>
+        <result property="version" column="version"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectMaintenanceTestControlVo">
-        select id, maintenance_control, object, name, application_doc, fault_data, version, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_MAINTENANCE_TEST_CONTROL
+        select id,
+               maintenance_control,
+               object,
+               name,
+               application_doc,
+               fault_data,
+               version,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_MAINTENANCE_TEST_CONTROL
     </sql>
 
-    <select id="selectMaintenanceTestControlList" parameterType="MaintenanceTestControl" resultMap="MaintenanceTestControlResult">
+    <select id="selectMaintenanceTestControlList" parameterType="MaintenanceTestControl"
+            resultMap="MaintenanceTestControlResult">
         <include refid="selectMaintenanceTestControlVo"/>
-        <where>  
-            <if test="maintenanceControl != null  and maintenanceControl != ''"> and maintenance_control = #{maintenanceControl}</if>
-            <if test="object != null  and object != ''"> and object = #{object}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="applicationDoc != null  and applicationDoc != ''"> and application_doc = #{applicationDoc}</if>
-            <if test="faultData != null  and faultData != ''"> and fault_data = #{faultData}</if>
-            <if test="version != null  and version != ''"> and version = #{version}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="maintenanceControl != null  and maintenanceControl != ''">and maintenance_control =
+                #{maintenanceControl}
+            </if>
+            <if test="object != null  and object != ''">and object = #{object}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="applicationDoc != null  and applicationDoc != ''">and application_doc = #{applicationDoc}</if>
+            <if test="faultData != null  and faultData != ''">and fault_data = #{faultData}</if>
+            <if test="version != null  and version != ''">and version = #{version}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectMaintenanceTestControlById" parameterType="Long" resultMap="MaintenanceTestControlResult">
         <include refid="selectMaintenanceTestControlVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertMaintenanceTestControl" parameterType="MaintenanceTestControl">
         insert into PHM.PHM_MAINTENANCE_TEST_CONTROL
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -60,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="maintenanceControl != null">#{maintenanceControl},</if>
@@ -74,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateMaintenanceTestControl" parameterType="MaintenanceTestControl">
@@ -96,11 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteMaintenanceTestControlById" parameterType="Long">
-        delete from PHM.PHM_MAINTENANCE_TEST_CONTROL where id = #{id}
+        delete
+        from PHM.PHM_MAINTENANCE_TEST_CONTROL
+        where id = #{id}
     </delete>
 
     <delete id="deleteMaintenanceTestControlByIds" parameterType="String">
-        delete from PHM.PHM_MAINTENANCE_TEST_CONTROL where id in 
+        delete from PHM.PHM_MAINTENANCE_TEST_CONTROL where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/MonitorParameterConfigMapper.xml

@@ -1,46 +1,57 @@
 <?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.phm.manage.mapper.MonitorParameterConfigMapper">
-    
+
     <resultMap type="MonitorParameterConfig" id="MonitorParameterConfigResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="busRotocol"    column="bus_rotocol"    />
-        <result property="dataBlock"    column="data_block"    />
-        <result property="dataWord"    column="data_word"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="busRotocol" column="bus_rotocol"/>
+        <result property="dataBlock" column="data_block"/>
+        <result property="dataWord" column="data_word"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectMonitorParameterConfigVo">
-        select id, name, bus_rotocol, data_block, data_word, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_MONITOR_PARAMETER_CONFIG
+        select id,
+               name,
+               bus_rotocol,
+               data_block,
+               data_word,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_MONITOR_PARAMETER_CONFIG
     </sql>
 
-    <select id="selectMonitorParameterConfigList" parameterType="MonitorParameterConfig" resultMap="MonitorParameterConfigResult">
+    <select id="selectMonitorParameterConfigList" parameterType="MonitorParameterConfig"
+            resultMap="MonitorParameterConfigResult">
         <include refid="selectMonitorParameterConfigVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="busRotocol != null  and busRotocol != ''"> and bus_rotocol = #{busRotocol}</if>
-            <if test="dataBlock != null  and dataBlock != ''"> and data_block = #{dataBlock}</if>
-            <if test="dataWord != null  and dataWord != ''"> and data_word = #{dataWord}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="busRotocol != null  and busRotocol != ''">and bus_rotocol = #{busRotocol}</if>
+            <if test="dataBlock != null  and dataBlock != ''">and data_block = #{dataBlock}</if>
+            <if test="dataWord != null  and dataWord != ''">and data_word = #{dataWord}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectMonitorParameterConfigById" parameterType="Long" resultMap="MonitorParameterConfigResult">
         <include refid="selectMonitorParameterConfigVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertMonitorParameterConfig" parameterType="MonitorParameterConfig">
         insert into PHM.PHM_MONITOR_PARAMETER_CONFIG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
@@ -66,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateMonitorParameterConfig" parameterType="MonitorParameterConfig">
@@ -86,11 +97,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteMonitorParameterConfigById" parameterType="Long">
-        delete from PHM.PHM_MONITOR_PARAMETER_CONFIG where id = #{id}
+        delete
+        from PHM.PHM_MONITOR_PARAMETER_CONFIG
+        where id = #{id}
     </delete>
 
     <delete id="deleteMonitorParameterConfigByIds" parameterType="String">
-        delete from PHM.PHM_MONITOR_PARAMETER_CONFIG where id in 
+        delete from PHM.PHM_MONITOR_PARAMETER_CONFIG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -5,34 +5,44 @@
 <mapper namespace="com.phm.manage.mapper.OrderInfoMapper">
 
     <resultMap type="OrderInfo" id="OrderInfoResult">
-        <result property="id"    column="id"    />
-        <result property="orderName"    column="order_name"    />
-        <result property="orderType"    column="order_type"    />
-        <result property="content"    column="content"    />
-        <result property="status"    column="status"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="orderName" column="order_name"/>
+        <result property="orderType" column="order_type"/>
+        <result property="content" column="content"/>
+        <result property="status" column="status"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectOrderInfoVo">
-        select id, order_name, order_type, content, status, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ORDER_INFO
+        select id,
+               order_name,
+               order_type,
+               content,
+               status,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_ORDER_INFO
     </sql>
 
     <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
         <include refid="selectOrderInfoVo"/>
         <where>
-            <if test="orderName != null  and orderName != ''"> and order_name like concat('%', #{orderName}, '%')</if>
-            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="orderName != null  and orderName != ''">and order_name like concat('%', #{orderName}, '%')</if>
+            <if test="orderType != null  and orderType != ''">and order_type = #{orderType}</if>
+            <if test="content != null  and content != ''">and content = #{content}</if>
+            <if test="status != null ">and status = #{status}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
 
@@ -86,7 +96,9 @@
     </update>
 
     <delete id="deleteOrderInfoById" parameterType="Long">
-        delete from PHM.PHM_ORDER_INFO where id = #{id}
+        delete
+        from PHM.PHM_ORDER_INFO
+        where id = #{id}
     </delete>
 
     <delete id="deleteOrderInfoByIds" parameterType="String">

PHM-admin/phm-manage/src/main/resources/mapper/manage/PerformanceMonitorModelMapper.xml

@@ -1,50 +1,63 @@
 <?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.phm.manage.mapper.PerformanceMonitorModelMapper">
-    
+
     <resultMap type="PerformanceMonitorModel" id="PerformanceMonitorModelResult">
-        <result property="id"    column="id"    />
-        <result property="object"    column="object"    />
-        <result property="parameter"    column="parameter"    />
-        <result property="stateCondition"    column="state_condition"    />
-        <result property="valueMethod"    column="value_method"    />
-        <result property="alarmValue"    column="alarm_value"    />
-        <result property="thresholdValue"    column="threshold_value"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="object" column="object"/>
+        <result property="parameter" column="parameter"/>
+        <result property="stateCondition" column="state_condition"/>
+        <result property="valueMethod" column="value_method"/>
+        <result property="alarmValue" column="alarm_value"/>
+        <result property="thresholdValue" column="threshold_value"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectPerformanceMonitorModelVo">
-        select id, object, parameter, state_condition, value_method, alarm_value, threshold_value, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_PERFORMANCE_MONITOR_MODEL
+        select id,
+               object,
+               parameter,
+               state_condition,
+               value_method,
+               alarm_value,
+               threshold_value,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_PERFORMANCE_MONITOR_MODEL
     </sql>
 
-    <select id="selectPerformanceMonitorModelList" parameterType="PerformanceMonitorModel" resultMap="PerformanceMonitorModelResult">
+    <select id="selectPerformanceMonitorModelList" parameterType="PerformanceMonitorModel"
+            resultMap="PerformanceMonitorModelResult">
         <include refid="selectPerformanceMonitorModelVo"/>
-        <where>  
-            <if test="object != null  and object != ''"> and object = #{object}</if>
-            <if test="parameter != null  and parameter != ''"> and parameter = #{parameter}</if>
-            <if test="stateCondition != null  and stateCondition != ''"> and state_condition = #{stateCondition}</if>
-            <if test="valueMethod != null  and valueMethod != ''"> and value_method = #{valueMethod}</if>
-            <if test="alarmValue != null  and alarmValue != ''"> and alarm_value = #{alarmValue}</if>
-            <if test="thresholdValue != null  and thresholdValue != ''"> and threshold_value = #{thresholdValue}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="object != null  and object != ''">and object = #{object}</if>
+            <if test="parameter != null  and parameter != ''">and parameter = #{parameter}</if>
+            <if test="stateCondition != null  and stateCondition != ''">and state_condition = #{stateCondition}</if>
+            <if test="valueMethod != null  and valueMethod != ''">and value_method = #{valueMethod}</if>
+            <if test="alarmValue != null  and alarmValue != ''">and alarm_value = #{alarmValue}</if>
+            <if test="thresholdValue != null  and thresholdValue != ''">and threshold_value = #{thresholdValue}</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectPerformanceMonitorModelById" parameterType="Long" resultMap="PerformanceMonitorModelResult">
         <include refid="selectPerformanceMonitorModelVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertPerformanceMonitorModel" parameterType="PerformanceMonitorModel">
         insert into PHM.PHM_PERFORMANCE_MONITOR_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -60,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="object != null">#{object},</if>
@@ -74,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updatePerformanceMonitorModel" parameterType="PerformanceMonitorModel">
@@ -96,11 +109,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePerformanceMonitorModelById" parameterType="Long">
-        delete from PHM.PHM_PERFORMANCE_MONITOR_MODEL where id = #{id}
+        delete
+        from PHM.PHM_PERFORMANCE_MONITOR_MODEL
+        where id = #{id}
     </delete>
 
     <delete id="deletePerformanceMonitorModelByIds" parameterType="String">
-        delete from PHM.PHM_PERFORMANCE_MONITOR_MODEL where id in 
+        delete from PHM.PHM_PERFORMANCE_MONITOR_MODEL where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/PreHandleResultMapper.xml

@@ -1,39 +1,40 @@
 <?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.phm.manage.mapper.PreHandleResultMapper">
-    
+
     <resultMap type="PreHandleResult" id="PreHandleResultResult">
-        <result property="id"    column="id"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectPreHandleResultVo">
-        select id, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_PRE_HANDLE_RESULT
+        select id, is_delete, create_by, create_time, update_by, update_time
+        from PHM.PHM_PRE_HANDLE_RESULT
     </sql>
 
     <select id="selectPreHandleResultList" parameterType="PreHandleResult" resultMap="PreHandleResultResult">
         <include refid="selectPreHandleResultVo"/>
-        <where>  
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectPreHandleResultById" parameterType="Long" resultMap="PreHandleResultResult">
         <include refid="selectPreHandleResultVo"/>
         where id = #{id}
     </select>
-        
-    <insert id="insertPreHandleResult" parameterType="PreHandleResult" >
+
+    <insert id="insertPreHandleResult" parameterType="PreHandleResult">
         insert into PHM.PHM_PRE_HANDLE_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="isDelete != null">#{isDelete},</if>
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updatePreHandleResult" parameterType="PreHandleResult">
@@ -66,11 +67,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePreHandleResultById" parameterType="Long">
-        delete from PHM.PHM_PRE_HANDLE_RESULT where id = #{id}
+        delete
+        from PHM.PHM_PRE_HANDLE_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deletePreHandleResultByIds" parameterType="String">
-        delete from PHM.PHM_PRE_HANDLE_RESULT where id in 
+        delete from PHM.PHM_PRE_HANDLE_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ProductMapper.xml

@@ -5,18 +5,18 @@
 <mapper namespace="com.phm.manage.mapper.ProductMapper">
 
     <resultMap type="Product" id="ProductResult">
-        <result property="id"    column="id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="aircraftId"    column="aircraft_id"    />
-        <result property="parentName"    column="parent_name"    />
-        <result property="ancestors"    column="ancestors"    />
-        <result property="name"    column="name"    />
-        <result property="snsId"    column="sns_id"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="aircraftId" column="aircraft_id"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="name" column="name"/>
+        <result property="snsId" column="sns_id"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectProductVo">
@@ -40,12 +40,13 @@
     <select id="selectProductList" parameterType="Product" resultMap="ProductResult">
         <include refid="selectProductVo"/>
         <where>
-            <if test="parentId != null "> and t.parent_id = #{parentId}</if>
-            <if test="parentName != null  and parentName != ''"> and t.parent_name like concat('%', #{parentName}, '%')</if>
-            <if test="ancestors != null  and ancestors != ''"> and t.ancestors = #{ancestors}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="snsId != null  and snsId != ''"> and t.sns_id = #{snsId}</if>
-            <if test="isDelete != null "> and t.is_delete = #{isDelete}</if>
+            <if test="parentId != null ">and t.parent_id = #{parentId}</if>
+            <if test="parentName != null  and parentName != ''">and t.parent_name like concat('%', #{parentName}, '%')
+            </if>
+            <if test="ancestors != null  and ancestors != ''">and t.ancestors = #{ancestors}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="snsId != null  and snsId != ''">and t.sns_id = #{snsId}</if>
+            <if test="isDelete != null ">and t.is_delete = #{isDelete}</if>
         </where>
     </select>
 

PHM-admin/phm-manage/src/main/resources/mapper/manage/SoftwareConfigMapper.xml

@@ -1,42 +1,50 @@
 <?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.phm.manage.mapper.SoftwareConfigMapper">
-    
+
     <resultMap type="SoftwareConfig" id="SoftwareConfigResult">
-        <result property="id"    column="id"    />
-        <result property="serialNumber"    column="serial_number"    />
-        <result property="name"    column="name"    />
-        <result property="isDelete"    column="is_delete"    />
-        <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="id" column="id"/>
+        <result property="serialNumber" column="serial_number"/>
+        <result property="name" column="name"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectSoftwareConfigVo">
-        select id, serial_number, name, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_SOFTWARE_CONFIG
+        select id,
+               serial_number,
+               name,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_SOFTWARE_CONFIG
     </sql>
 
     <select id="selectSoftwareConfigList" parameterType="SoftwareConfig" resultMap="SoftwareConfigResult">
         <include refid="selectSoftwareConfigVo"/>
-        <where>  
-            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+        <where>
+            <if test="serialNumber != null  and serialNumber != ''">and serial_number = #{serialNumber}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
+            <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and update_time = #{updateTime}</if>
         </where>
     </select>
-    
+
     <select id="selectSoftwareConfigById" parameterType="Long" resultMap="SoftwareConfigResult">
         <include refid="selectSoftwareConfigVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSoftwareConfig" parameterType="SoftwareConfig">
         insert into PHM.PHM_SOFTWARE_CONFIG
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -48,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="serialNumber != null">#{serialNumber},</if>
@@ -58,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateSoftwareConfig" parameterType="SoftwareConfig">
@@ -76,11 +84,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSoftwareConfigById" parameterType="Long">
-        delete from PHM.PHM_SOFTWARE_CONFIG where id = #{id}
+        delete
+        from PHM.PHM_SOFTWARE_CONFIG
+        where id = #{id}
     </delete>
 
     <delete id="deleteSoftwareConfigByIds" parameterType="String">
-        delete from PHM.PHM_SOFTWARE_CONFIG where id in 
+        delete from PHM.PHM_SOFTWARE_CONFIG where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -1,96 +1,105 @@
 <?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.phm.system.mapper.SysConfigMapper">
-    
+
     <resultMap type="SysConfig" id="SysConfigResult">
-    	<id     property="configId"      column="config_id"      />
-        <result property="configName"    column="config_name"    />
-        <result property="configKey"     column="config_key"     />
-        <result property="configValue"   column="config_value"   />
-        <result property="configType"    column="config_type"    />
-        <result property="createBy"      column="create_by"      />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"      column="update_by"      />
-        <result property="updateTime"    column="update_time"    />
+        <id property="configId" column="config_id"/>
+        <result property="configName" column="config_name"/>
+        <result property="configKey" column="config_key"/>
+        <result property="configValue" column="config_value"/>
+        <result property="configType" column="config_type"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
-    
+
     <sql id="selectConfigVo">
-        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
-		from PHM.SYS_CONFIG
+        select config_id,
+               config_name,
+               config_key,
+               config_value,
+               config_type,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from PHM.SYS_CONFIG
     </sql>
-    
+
     <!-- 查询条件 -->
-	<sql id="sqlwhereSearch">
-		<where>
-			<if test="configId !=null">
-				and config_id = #{configId}
-			</if>
-			<if test="configKey !=null and configKey != ''">
-				and config_key = #{configKey}
-			</if>
-		</where>
-	</sql>
-    
+    <sql id="sqlwhereSearch">
+        <where>
+            <if test="configId !=null">
+                and config_id = #{configId}
+            </if>
+            <if test="configKey !=null and configKey != ''">
+                and config_key = #{configKey}
+            </if>
+        </where>
+    </sql>
+
     <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <include refid="sqlwhereSearch"/>
     </select>
-    
+
     <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <where>
-			<if test="configName != null and configName != ''">
-				AND config_name like concat('%', #{configName}, '%')
-			</if>
-			<if test="configType != null and configType != ''">
-				AND config_type = #{configType}
-			</if>
-			<if test="configKey != null and configKey != ''">
-				AND config_key like concat('%', #{configKey}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
+            <if test="configName != null and configName != ''">
+                AND config_name like concat('%', #{configName}, '%')
+            </if>
+            <if test="configType != null and configType != ''">
+                AND config_type = #{configType}
+            </if>
+            <if test="configKey != null and configKey != ''">
+                AND config_key like concat('%', #{configKey}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
     </select>
-    
+
     <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         where config_id = #{configId}
     </select>
-	
+
     <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         where config_key = #{configKey} limit 1
     </select>
-    
+
     <insert id="insertConfig" parameterType="SysConfig">
         insert into PHM.SYS_CONFIG (
-			<if test="configName != null and configName != '' ">config_name,</if>
-			<if test="configKey != null and configKey != '' ">config_key,</if>
-			<if test="configValue != null and configValue != '' ">config_value,</if>
-			<if test="configType != null and configType != '' ">config_type,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
-			<if test="remark != null and remark != ''">remark,</if>
- 			create_time
+        <if test="configName != null and configName != '' ">config_name,</if>
+        <if test="configKey != null and configKey != '' ">config_key,</if>
+        <if test="configValue != null and configValue != '' ">config_value,</if>
+        <if test="configType != null and configType != '' ">config_type,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        create_time
         )values(
-			<if test="configName != null and configName != ''">#{configName},</if>
-			<if test="configKey != null and configKey != ''">#{configKey},</if>
-			<if test="configValue != null and configValue != ''">#{configValue},</if>
-			<if test="configType != null and configType != ''">#{configType},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
-		)
+        <if test="configName != null and configName != ''">#{configName},</if>
+        <if test="configKey != null and configKey != ''">#{configKey},</if>
+        <if test="configValue != null and configValue != ''">#{configValue},</if>
+        <if test="configType != null and configType != ''">#{configType},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        sysdate()
+        )
     </insert>
-	 
+
     <update id="updateConfig" parameterType="SysConfig">
-        update PHM.SYS_CONFIG 
+        update PHM.SYS_CONFIG
         <set>
             <if test="configName != null and configName != ''">config_name = #{configName},</if>
             <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
@@ -98,20 +107,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configType != null and configType != ''">config_type = #{configType},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
+            update_time = sysdate()
         </set>
         where config_id = #{configId}
     </update>
-	
+
     <delete id="deleteConfigById" parameterType="Long">
-        delete from PHM.SYS_CONFIG where config_id = #{configId}
+        delete
+        from PHM.SYS_CONFIG
+        where config_id = #{configId}
     </delete>
-    
+
     <delete id="deleteConfigByIds" parameterType="Long">
-        delete from PHM.SYS_CONFIG where config_id in 
+        delete from PHM.SYS_CONFIG where config_id in
         <foreach item="configId" collection="array" open="(" separator="," close=")">
-        	#{configId}
+            #{configId}
         </foreach>
     </delete>
-    
+
 </mapper>

PHM-admin/phm-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -1,159 +1,193 @@
 <?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.phm.system.mapper.SysDeptMapper">
 
-	<resultMap type="SysDept" id="SysDeptResult">
-		<id     property="deptId"     column="dept_id"     />
-		<result property="parentId"   column="parent_id"   />
-		<result property="ancestors"  column="ancestors"   />
-		<result property="deptName"   column="dept_name"   />
-		<result property="orderNum"   column="order_num"   />
-		<result property="leader"     column="leader"      />
-		<result property="phone"      column="phone"       />
-		<result property="email"      column="email"       />
-		<result property="status"     column="status"      />
-		<result property="delFlag"    column="del_flag"    />
-		<result property="parentName" column="parent_name" />
-		<result property="createBy"   column="create_by"   />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
-		<result property="updateTime" column="update_time" />
-	</resultMap>
-	
-	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+    <resultMap type="SysDept" id="SysDeptResult">
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="phone" column="phone"/>
+        <result property="email" column="email"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectDeptVo">
+        select d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.phone,
+               d.email,
+               d.status,
+               d.del_flag,
+               d.create_by,
+               d.create_time
         from PHM.SYS_DEPT d
     </sql>
-    
-	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+
+    <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
-		</if>
+        <if test="deptId != null and deptId != 0">
+            AND dept_id = #{deptId}
+        </if>
         <if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
-		</if>
-		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
-		</if>
-		<if test="status != null and status != ''">
-			AND status = #{status}
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-		order by d.parent_id, d.order_num
+            AND parent_id = #{parentId}
+        </if>
+        <if test="deptName != null and deptName != ''">
+            AND dept_name like concat('%', #{deptName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND status = #{status}
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by d.parent_id, d.order_num
     </select>
-    
+
     <select id="selectDeptListByRoleId" resultType="Long">
-		select d.dept_id
-		from PHM.SYS_DEPT d
-            left join sys_role_dept rd on d.dept_id = rd.dept_id
+        select d.dept_id
+        from PHM.SYS_DEPT d
+        left join PHM.SYS_ROLE_DEPT rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
-            <if test="deptCheckStrictly">
-              and d.dept_id not in (select d.parent_id from PHM.SYS_DEPT d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
-            </if>
-		order by d.parent_id, d.order_num
-	</select>
-    
+        <if test="deptCheckStrictly">
+            and d.dept_id not in (select d.parent_id from PHM.SYS_DEPT d inner join PHM.SYS_ROLE_DEPT rd on d.dept_id =
+            rd.dept_id and rd.role_id = #{roleId})
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
+
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from PHM.SYS_DEPT where dept_id = d.parent_id) parent_name
-		from PHM.SYS_DEPT d
-		where d.dept_id = #{deptId}
-	</select>
-    
+        select d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.phone,
+               d.email,
+               d.status,
+               (select dept_name from PHM.SYS_DEPT where dept_id = d.parent_id) parent_name
+        from PHM.SYS_DEPT d
+        where d.dept_id = #{deptId}
+    </select>
+
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
-	</select>
-	
-	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
-		select count(1) from PHM.SYS_DEPT
-		where del_flag = '0' and parent_id = #{deptId} limit 1
-	</select>
-	
-	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from PHM.SYS_DEPT where instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
-	</select>
-	
-	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from PHM.SYS_DEPT where status = 0 and del_flag = '0' and instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
-	</select>
-	
-	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
-	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
-	</select>
-    
+        select count(1)
+        from PHM.SYS_USER
+        where dept_id = #{deptId}
+          and del_flag = '0'
+    </select>
+
+    <select id="hasChildByDeptId" parameterType="Long" resultType="int">
+        select count(1)
+        from PHM.SYS_DEPT
+        where del_flag = '0'
+          and parent_id = #{deptId}
+        limit 1
+    </select>
+
+    <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
+        select *
+        from PHM.SYS_DEPT
+        where instr(',' || ancestors || ',', ',' || #{deptId} || ',')
+    </select>
+
+    <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
+        select count(*)
+        from PHM.SYS_DEPT
+        where status = 0
+          and del_flag = '0'
+          and instr(',' || ancestors || ',', ',' || #{deptId} || ',')
+    </select>
+
+    <select id="checkDeptNameUnique" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
+    </select>
+
     <insert id="insertDept" parameterType="SysDept">
- 		insert into PHM.SYS_DEPT(
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
- 			<if test="parentId != null and parentId != 0">parent_id,</if>
- 			<if test="deptName != null and deptName != ''">dept_name,</if>
- 			<if test="ancestors != null and ancestors != ''">ancestors,</if>
- 			<if test="orderNum != null">order_num,</if>
- 			<if test="leader != null and leader != ''">leader,</if>
- 			<if test="phone != null and phone != ''">phone,</if>
- 			<if test="email != null and email != ''">email,</if>
- 			<if test="status != null">status,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="deptId != null and deptId != 0">#{deptId},</if>
- 			<if test="parentId != null and parentId != 0">#{parentId},</if>
- 			<if test="deptName != null and deptName != ''">#{deptName},</if>
- 			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- 			<if test="orderNum != null">#{orderNum},</if>
- 			<if test="leader != null and leader != ''">#{leader},</if>
- 			<if test="phone != null and phone != ''">#{phone},</if>
- 			<if test="email != null and email != ''">#{email},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<update id="updateDept" parameterType="SysDept">
- 		update PHM.SYS_DEPT
- 		<set>
- 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- 			<if test="orderNum != null">order_num = #{orderNum},</if>
- 			<if test="leader != null">leader = #{leader},</if>
- 			<if test="phone != null">phone = #{phone},</if>
- 			<if test="email != null">email = #{email},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dept_id = #{deptId}
-	</update>
-	
-	<update id="updateDeptChildren" parameterType="java.util.List">
-	    update PHM.SYS_DEPT set ancestors =
-	    <foreach collection="depts" item="item" index="index"
-	        separator=" " open="case dept_id" close="end">
-	        when #{item.deptId} then #{item.ancestors}
-	    </foreach>
-	    where dept_id in
-	    <foreach collection="depts" item="item" index="index"
-	        separator="," open="(" close=")">
-	        #{item.deptId}
-	    </foreach>
-	</update>
-	 
-	<update id="updateDeptStatusNormal" parameterType="Long">
- 	    update PHM.SYS_DEPT set status = '0' where dept_id in 
- 	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
-        	#{deptId}
+        insert into PHM.SYS_DEPT(
+        <if test="deptId != null and deptId != 0">dept_id,</if>
+        <if test="parentId != null and parentId != 0">parent_id,</if>
+        <if test="deptName != null and deptName != ''">dept_name,</if>
+        <if test="ancestors != null and ancestors != ''">ancestors,</if>
+        <if test="orderNum != null">order_num,</if>
+        <if test="leader != null and leader != ''">leader,</if>
+        <if test="phone != null and phone != ''">phone,</if>
+        <if test="email != null and email != ''">email,</if>
+        <if test="status != null">status,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="deptId != null and deptId != 0">#{deptId},</if>
+        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        <if test="deptName != null and deptName != ''">#{deptName},</if>
+        <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+        <if test="orderNum != null">#{orderNum},</if>
+        <if test="leader != null and leader != ''">#{leader},</if>
+        <if test="phone != null and phone != ''">#{phone},</if>
+        <if test="email != null and email != ''">#{email},</if>
+        <if test="status != null">#{status},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
+    <update id="updateDept" parameterType="SysDept">
+        update PHM.SYS_DEPT
+        <set>
+            <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="leader != null">leader = #{leader},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where dept_id = #{deptId}
+    </update>
+
+    <update id="updateDeptChildren" parameterType="java.util.List">
+        update PHM.SYS_DEPT set ancestors =
+        <foreach collection="depts" item="item" index="index"
+                 separator=" " open="case dept_id" close="end">
+            when #{item.deptId} then #{item.ancestors}
+        </foreach>
+        where dept_id in
+        <foreach collection="depts" item="item" index="index"
+                 separator="," open="(" close=")">
+            #{item.deptId}
         </foreach>
-	</update>
-	
-	<delete id="deleteDeptById" parameterType="Long">
-		update PHM.SYS_DEPT set del_flag = '2' where dept_id = #{deptId}
-	</delete>
+    </update>
+
+    <update id="updateDeptStatusNormal" parameterType="Long">
+        update PHM.SYS_DEPT set status = '0' where dept_id in
+        <foreach collection="array" item="deptId" open="(" separator="," close=")">
+            #{deptId}
+        </foreach>
+    </update>
+
+    <delete id="deleteDeptById" parameterType="Long">
+        update PHM.SYS_DEPT
+        set del_flag = '2'
+        where dept_id = #{deptId}
+    </delete>
 
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -1,124 +1,143 @@
 <?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.phm.system.mapper.SysDictDataMapper">
-	
-	<resultMap type="SysDictData" id="SysDictDataResult">
-		<id     property="dictCode"   column="dict_code"   />
-		<result property="dictSort"   column="dict_sort"   />
-		<result property="dictLabel"  column="dict_label"  />
-		<result property="dictValue"  column="dict_value"  />
-		<result property="dictType"   column="dict_type"   />
-		<result property="cssClass"   column="css_class"   />
-		<result property="listClass"  column="list_class"  />
-		<result property="isDefault"  column="is_default"  />
-		<result property="status"     column="status"      />
-		<result property="createBy"   column="create_by"   />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
-		<result property="updateTime" column="update_time" />
-	</resultMap>
-	
-	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
-		from PHM.SYS_DICT_DATA
+
+    <resultMap type="SysDictData" id="SysDictDataResult">
+        <id property="dictCode" column="dict_code"/>
+        <result property="dictSort" column="dict_sort"/>
+        <result property="dictLabel" column="dict_label"/>
+        <result property="dictValue" column="dict_value"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="cssClass" column="css_class"/>
+        <result property="listClass" column="list_class"/>
+        <result property="isDefault" column="is_default"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectDictDataVo">
+        select dict_code,
+               dict_sort,
+               dict_label,
+               dict_value,
+               dict_type,
+               css_class,
+               list_class,
+               is_default,
+               status,
+               create_by,
+               create_time,
+               remark
+        from PHM.SYS_DICT_DATA
     </sql>
 
-	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
-	    <include refid="selectDictDataVo"/>
-		<where>
-		    <if test="dictType != null and dictType != ''">
-				AND dict_type = #{dictType}
-			</if>
-			<if test="dictLabel != null and dictLabel != ''">
-				AND dict_label like concat('%', #{dictLabel}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-		</where>
-		order by dict_sort asc
-	</select>
-	
-	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
-		<include refid="selectDictDataVo"/>
-		where status = '0' and dict_type = #{dictType} order by dict_sort asc
-	</select>
-	
-	<select id="selectDictLabel" resultType="String">
-		select dict_label from PHM.SYS_DICT_DATA
-		where dict_type = #{dictType} and dict_value = #{dictValue}
-	</select>
-	
-	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
-		<include refid="selectDictDataVo"/>
-		where dict_code = #{dictCode}
-	</select>
-	
-	<select id="countDictDataByType" resultType="Integer">
-	    select count(1) from PHM.SYS_DICT_DATA where dict_type=#{dictType}  
-	</select>
-	
-	<delete id="deleteDictDataById" parameterType="Long">
- 		delete from PHM.SYS_DICT_DATA where dict_code = #{dictCode}
- 	</delete>
- 	
- 	<delete id="deleteDictDataByIds" parameterType="Long">
- 		delete from PHM.SYS_DICT_DATA where dict_code in
- 		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
- 			#{dictCode}
-        </foreach> 
- 	</delete>
-	
-	<update id="updateDictData" parameterType="SysDictData">
- 		update PHM.SYS_DICT_DATA
- 		<set>
- 			<if test="dictSort != null">dict_sort = #{dictSort},</if>
- 			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
- 			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
- 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="cssClass != null">css_class = #{cssClass},</if>
- 			<if test="listClass != null">list_class = #{listClass},</if>
- 			<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
- 			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dict_code = #{dictCode}
-	</update>
-	
-	<update id="updateDictDataType" parameterType="String">
- 		update PHM.SYS_DICT_DATA set dict_type = #{newDictType} where dict_type = #{oldDictType}
-	</update>
- 	
- 	<insert id="insertDictData" parameterType="SysDictData">
- 		insert into PHM.SYS_DICT_DATA(
- 			<if test="dictSort != null">dict_sort,</if>
- 			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
- 			<if test="dictValue != null and dictValue != ''">dict_value,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="cssClass != null and cssClass != ''">css_class,</if>
- 			<if test="listClass != null and listClass != ''">list_class,</if>
- 			<if test="isDefault != null and isDefault != ''">is_default,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 		    <if test="dictSort != null">#{dictSort},</if>
- 		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
- 			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
- 			<if test="listClass != null and listClass != ''">#{listClass},</if>
- 			<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
+    <select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
+        <include refid="selectDictDataVo"/>
+        <where>
+            <if test="dictType != null and dictType != ''">
+                AND dict_type = #{dictType}
+            </if>
+            <if test="dictLabel != null and dictLabel != ''">
+                AND dict_label like concat('%', #{dictLabel}, '%')
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+        </where>
+        order by dict_sort asc
+    </select>
+
+    <select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
+        <include refid="selectDictDataVo"/>
+        where status = '0' and dict_type = #{dictType} order by dict_sort asc
+    </select>
+
+    <select id="selectDictLabel" resultType="String">
+        select dict_label
+        from PHM.SYS_DICT_DATA
+        where dict_type = #{dictType}
+          and dict_value = #{dictValue}
+    </select>
+
+    <select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
+        <include refid="selectDictDataVo"/>
+        where dict_code = #{dictCode}
+    </select>
+
+    <select id="countDictDataByType" resultType="Integer">
+        select count(1)
+        from PHM.SYS_DICT_DATA
+        where dict_type = #{dictType}
+    </select>
+
+    <delete id="deleteDictDataById" parameterType="Long">
+        delete
+        from PHM.SYS_DICT_DATA
+        where dict_code = #{dictCode}
+    </delete>
+
+    <delete id="deleteDictDataByIds" parameterType="Long">
+        delete from PHM.SYS_DICT_DATA where dict_code in
+        <foreach collection="array" item="dictCode" open="(" separator="," close=")">
+            #{dictCode}
+        </foreach>
+    </delete>
+
+    <update id="updateDictData" parameterType="SysDictData">
+        update PHM.SYS_DICT_DATA
+        <set>
+            <if test="dictSort != null">dict_sort = #{dictSort},</if>
+            <if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
+            <if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
+            <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+            <if test="cssClass != null">css_class = #{cssClass},</if>
+            <if test="listClass != null">list_class = #{listClass},</if>
+            <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where dict_code = #{dictCode}
+    </update>
+
+    <update id="updateDictDataType" parameterType="String">
+        update PHM.SYS_DICT_DATA
+        set dict_type = #{newDictType}
+        where dict_type = #{oldDictType}
+    </update>
+
+    <insert id="insertDictData" parameterType="SysDictData">
+        insert into PHM.SYS_DICT_DATA(
+        <if test="dictSort != null">dict_sort,</if>
+        <if test="dictLabel != null and dictLabel != ''">dict_label,</if>
+        <if test="dictValue != null and dictValue != ''">dict_value,</if>
+        <if test="dictType != null and dictType != ''">dict_type,</if>
+        <if test="cssClass != null and cssClass != ''">css_class,</if>
+        <if test="listClass != null and listClass != ''">list_class,</if>
+        <if test="isDefault != null and isDefault != ''">is_default,</if>
+        <if test="status != null">status,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="dictSort != null">#{dictSort},</if>
+        <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
+        <if test="dictValue != null and dictValue != ''">#{dictValue},</if>
+        <if test="dictType != null and dictType != ''">#{dictType},</if>
+        <if test="cssClass != null and cssClass != ''">#{cssClass},</if>
+        <if test="listClass != null and listClass != ''">#{listClass},</if>
+        <if test="isDefault != null and isDefault != ''">#{isDefault},</if>
+        <if test="status != null">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -1,105 +1,107 @@
 <?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.phm.system.mapper.SysDictTypeMapper">
 
-	<resultMap type="SysDictType" id="SysDictTypeResult">
-		<id     property="dictId"     column="dict_id"     />
-		<result property="dictName"   column="dict_name"   />
-		<result property="dictType"   column="dict_type"   />
-		<result property="status"     column="status"      />
-		<result property="createBy"   column="create_by"   />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
-		<result property="updateTime" column="update_time" />
-	</resultMap>
-	
-	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
-		from PHM.SYS_DICT_TYPE
+    <resultMap type="SysDictType" id="SysDictTypeResult">
+        <id property="dictId" column="dict_id"/>
+        <result property="dictName" column="dict_name"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectDictTypeVo">
+        select dict_id, dict_name, dict_type, status, create_by, create_time, remark
+        from PHM.SYS_DICT_TYPE
     </sql>
 
-	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
-	    <include refid="selectDictTypeVo"/>
-		<where>
-		    <if test="dictName != null and dictName != ''">
-				AND dict_name like concat('%', #{dictName}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="dictType != null and dictType != ''">
-				AND dict_type like concat('%', #{dictType}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-	    </where>
-	</select>
-	
-	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-	</select>
-	
-	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_id = #{dictId}
-	</select>
-	
-	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType}
-	</select>
-	
-	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType} limit 1
-	</select>
-	
-	<delete id="deleteDictTypeById" parameterType="Long">
- 		delete from PHM.SYS_DICT_TYPE where dict_id = #{dictId}
- 	</delete>
- 	
- 	<delete id="deleteDictTypeByIds" parameterType="Long">
- 		delete from PHM.SYS_DICT_TYPE where dict_id in
- 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
- 			#{dictId}
-        </foreach> 
- 	</delete>
+    <select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        <where>
+            <if test="dictName != null and dictName != ''">
+                AND dict_name like concat('%', #{dictName}, '%')
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="dictType != null and dictType != ''">
+                AND dict_type like concat('%', #{dictType}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDictTypeAll" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+    </select>
+
+    <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        where dict_id = #{dictId}
+    </select>
+
+    <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        where dict_type = #{dictType}
+    </select>
+
+    <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
+        <include refid="selectDictTypeVo"/>
+        where dict_type = #{dictType} limit 1
+    </select>
+
+    <delete id="deleteDictTypeById" parameterType="Long">
+        delete
+        from PHM.SYS_DICT_TYPE
+        where dict_id = #{dictId}
+    </delete>
+
+    <delete id="deleteDictTypeByIds" parameterType="Long">
+        delete from PHM.SYS_DICT_TYPE where dict_id in
+        <foreach collection="array" item="dictId" open="(" separator="," close=")">
+            #{dictId}
+        </foreach>
+    </delete>
+
+    <update id="updateDictType" parameterType="SysDictType">
+        update PHM.SYS_DICT_TYPE
+        <set>
+            <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
+            <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where dict_id = #{dictId}
+    </update>
+
+    <insert id="insertDictType" parameterType="SysDictType">
+        insert into PHM.SYS_DICT_TYPE(
+        <if test="dictName != null and dictName != ''">dict_name,</if>
+        <if test="dictType != null and dictType != ''">dict_type,</if>
+        <if test="status != null">status,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="dictName != null and dictName != ''">#{dictName},</if>
+        <if test="dictType != null and dictType != ''">#{dictType},</if>
+        <if test="status != null">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
 
- 	<update id="updateDictType" parameterType="SysDictType">
- 		update PHM.SYS_DICT_TYPE
- 		<set>
- 			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
- 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dict_id = #{dictId}
-	</update>
- 	
- 	<insert id="insertDictType" parameterType="SysDictType">
- 		insert into PHM.SYS_DICT_TYPE(
- 			<if test="dictName != null and dictName != ''">dict_name,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="dictName != null and dictName != ''">#{dictName},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -1,202 +1,258 @@
 <?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.phm.system.mapper.SysMenuMapper">
 
-	<resultMap type="SysMenu" id="SysMenuResult">
-		<id     property="menuId"         column="menu_id"        />
-		<result property="menuName"       column="menu_name"      />
-		<result property="parentName"     column="parent_name"    />
-		<result property="parentId"       column="parent_id"      />
-		<result property="orderNum"       column="order_num"      />
-		<result property="path"           column="path"           />
-		<result property="component"      column="component"      />
-		<result property="query"          column="query"          />
-		<result property="isFrame"        column="is_frame"       />
-		<result property="isCache"        column="is_cache"       />
-		<result property="menuType"       column="menu_type"      />
-		<result property="visible"        column="visible"        />
-		<result property="status"         column="status"         />
-		<result property="perms"          column="perms"          />
-		<result property="icon"           column="icon"           />
-		<result property="createBy"       column="create_by"      />
-		<result property="createTime"     column="create_time"    />
-		<result property="updateTime"     column="update_time"    />
-		<result property="updateBy"       column="update_by"      />
-		<result property="remark"         column="remark"         />
-	</resultMap>
-
-	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
-		from PHM.SYS_MENU
+    <resultMap type="SysMenu" id="SysMenuResult">
+        <id property="menuId" column="menu_id"/>
+        <result property="menuName" column="menu_name"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="path" column="path"/>
+        <result property="component" column="component"/>
+        <result property="query" column="query"/>
+        <result property="isFrame" column="is_frame"/>
+        <result property="isCache" column="is_cache"/>
+        <result property="menuType" column="menu_type"/>
+        <result property="visible" column="visible"/>
+        <result property="status" column="status"/>
+        <result property="perms" column="perms"/>
+        <result property="icon" column="icon"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectMenuVo">
+        select menu_id,
+               menu_name,
+               parent_id,
+               order_num,
+               path,
+               component,
+               query,
+               is_frame,
+               is_cache,
+               menu_type,
+               visible,
+               status,
+               ifnull(perms, '') as perms,
+               icon,
+               create_time
+        from PHM.SYS_MENU
     </sql>
-    
+
     <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		<where>
-			<if test="menuName != null and menuName != ''">
-				AND menu_name like concat('%', #{menuName}, '%')
-			</if>
-			<if test="visible != null and visible != ''">
-				AND visible = #{visible}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-		</where>
-		order by parent_id, order_num
-	</select>
-	
-	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from PHM.SYS_MENU m where m.menu_type in ('M', 'C') and m.status = 0
-		order by m.parent_id, m.order_num
-	</select>
-	
-	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from PHM.SYS_MENU m
-		left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
-		left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
-		left join PHM.SYS_ROLE ro on ur.role_id = ro.role_id
-		where ur.user_id = #{params.userId}
-		<if test="menuName != null and menuName != ''">
+        <include refid="selectMenuVo"/>
+        <where>
+            <if test="menuName != null and menuName != ''">
+                AND menu_name like concat('%', #{menuName}, '%')
+            </if>
+            <if test="visible != null and visible != ''">
+                AND visible = #{visible}
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+        </where>
+        order by parent_id, order_num
+    </select>
+
+    <select id="selectMenuTreeAll" resultMap="SysMenuResult">
+        select distinct m.menu_id,
+                        m.parent_id,
+                        m.menu_name,
+                        m.path,
+                        m.component,
+                        m.query,
+                        m.visible,
+                        m.status,
+                        ifnull(m.perms, '') as perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from PHM.SYS_MENU m
+        where m.menu_type in ('M', 'C')
+          and m.status = 0
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
+        ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+        from PHM.SYS_MENU m
+        left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+        left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+        left join PHM.SYS_ROLE ro on ur.role_id = ro.role_id
+        where ur.user_id = #{params.userId}
+        <if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
-		</if>
-		<if test="visible != null and visible != ''">
+        </if>
+        <if test="visible != null and visible != ''">
             AND m.visible = #{visible}
-		</if>
-		<if test="status != null and status != ''">
+        </if>
+        <if test="status != null and status != ''">
             AND m.status = #{status}
-		</if>
-		order by m.parent_id, m.order_num
-	</select>
-    
+        </if>
+        order by m.parent_id, m.order_num
+    </select>
+
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from PHM.SYS_MENU m
-			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
-			 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
-			 left join PHM.SYS_ROLE ro on ur.role_id = ro.role_id
-			 left join PHM.SYS_USER u on ur.user_id = u.user_id
-		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
-		order by m.parent_id, m.order_num
-	</select>
-	
-	<select id="selectMenuListByRoleId" resultType="Long">
-		select m.menu_id
-		from PHM.SYS_MENU m
-            left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+        select distinct m.menu_id,
+                        m.parent_id,
+                        m.menu_name,
+                        m.path,
+                        m.component,
+                        m.query,
+                        m.visible,
+                        m.status,
+                        ifnull(m.perms, '') as perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from PHM.SYS_MENU m
+                 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+                 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+                 left join PHM.SYS_ROLE ro on ur.role_id = ro.role_id
+                 left join PHM.SYS_USER u on ur.user_id = u.user_id
+        where u.user_id = #{userId}
+          and m.menu_type in ('M', 'C')
+          and m.status = 0
+          AND ro.status = 0
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuListByRoleId" resultType="Long">
+        select m.menu_id
+        from PHM.SYS_MENU m
+        left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
         where rm.role_id = #{roleId}
-            <if test="menuCheckStrictly">
-              and m.menu_id not in (select m.parent_id from PHM.SYS_MENU m inner join PHM.PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
-            </if>
-		order by m.parent_id, m.order_num
-	</select>
-	
-	<select id="selectMenuPerms" resultType="String">
-		select distinct m.perms
-		from PHM.SYS_MENU m
-			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
-			 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
-	</select>
-
-	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
-		select distinct m.perms
-		from PHM.SYS_MENU m
-			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
-			 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
-			 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
-		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
-	</select>
-	
-	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
-		select distinct m.perms
-		from PHM.SYS_MENU m
-			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
-		where m.status = '0' and rm.role_id = #{roleId}
-	</select>
-	
-	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		where menu_id = #{menuId}
-	</select>
-	
-	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from PHM.SYS_MENU where parent_id = #{menuId}  
-	</select>
-	
-	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
-	</select>
-	
-	<update id="updateMenu" parameterType="SysMenu">
-		update PHM.SYS_MENU
-		<set>
-			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
-			<if test="parentId != null">parent_id = #{parentId},</if>
-			<if test="orderNum != null">order_num = #{orderNum},</if>
-			<if test="path != null and path != ''">path = #{path},</if>
-			<if test="component != null">component = #{component},</if>
-			<if test="query != null">`query` = #{query},</if>
-			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
-			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
-			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
-			<if test="visible != null">visible = #{visible},</if>
-			<if test="status != null">status = #{status},</if>
-			<if test="perms !=null">perms = #{perms},</if>
-			<if test="icon !=null and icon != ''">icon = #{icon},</if>
-			<if test="remark != null and remark != ''">remark = #{remark},</if>
-			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			update_time = sysdate()
-		</set>
-		where menu_id = #{menuId}
-	</update>
-
-	<insert id="insertMenu" parameterType="SysMenu">
-		insert into PHM.SYS_MENU(
-		<if test="menuId != null and menuId != 0">menu_id,</if>
-		<if test="parentId != null and parentId != 0">parent_id,</if>
-		<if test="menuName != null and menuName != ''">menu_name,</if>
-		<if test="orderNum != null">order_num,</if>
-		<if test="path != null and path != ''">path,</if>
-		<if test="component != null and component != ''">component,</if>
-		<if test="query != null and query != ''">query,</if>
-		<if test="isFrame != null and isFrame != ''">is_frame,</if>
-		<if test="isCache != null and isCache != ''">is_cache,</if>
-		<if test="menuType != null and menuType != ''">menu_type,</if>
-		<if test="visible != null">visible,</if>
-		<if test="status != null">status,</if>
-		<if test="perms !=null and perms != ''">perms,</if>
-		<if test="icon != null and icon != ''">icon,</if>
-		<if test="remark != null and remark != ''">remark,</if>
-		<if test="createBy != null and createBy != ''">create_by,</if>
-		create_time
-		)values(
-		<if test="menuId != null and menuId != 0">#{menuId},</if>
-		<if test="parentId != null and parentId != 0">#{parentId},</if>
-		<if test="menuName != null and menuName != ''">#{menuName},</if>
-		<if test="orderNum != null">#{orderNum},</if>
-		<if test="path != null and path != ''">#{path},</if>
-		<if test="component != null and component != ''">#{component},</if>
-		<if test="query != null and query != ''">#{query},</if>
-		<if test="isFrame != null and isFrame != ''">#{isFrame},</if>
-		<if test="isCache != null and isCache != ''">#{isCache},</if>
-		<if test="menuType != null and menuType != ''">#{menuType},</if>
-		<if test="visible != null">#{visible},</if>
-		<if test="status != null">#{status},</if>
-		<if test="perms !=null and perms != ''">#{perms},</if>
-		<if test="icon != null and icon != ''">#{icon},</if>
-		<if test="remark != null and remark != ''">#{remark},</if>
-		<if test="createBy != null and createBy != ''">#{createBy},</if>
-		sysdate()
-		)
-	</insert>
-	
-	<delete id="deleteMenuById" parameterType="Long">
-	    delete from PHM.SYS_MENU where menu_id = #{menuId}
-	</delete>
+        <if test="menuCheckStrictly">
+            and m.menu_id not in (select m.parent_id from PHM.SYS_MENU m inner join PHM.SYS_ROLE_MENU rm on m.menu_id =
+            rm.menu_id and rm.role_id = #{roleId})
+        </if>
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuPerms" resultType="String">
+        select distinct m.perms
+        from PHM.SYS_MENU m
+                 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+                 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+    </select>
+
+    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+        select distinct m.perms
+        from PHM.SYS_MENU m
+                 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+                 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+                 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
+        where m.status = '0'
+          and r.status = '0'
+          and ur.user_id = #{userId}
+    </select>
+
+    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
+        select distinct m.perms
+        from PHM.SYS_MENU m
+                 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+        where m.status = '0'
+          and rm.role_id = #{roleId}
+    </select>
+
+    <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
+        <include refid="selectMenuVo"/>
+        where menu_id = #{menuId}
+    </select>
+
+    <select id="hasChildByMenuId" resultType="Integer">
+        select count(1)
+        from PHM.SYS_MENU
+        where parent_id = #{menuId}
+    </select>
+
+    <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
+        <include refid="selectMenuVo"/>
+        where menu_name=#{menuName} and parent_id = #{parentId} limit 1
+    </select>
+
+    <update id="updateMenu" parameterType="SysMenu">
+        update PHM.SYS_MENU
+        <set>
+            <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="path != null and path != ''">path = #{path},</if>
+            <if test="component != null">component = #{component},</if>
+            <if test="query != null">`query` = #{query},</if>
+            <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
+            <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
+            <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
+            <if test="visible != null">visible = #{visible},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="perms !=null">perms = #{perms},</if>
+            <if test="icon !=null and icon != ''">icon = #{icon},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where menu_id = #{menuId}
+    </update>
+
+    <insert id="insertMenu" parameterType="SysMenu">
+        insert into PHM.SYS_MENU(
+        <if test="menuId != null and menuId != 0">menu_id,</if>
+        <if test="parentId != null and parentId != 0">parent_id,</if>
+        <if test="menuName != null and menuName != ''">menu_name,</if>
+        <if test="orderNum != null">order_num,</if>
+        <if test="path != null and path != ''">path,</if>
+        <if test="component != null and component != ''">component,</if>
+        <if test="query != null and query != ''">query,</if>
+        <if test="isFrame != null and isFrame != ''">is_frame,</if>
+        <if test="isCache != null and isCache != ''">is_cache,</if>
+        <if test="menuType != null and menuType != ''">menu_type,</if>
+        <if test="visible != null">visible,</if>
+        <if test="status != null">status,</if>
+        <if test="perms !=null and perms != ''">perms,</if>
+        <if test="icon != null and icon != ''">icon,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="menuId != null and menuId != 0">#{menuId},</if>
+        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        <if test="menuName != null and menuName != ''">#{menuName},</if>
+        <if test="orderNum != null">#{orderNum},</if>
+        <if test="path != null and path != ''">#{path},</if>
+        <if test="component != null and component != ''">#{component},</if>
+        <if test="query != null and query != ''">#{query},</if>
+        <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
+        <if test="isCache != null and isCache != ''">#{isCache},</if>
+        <if test="menuType != null and menuType != ''">#{menuType},</if>
+        <if test="visible != null">#{visible},</if>
+        <if test="status != null">#{status},</if>
+        <if test="perms !=null and perms != ''">#{perms},</if>
+        <if test="icon != null and icon != ''">#{icon},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
+    <delete id="deleteMenuById" parameterType="Long">
+        delete
+        from PHM.SYS_MENU
+        where menu_id = #{menuId}
+    </delete>
 
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -18,8 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectNoticeVo">
-        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
-		from PHM.SYS_NOTICE
+        select notice_id,
+               notice_title,
+               notice_type,
+               cast(notice_content as char) as notice_content,
+               status,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from PHM.SYS_NOTICE
     </sql>
     
     <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">

PHM-admin/phm-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -1,83 +1,103 @@
 <?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.phm.system.mapper.SysOperLogMapper">
 
-	<resultMap type="SysOperLog" id="SysOperLogResult">
-		<id     property="operId"         column="oper_id"        />
-		<result property="title"          column="title"          />
-		<result property="businessType"   column="business_type"  />
-		<result property="method"         column="method"         />
-		<result property="requestMethod"  column="request_method" />
-		<result property="operatorType"   column="operator_type"  />
-		<result property="operName"       column="oper_name"      />
-		<result property="deptName"       column="dept_name"      />
-		<result property="operUrl"        column="oper_url"       />
-		<result property="operIp"         column="oper_ip"        />
-		<result property="operLocation"   column="oper_location"  />
-		<result property="operParam"      column="oper_param"     />
-		<result property="jsonResult"     column="json_result"    />
-		<result property="status"         column="status"         />
-		<result property="errorMsg"       column="error_msg"      />
-		<result property="operTime"       column="oper_time"      />
-		<result property="costTime"       column="cost_time"      />
-	</resultMap>
+    <resultMap type="SysOperLog" id="SysOperLogResult">
+        <id property="operId" column="oper_id"/>
+        <result property="title" column="title"/>
+        <result property="businessType" column="business_type"/>
+        <result property="method" column="method"/>
+        <result property="requestMethod" column="request_method"/>
+        <result property="operatorType" column="operator_type"/>
+        <result property="operName" column="oper_name"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="operUrl" column="oper_url"/>
+        <result property="operIp" column="oper_ip"/>
+        <result property="operLocation" column="oper_location"/>
+        <result property="operParam" column="oper_param"/>
+        <result property="jsonResult" column="json_result"/>
+        <result property="status" column="status"/>
+        <result property="errorMsg" column="error_msg"/>
+        <result property="operTime" column="oper_time"/>
+        <result property="costTime" column="cost_time"/>
+    </resultMap>
 
-	<sql id="selectOperLogVo">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
+    <sql id="selectOperLogVo">
+        select oper_id,
+               title,
+               business_type,
+               method,
+               request_method,
+               operator_type,
+               oper_name,
+               dept_name,
+               oper_url,
+               oper_ip,
+               oper_location,
+               oper_param,
+               json_result,
+               status,
+               error_msg,
+               oper_time,
+               cost_time
         from PHM.SYS_OPER_LOG
     </sql>
-    
-	<insert id="insertOperlog" parameterType="SysOperLog">
-		insert into PHM.SYS_OPER_LOG(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
-	</insert>
-	
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		<where>
-			<if test="title != null and title != ''">
-				AND title like concat('%', #{title}, '%')
-			</if>
-			<if test="businessType != null">
-				AND business_type = #{businessType}
-			</if>
-			<if test="businessTypes != null and businessTypes.length > 0">
-			    AND business_type in
-			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
-		 			#{businessType}
-		        </foreach> 
-			</if>
-			<if test="status != null">
-				AND status = #{status}
-			</if>
-			<if test="operName != null and operName != ''">
-				AND oper_name like concat('%', #{operName}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND oper_time &gt;= #{params.beginTime}
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND oper_time &lt;= #{params.endTime}
-			</if>
-		</where>
-		order by oper_id desc
-	</select>
-	
-	<delete id="deleteOperLogByIds" parameterType="Long">
- 		delete from PHM.SYS_OPER_LOG where oper_id in
- 		<foreach collection="array" item="operId" open="(" separator="," close=")">
- 			#{operId}
-        </foreach> 
- 	</delete>
- 	
- 	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		where oper_id = #{operId}
-	</select>
-	
-	<update id="cleanOperLog">
+
+    <insert id="insertOperlog" parameterType="SysOperLog">
+        insert into PHM.SYS_OPER_LOG(title, business_type, method, request_method, operator_type, oper_name, dept_name,
+                                     oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg,
+                                     cost_time, oper_time)
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName},
+                #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg},
+                #{costTime}, sysdate())
+    </insert>
+
+    <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+        <include refid="selectOperLogVo"/>
+        <where>
+            <if test="title != null and title != ''">
+                AND title like concat('%', #{title}, '%')
+            </if>
+            <if test="businessType != null">
+                AND business_type = #{businessType}
+            </if>
+            <if test="businessTypes != null and businessTypes.length > 0">
+                AND business_type in
+                <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
+                    #{businessType}
+                </foreach>
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="operName != null and operName != ''">
+                AND oper_name like concat('%', #{operName}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND oper_time &gt;= #{params.beginTime}
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND oper_time &lt;= #{params.endTime}
+            </if>
+        </where>
+        order by oper_id desc
+    </select>
+
+    <delete id="deleteOperLogByIds" parameterType="Long">
+        delete from PHM.SYS_OPER_LOG where oper_id in
+        <foreach collection="array" item="operId" open="(" separator="," close=")">
+            #{operId}
+        </foreach>
+    </delete>
+
+    <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
+        <include refid="selectOperLogVo"/>
+        where oper_id = #{operId}
+    </select>
+
+    <update id="cleanOperLog">
         truncate table PHM.SYS_OPER_LOG
     </update>
 

PHM-admin/phm-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -1,122 +1,131 @@
 <?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.phm.system.mapper.SysPostMapper">
 
-	<resultMap type="SysPost" id="SysPostResult">
-		<id     property="postId"        column="post_id"       />
-		<result property="postCode"      column="post_code"     />
-		<result property="postName"      column="post_name"     />
-		<result property="postSort"      column="post_sort"     />
-		<result property="status"        column="status"        />
-		<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="selectPostVo">
-        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
-		from PHM.SYS_POST
+    <resultMap type="SysPost" id="SysPostResult">
+        <id property="postId" column="post_id"/>
+        <result property="postCode" column="post_code"/>
+        <result property="postName" column="post_name"/>
+        <result property="postSort" column="post_sort"/>
+        <result property="status" column="status"/>
+        <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="selectPostVo">
+        select post_id,
+               post_code,
+               post_name,
+               post_sort,
+               status,
+               create_by,
+               create_time,
+               remark
+        from PHM.SYS_POST
     </sql>
-	
-	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
-	    <include refid="selectPostVo"/>
-		<where>
-			<if test="postCode != null and postCode != ''">
-				AND post_code like concat('%', #{postCode}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="postName != null and postName != ''">
-				AND post_name like concat('%', #{postName}, '%')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectPostAll" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-	</select>
-	
-	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		where post_id = #{postId}
-	</select>
-	
-	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
-		select p.post_id
+
+    <select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
+        <include refid="selectPostVo"/>
+        <where>
+            <if test="postCode != null and postCode != ''">
+                AND post_code like concat('%', #{postCode}, '%')
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="postName != null and postName != ''">
+                AND post_name like concat('%', #{postName}, '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectPostAll" resultMap="SysPostResult">
+        <include refid="selectPostVo"/>
+    </select>
+
+    <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
+        <include refid="selectPostVo"/>
+        where post_id = #{postId}
+    </select>
+
+    <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
+        select p.post_id
+        from PHM.SYS_POST p
+                 left join sys_user_post up on up.post_id = p.post_id
+                 left join sys_user u on u.user_id = up.user_id
+        where u.user_id = #{userId}
+    </select>
+
+    <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
+        select p.post_id, p.post_name, p.post_code
         from PHM.SYS_POST p
-	        left join sys_user_post up on up.post_id = p.post_id
-	        left join sys_user u on u.user_id = up.user_id
-	    where u.user_id = #{userId}
-	</select>
-	
-	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
-		select p.post_id, p.post_name, p.post_code
-		from PHM.SYS_POST p
-			 left join sys_user_post up on up.post_id = p.post_id
-			 left join sys_user u on u.user_id = up.user_id
-		where u.user_name = #{userName}
-	</select>
-	
-	<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		 where post_name=#{postName} limit 1
-	</select>
-	
-	<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		 where post_code=#{postCode} limit 1
-	</select>
-	
-	<update id="updatePost" parameterType="SysPost">
- 		update PHM.SYS_POST
- 		<set>
- 			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
- 			<if test="postName != null and postName != ''">post_name = #{postName},</if>
- 			<if test="postSort != null">post_sort = #{postSort},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where post_id = #{postId}
-	</update>
- 	
- 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
- 		insert into PHM.SYS_POST(
- 			<if test="postId != null and postId != 0">post_id,</if>
- 			<if test="postCode != null and postCode != ''">post_code,</if>
- 			<if test="postName != null and postName != ''">post_name,</if>
- 			<if test="postSort != null">post_sort,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="postId != null and postId != 0">#{postId},</if>
- 			<if test="postCode != null and postCode != ''">#{postCode},</if>
- 			<if test="postName != null and postName != ''">#{postName},</if>
- 			<if test="postSort != null">#{postSort},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<delete id="deletePostById" parameterType="Long">
-		delete from PHM.SYS_POST where post_id = #{postId}
-	</delete>
-	
-	<delete id="deletePostByIds" parameterType="Long">
- 		delete from PHM.SYS_POST where post_id in
- 		<foreach collection="array" item="postId" open="(" separator="," close=")">
- 			#{postId}
-        </foreach> 
- 	</delete>
+                 left join sys_user_post up on up.post_id = p.post_id
+                 left join sys_user u on u.user_id = up.user_id
+        where u.user_name = #{userName}
+    </select>
+
+    <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
+        <include refid="selectPostVo"/>
+        where post_name=#{postName} limit 1
+    </select>
+
+    <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
+        <include refid="selectPostVo"/>
+        where post_code=#{postCode} limit 1
+    </select>
+
+    <update id="updatePost" parameterType="SysPost">
+        update PHM.SYS_POST
+        <set>
+            <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
+            <if test="postName != null and postName != ''">post_name = #{postName},</if>
+            <if test="postSort != null">post_sort = #{postSort},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where post_id = #{postId}
+    </update>
+
+    <insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+        insert into PHM.SYS_POST(
+        <if test="postId != null and postId != 0">post_id,</if>
+        <if test="postCode != null and postCode != ''">post_code,</if>
+        <if test="postName != null and postName != ''">post_name,</if>
+        <if test="postSort != null">post_sort,</if>
+        <if test="status != null and status != ''">status,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="postId != null and postId != 0">#{postId},</if>
+        <if test="postCode != null and postCode != ''">#{postCode},</if>
+        <if test="postName != null and postName != ''">#{postName},</if>
+        <if test="postSort != null">#{postSort},</if>
+        <if test="status != null and status != ''">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
+    <delete id="deletePostById" parameterType="Long">
+        delete
+        from PHM.SYS_POST
+        where post_id = #{postId}
+    </delete>
+
+    <delete id="deletePostByIds" parameterType="Long">
+        delete from PHM.SYS_POST where post_id in
+        <foreach collection="array" item="postId" open="(" separator="," close=")">
+            #{postId}
+        </foreach>
+    </delete>
 
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -1,34 +1,38 @@
 <?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.phm.system.mapper.SysRoleDeptMapper">
 
-	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
-		<result property="roleId"     column="role_id"      />
-		<result property="deptId"     column="dept_id"      />
-	</resultMap>
+    <resultMap type="SysRoleDept" id="SysRoleDeptResult">
+        <result property="roleId" column="role_id"/>
+        <result property="deptId" column="dept_id"/>
+    </resultMap>
+
+    <delete id="deleteRoleDeptByRoleId" parameterType="Long">
+        delete
+        from PHM.SYS_ROLE_DEPT
+        where role_id = #{roleId}
+    </delete>
+
+    <select id="selectCountRoleDeptByDeptId" resultType="Integer">
+        select count(1)
+        from PHM.SYS_ROLE_DEPT
+        where dept_id = #{deptId}
+    </select>
+
+    <delete id="deleteRoleDept" parameterType="Long">
+        delete from PHM.SYS_ROLE_DEPT where role_id in
+        <foreach collection="array" item="roleId" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </delete>
+
+    <insert id="batchRoleDept">
+        insert into PHM.SYS_ROLE_DEPT(role_id, dept_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.roleId},#{item.deptId})
+        </foreach>
+    </insert>
 
-	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
-		delete from PHM.SYS_ROLE_DEPT where role_id=#{roleId}
-	</delete>
-	
-	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
-	    select count(1) from PHM.SYS_ROLE_DEPT where dept_id=#{deptId}
-	</select>
-	
-	<delete id="deleteRoleDept" parameterType="Long">
- 		delete from PHM.SYS_ROLE_DEPT where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchRoleDept">
-		insert into PHM.SYS_ROLE_DEPT(role_id, dept_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.deptId})
-		</foreach>
-	</insert>
-	
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -1,152 +1,163 @@
 <?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.phm.system.mapper.SysRoleMapper">
 
-	<resultMap type="SysRole" id="SysRoleResult">
-		<id     property="roleId"             column="role_id"               />
-		<result property="roleName"           column="role_name"             />
-		<result property="roleKey"            column="role_key"              />
-		<result property="roleSort"           column="role_sort"             />
-		<result property="dataScope"          column="data_scope"            />
-		<result property="menuCheckStrictly"  column="menu_check_strictly"   />
-		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
-		<result property="status"             column="status"                />
-		<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="remark"             column="remark"                />
-	</resultMap>
-	
-	<sql id="selectRoleVo">
-	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark 
+    <resultMap type="SysRole" id="SysRoleResult">
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="dataScope" column="data_scope"/>
+        <result property="menuCheckStrictly" column="menu_check_strictly"/>
+        <result property="deptCheckStrictly" column="dept_check_strictly"/>
+        <result property="status" column="status"/>
+        <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="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectRoleVo">
+        select distinct r.role_id,
+                        r.role_name,
+                        r.role_key,
+                        r.role_sort,
+                        r.data_scope,
+                        r.menu_check_strictly,
+                        r.dept_check_strictly,
+                        r.status,
+                        r.del_flag,
+                        r.create_time,
+                        r.remark
         from PHM.SYS_ROLE r
-	        left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
+                 left join PHM.SYS_USER_ROLE ur on ur.role_id = r.role_id
+                 left join PHM.SYS_USER u on u.user_id = ur.user_id
+                 left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
     </sql>
-    
+
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		where r.del_flag = '0'
-		<if test="roleId != null and roleId != 0">
-			AND r.role_id = #{roleId}
-		</if>
-		<if test="roleName != null and roleName != ''">
-			AND r.role_name like concat('%', #{roleName}, '%')
-		</if>
-		<if test="status != null and status != ''">
-			AND r.status = #{status}
-		</if>
-		<if test="roleKey != null and roleKey != ''">
-			AND r.role_key like concat('%', #{roleKey}, '%')
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-		order by r.role_sort
-	</select>
-    
-	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and ur.user_id = #{userId}
-	</select>
-	
-	<select id="selectRoleAll" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-	</select>
-	
-	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
-		select r.role_id
+        <include refid="selectRoleVo"/>
+        where r.del_flag = '0'
+        <if test="roleId != null and roleId != 0">
+            AND r.role_id = #{roleId}
+        </if>
+        <if test="roleName != null and roleName != ''">
+            AND r.role_name like concat('%', #{roleName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND r.status = #{status}
+        </if>
+        <if test="roleKey != null and roleKey != ''">
+            AND r.role_key like concat('%', #{roleKey}, '%')
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by r.role_sort
+    </select>
+
+    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        WHERE r.del_flag = '0' and ur.user_id = #{userId}
+    </select>
+
+    <select id="selectRoleAll" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+    </select>
+
+    <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
+        select r.role_id
         from PHM.SYS_ROLE r
-	        left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
-	    where u.user_id = #{userId}
-	</select>
-	
-	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		where r.role_id = #{roleId}
-	</select>
-	
-	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and u.user_name = #{userName}
-	</select>
-	
-	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		 where r.role_name=#{roleName} and r.del_flag = '0' limit 1
-	</select>
-	
-	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
-	</select>
-	
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
- 		insert into PHM.SYS_ROLE(
- 			<if test="roleId != null and roleId != 0">role_id,</if>
- 			<if test="roleName != null and roleName != ''">role_name,</if>
- 			<if test="roleKey != null and roleKey != ''">role_key,</if>
- 			<if test="roleSort != null">role_sort,</if>
- 			<if test="dataScope != null and dataScope != ''">data_scope,</if>
- 			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
- 			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="roleId != null and roleId != 0">#{roleId},</if>
- 			<if test="roleName != null and roleName != ''">#{roleName},</if>
- 			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- 			<if test="roleSort != null">#{roleSort},</if>
- 			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
- 			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
- 			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<update id="updateRole" parameterType="SysRole">
- 		update PHM.SYS_ROLE
- 		<set>
- 			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
- 			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- 			<if test="roleSort != null">role_sort = #{roleSort},</if>
- 			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
- 			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
- 			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where role_id = #{roleId}
-	</update>
-	
-	<delete id="deleteRoleById" parameterType="Long">
- 		update PHM.SYS_ROLE set del_flag = '2' where role_id = #{roleId}
- 	</delete>
- 	
- 	<delete id="deleteRoleByIds" parameterType="Long">
- 	    update PHM.SYS_ROLE set del_flag = '2' where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
-        </foreach> 
- 	</delete>
- 	
+                 left join PHM.SYS_USER_ROLE ur on ur.role_id = r.role_id
+                 left join PHM.SYS_USER u on u.user_id = ur.user_id
+        where u.user_id = #{userId}
+    </select>
+
+    <select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        where r.role_id = #{roleId}
+    </select>
+
+    <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        WHERE r.del_flag = '0' and u.user_name = #{userName}
+    </select>
+
+    <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        where r.role_name=#{roleName} and r.del_flag = '0' limit 1
+    </select>
+
+    <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
+    </select>
+
+    <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+        insert into PHM.SYS_ROLE(
+        <if test="roleId != null and roleId != 0">role_id,</if>
+        <if test="roleName != null and roleName != ''">role_name,</if>
+        <if test="roleKey != null and roleKey != ''">role_key,</if>
+        <if test="roleSort != null">role_sort,</if>
+        <if test="dataScope != null and dataScope != ''">data_scope,</if>
+        <if test="menuCheckStrictly != null">menu_check_strictly,</if>
+        <if test="deptCheckStrictly != null">dept_check_strictly,</if>
+        <if test="status != null and status != ''">status,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="roleId != null and roleId != 0">#{roleId},</if>
+        <if test="roleName != null and roleName != ''">#{roleName},</if>
+        <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
+        <if test="roleSort != null">#{roleSort},</if>
+        <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
+        <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
+        <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
+        <if test="status != null and status != ''">#{status},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
+    <update id="updateRole" parameterType="SysRole">
+        update PHM.SYS_ROLE
+        <set>
+            <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
+            <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
+            <if test="roleSort != null">role_sort = #{roleSort},</if>
+            <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
+            <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
+            <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where role_id = #{roleId}
+    </update>
+
+    <delete id="deleteRoleById" parameterType="Long">
+        update PHM.SYS_ROLE
+        set del_flag = '2'
+        where role_id = #{roleId}
+    </delete>
+
+    <delete id="deleteRoleByIds" parameterType="Long">
+        update PHM.SYS_ROLE set del_flag = '2' where role_id in
+        <foreach collection="array" item="roleId" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </delete>
+
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -1,34 +1,38 @@
 <?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.phm.system.mapper.SysRoleMenuMapper">
 
-	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
-		<result property="roleId"     column="role_id"      />
-		<result property="menuId"     column="menu_id"      />
-	</resultMap>
-	
-	<select id="checkMenuExistRole" resultType="Integer">
-	    select count(1) from PHM.SYS_ROLE_MENU where menu_id = #{menuId}
-	</select>
+    <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
+        <result property="roleId" column="role_id"/>
+        <result property="menuId" column="menu_id"/>
+    </resultMap>
+
+    <select id="checkMenuExistRole" resultType="Integer">
+        select count(1)
+        from PHM.SYS_ROLE_MENU
+        where menu_id = #{menuId}
+    </select>
+
+    <delete id="deleteRoleMenuByRoleId" parameterType="Long">
+        delete
+        from PHM.SYS_ROLE_MENU
+        where role_id = #{roleId}
+    </delete>
+
+    <delete id="deleteRoleMenu" parameterType="Long">
+        delete from PHM.SYS_ROLE_MENU where role_id in
+        <foreach collection="array" item="roleId" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </delete>
+
+    <insert id="batchRoleMenu">
+        insert into PHM.SYS_ROLE_MENU(role_id, menu_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.roleId},#{item.menuId})
+        </foreach>
+    </insert>
 
-	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
-		delete from PHM.SYS_ROLE_MENU where role_id=#{roleId}
-	</delete>
-	
-	<delete id="deleteRoleMenu" parameterType="Long">
- 		delete from PHM.SYS_ROLE_MENU where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchRoleMenu">
-		insert into PHM.SYS_ROLE_MENU(role_id, menu_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.menuId})
-		</foreach>
-	</insert>
-	
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1,221 +1,271 @@
 <?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.phm.system.mapper.SysUserMapper">
 
     <resultMap type="SysUser" id="SysUserResult">
-        <id     property="userId"       column="user_id"      />
-        <result property="deptId"       column="dept_id"      />
-        <result property="userName"     column="user_name"    />
-        <result property="nickName"     column="nick_name"    />
-        <result property="email"        column="email"        />
-        <result property="phonenumber"  column="phonenumber"  />
-        <result property="sex"          column="sex"          />
-        <result property="avatar"       column="avatar"       />
-        <result property="password"     column="password"     />
-        <result property="status"       column="status"       />
-        <result property="delFlag"      column="del_flag"     />
-        <result property="loginIp"      column="login_ip"     />
-        <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"       />
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
-        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
+        <id property="userId" column="user_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="email" column="email"/>
+        <result property="phonenumber" column="phonenumber"/>
+        <result property="sex" column="sex"/>
+        <result property="avatar" column="avatar"/>
+        <result property="password" column="password"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="loginIp" column="login_ip"/>
+        <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"/>
+        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
+        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
-        <id     property="deptId"    column="dept_id"     />
-        <result property="parentId"  column="parent_id"   />
-        <result property="deptName"  column="dept_name"   />
-        <result property="ancestors" column="ancestors"   />
-        <result property="orderNum"  column="order_num"   />
-        <result property="leader"    column="leader"      />
-        <result property="status"    column="dept_status" />
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="status" column="dept_status"/>
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
-        <id     property="roleId"       column="role_id"        />
-        <result property="roleName"     column="role_name"      />
-        <result property="roleKey"      column="role_key"       />
-        <result property="roleSort"     column="role_sort"      />
-        <result property="dataScope"     column="data_scope"    />
-        <result property="status"       column="role_status"    />
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="dataScope" column="data_scope"/>
+        <result property="status" column="role_status"/>
     </resultMap>
-	
-	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+
+    <sql id="selectUserVo">
+        select u.user_id,
+               u.dept_id,
+               u.user_name,
+               u.nick_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.password,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.status as dept_status,
+               r.role_id,
+               r.role_name,
+               r.role_key,
+               r.role_sort,
+               r.data_scope,
+               r.status as role_status
         from PHM.SYS_USER u
-		    left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
-		    left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
-		    left join PHM.SYS_ROLE r on r.role_id = ur.role_id
+                 left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+                 left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
+                 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from PHM.SYS_USER u
-		left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
-		<if test="userId != null and userId != 0">
-			AND u.user_id = #{userId}
-		</if>
-		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="status != null and status != ''">
-			AND u.status = #{status}
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-		</if>
-		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM PHM.SYS_DEPT t WHERE instr(','||ancestors||',' ,  ','|| #{deptId} ||',')  ))
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-	</select>
-	
-	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-	    from PHM.SYS_USER u
-			 left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
-			 left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
-			 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
-	    where u.del_flag = '0' and r.role_id = #{roleId}
-	    <if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-	</select>
-	
-	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-	    from PHM.SYS_USER u
-			 left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
-			 left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
-			 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
-	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
-	    and u.user_id not in (select u.user_id from PHM.SYS_USER u inner join PHM.SYS_USER_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
-	    <if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
-		</if>
-		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-	</select>
-	
-	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
-	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
-	</select>
-	
-	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
-		where u.user_id = #{userId}
-	</select>
-	
-	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, user_name from PHM.SYS_USER where user_name = #{userName} and del_flag = '0' limit 1
-	</select>
-	
-	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from PHM.SYS_USER where phonenumber = #{phonenumber} and del_flag = '0' limit 1
-	</select>
-	
-	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from PHM.SYS_USER where email = #{email} and del_flag = '0' limit 1
-	</select>
-	
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
- 		insert into PHM.SYS_USER(
- 			<if test="userId != null and userId != 0">user_id,</if>
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
- 			<if test="userName != null and userName != ''">user_name,</if>
- 			<if test="nickName != null and nickName != ''">nick_name,</if>
- 			<if test="email != null and email != ''">email,</if>
- 			<if test="avatar != null and avatar != ''">avatar,</if>
- 			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- 			<if test="sex != null and sex != ''">sex,</if>
- 			<if test="password != null and password != ''">password,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			create_time
- 		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
- 			<if test="deptId != null and deptId != ''">#{deptId},</if>
- 			<if test="userName != null and userName != ''">#{userName},</if>
- 			<if test="nickName != null and nickName != ''">#{nickName},</if>
- 			<if test="email != null and email != ''">#{email},</if>
- 			<if test="avatar != null and avatar != ''">#{avatar},</if>
- 			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- 			<if test="sex != null and sex != ''">#{sex},</if>
- 			<if test="password != null and password != ''">#{password},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<update id="updateUser" parameterType="SysUser">
- 		update PHM.SYS_USER
- 		<set>
- 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
- 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- 			<if test="email != null ">email = #{email},</if>
- 			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
- 			<if test="sex != null and sex != ''">sex = #{sex},</if>
- 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- 			<if test="password != null and password != ''">password = #{password},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- 			<if test="loginDate != null">login_date = #{loginDate},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
- 		</set>
- 		where user_id = #{userId}
-	</update>
-	
-	<update id="updateUserStatus" parameterType="SysUser">
- 		update PHM.SYS_USER set status = #{status} where user_id = #{userId}
-	</update>
-	
-	<update id="updateUserAvatar" parameterType="SysUser">
- 		update PHM.SYS_USER set avatar = #{avatar} where user_name = #{userName}
-	</update>
-	
-	<update id="resetUserPwd" parameterType="SysUser">
- 		update PHM.SYS_USER set password = #{password} where user_name = #{userName}
-	</update>
-	
-	<delete id="deleteUserById" parameterType="Long">
- 		update PHM.SYS_USER set del_flag = '2' where user_id = #{userId}
- 	</delete>
- 	
- 	<delete id="deleteUserByIds" parameterType="Long">
- 		update PHM.SYS_USER set del_flag = '2' where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
+        PHM.SYS_USER u
+        left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+        where u.del_flag = '0'
+        <if test="userId != null and userId != 0">
+            AND u.user_id = #{userId}
+        </if>
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND u.status = #{status}
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+        <if test="deptId != null and deptId != 0">
+            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM PHM.SYS_DEPT t WHERE
+            instr(','||ancestors||',' , ','|| #{deptId} ||',') ))
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        from PHM.SYS_USER u
+        left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+        left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
+        left join PHM.SYS_ROLE r on r.role_id = ur.role_id
+        where u.del_flag = '0' and r.role_id = #{roleId}
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        from PHM.SYS_USER u
+        left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+        left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
+        left join PHM.SYS_ROLE r on r.role_id = ur.role_id
+        where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+        and u.user_id not in (select u.user_id from PHM.SYS_USER u inner join PHM.SYS_USER_role ur on u.user_id =
+        ur.user_id and ur.role_id = #{roleId})
+        <if test="userName != null and userName != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
+        </if>
+        <if test="phonenumber != null and phonenumber != ''">
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.user_name = #{userName} and u.del_flag = '0'
+    </select>
+
+    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.user_id = #{userId}
+    </select>
+
+    <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
+        select user_id, user_name
+        from PHM.SYS_USER
+        where user_name = #{userName}
+          and del_flag = '0'
+        limit 1
+    </select>
+
+    <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
+        select user_id, phonenumber
+        from PHM.SYS_USER
+        where phonenumber = #{phonenumber}
+          and del_flag = '0'
+        limit 1
+    </select>
+
+    <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
+        select user_id, email
+        from PHM.SYS_USER
+        where email = #{email}
+          and del_flag = '0'
+        limit 1
+    </select>
+
+    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+        insert into PHM.SYS_USER(
+        <if test="userId != null and userId != 0">user_id,</if>
+        <if test="deptId != null and deptId != 0">dept_id,</if>
+        <if test="userName != null and userName != ''">user_name,</if>
+        <if test="nickName != null and nickName != ''">nick_name,</if>
+        <if test="email != null and email != ''">email,</if>
+        <if test="avatar != null and avatar != ''">avatar,</if>
+        <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
+        <if test="sex != null and sex != ''">sex,</if>
+        <if test="password != null and password != ''">password,</if>
+        <if test="status != null and status != ''">status,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        create_time
+        )values(
+        <if test="userId != null and userId != ''">#{userId},</if>
+        <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="userName != null and userName != ''">#{userName},</if>
+        <if test="nickName != null and nickName != ''">#{nickName},</if>
+        <if test="email != null and email != ''">#{email},</if>
+        <if test="avatar != null and avatar != ''">#{avatar},</if>
+        <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
+        <if test="sex != null and sex != ''">#{sex},</if>
+        <if test="password != null and password != ''">#{password},</if>
+        <if test="status != null and status != ''">#{status},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        sysdate()
+        )
+    </insert>
+
+    <update id="updateUser" parameterType="SysUser">
+        update PHM.SYS_USER
+        <set>
+            <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+            <if test="email != null ">email = #{email},</if>
+            <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
+            <if test="sex != null and sex != ''">sex = #{sex},</if>
+            <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+            <if test="password != null and password != ''">password = #{password},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
+            <if test="loginDate != null">login_date = #{loginDate},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </set>
+        where user_id = #{userId}
+    </update>
+
+    <update id="updateUserStatus" parameterType="SysUser">
+        update PHM.SYS_USER
+        set status = #{status}
+        where user_id = #{userId}
+    </update>
+
+    <update id="updateUserAvatar" parameterType="SysUser">
+        update PHM.SYS_USER
+        set avatar = #{avatar}
+        where user_name = #{userName}
+    </update>
+
+    <update id="resetUserPwd" parameterType="SysUser">
+        update PHM.SYS_USER
+        set password = #{password}
+        where user_name = #{userName}
+    </update>
+
+    <delete id="deleteUserById" parameterType="Long">
+        update PHM.SYS_USER
+        set del_flag = '2'
+        where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteUserByIds" parameterType="Long">
+        update PHM.SYS_USER set del_flag = '2' where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -1,34 +1,38 @@
 <?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.phm.system.mapper.SysUserPostMapper">
 
-	<resultMap type="SysUserPost" id="SysUserPostResult">
-		<result property="userId"     column="user_id"      />
-		<result property="postId"     column="post_id"      />
-	</resultMap>
+    <resultMap type="SysUserPost" id="SysUserPostResult">
+        <result property="userId" column="user_id"/>
+        <result property="postId" column="post_id"/>
+    </resultMap>
+
+    <delete id="deleteUserPostByUserId" parameterType="Long">
+        delete
+        from PHM.SYS_USER_POST
+        where user_id = #{userId}
+    </delete>
+
+    <select id="countUserPostById" resultType="Integer">
+        select count(1)
+        from PHM.SYS_USER_POST
+        where post_id = #{postId}
+    </select>
+
+    <delete id="deleteUserPost" parameterType="Long">
+        delete from PHM.SYS_USER_POST where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <insert id="batchUserPost">
+        insert into PHM.SYS_USER_POST(user_id, post_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId},#{item.postId})
+        </foreach>
+    </insert>
 
-	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from PHM.SYS_USER_POST where user_id=#{userId}
-	</delete>
-	
-	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from PHM.SYS_USER_POST where post_id=#{postId}  
-	</select>
-	
-	<delete id="deleteUserPost" parameterType="Long">
- 		delete from PHM.SYS_USER_POST where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserPost">
-		insert into PHM.SYS_USER_POST(user_id, post_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.postId})
-		</foreach>
-	</insert>
-	
 </mapper> 

PHM-admin/phm-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -10,7 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
-		delete from PHM.SYS_USER_ROLE where user_id=#{userId}
+		delete
+		from PHM.SYS_USER_ROLE
+		where user_id = #{userId}
 	</delete>
 	
 	<select id="countUserRoleByRoleId" resultType="Integer">