-修改user表查询

master/src/main/resources/mybatis/base/TBaseDeviceMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTBaseDeviceList" parameterType="TBaseDevice" resultMap="TBaseDeviceResult">
-        select d.dev_id, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_code, d.dev_describe, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, d.updater_code,su.user_name updater, d.updatedate,d.material,d.material_status,d.response_factor,d.response_factor_from from t_base_device d
+        select d.dev_id, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_code, d.dev_describe, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, d.updater_code,su.nick_name updater, d.updatedate,d.material,d.material_status,d.response_factor,d.response_factor_from from t_base_device d
         left join sys_user su on su.user_id = d.updater_code
         left join t_base_plant bp on bp.plant_id = d.plant_id
         left join t_base_region br on br.region_id = d.region_id

master/src/main/resources/mybatis/base/TBasePlantMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTBasePlantList" parameterType="TBasePlant" resultMap="TBasePlantResult">
-        select d.company,d.plant_id, d.plant_code, d.plant_name, d.pro_ability, d.plant_type, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_plant d
+        select d.company,d.plant_id, d.plant_code, d.plant_name, d.pro_ability, d.plant_type, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.nick_name updater, d.updatedate from t_base_plant d
         left join sys_user su on su.user_id = d.updater_code
         <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>

master/src/main/resources/mybatis/base/TBasePointMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTBasePointList" parameterType="TBasePoint" resultMap="TBasePointResult">
-        select d.point_id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_point d
+        select d.point_id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.nick_name updater, d.updatedate from t_base_point d
         left join sys_user su on su.user_id = d.updater_code
         left join t_base_plant bp on bp.plant_id = d.plant_id
         left join t_base_region br on br.region_id = d.region_id
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTBasePointListByPlan" parameterType="TBasePoint" resultMap="TBasePointResult">
-    select d.point_id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate
+    select d.point_id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.nick_name updater, d.updatedate
     from t_base_point d
              left join sys_user su on su.user_id = d.updater_code
              left join t_base_plant bp on bp.plant_id = d.plant_id
@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTBasePointListNotInPlan" parameterType="TBasePoint" resultMap="TBasePointResult">
-        select d.point_id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate
+        select d.point_id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.nick_name updater, d.updatedate
         from t_base_point d
                  left join sys_user su on su.user_id = d.updater_code
                  left join t_base_plant bp on bp.plant_id = d.plant_id

master/src/main/resources/mybatis/base/TBaseRegionMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectTBaseRegionList" parameterType="TBaseRegion" resultMap="TBaseRegionResult">
-        select d.region_id, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code,su.user_name updater, d.region_code, d.region_name, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate from t_base_region d
+        select d.region_id, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code,su.nick_name updater, d.region_code, d.region_name, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate from t_base_region d
         left join sys_user su on su.user_id = d.updater_code
         left join t_base_plant bp on bp.plant_id = d.plant_id
         <where>

master/src/main/resources/mybatis/check/TCheckEnvironmentMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTCheckEnvironmentList" parameterType="TCheckEnvironment" resultMap="TCheckEnvironmentResult">
-        select d.*,su.user_name updater,bp.plant_code plantCode,bp.plant_name plantName,ci.model instrumentModel,ci.code instrumentCode from t_check_environment d
+        select d.*,su.nick_name updater,bp.plant_code plantCode,bp.plant_name plantName,ci.model instrumentModel,ci.code instrumentCode from t_check_environment d
         left join sys_user su on su.user_id=d.updater_code
         left join t_base_plant bp on bp.plant_id =d.plant_id
         left join t_check_instrument ci on ci.id=d.instrument_id
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTCheckEnvironmentListByYear" parameterType="TCheckEnvironment" resultMap="TCheckEnvironmentResult">
-        select d.*,su.user_name updater,bp.plant_code plantCode,bp.plant_name plantName,ci.model instrumentModel,ci.code instrumentCode from t_check_environment d
+        select d.*,su.nick_name updater,bp.plant_code plantCode,bp.plant_name plantName,ci.model instrumentModel,ci.code instrumentCode from t_check_environment d
         left join sys_user su on su.user_id=d.updater_code
         left join t_base_plant bp on bp.plant_id =d.plant_id
         left join t_check_instrument ci on ci.id=d.instrument_id

master/src/main/resources/mybatis/check/TCheckInstrumentMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTCheckInstrumentList" parameterType="TCheckInstrument" resultMap="TCheckInstrumentResult">
-        select d.*,su.user_name updater from t_check_instrument d
+        select d.*,su.nick_name updater from t_check_instrument d
         left join sys_user su on su.user_id=d.updater_code
         <where>
             <if test="code != null  and code != ''"> and d.`code` = #{code}</if>

master/src/main/resources/mybatis/check/TCheckLawitemsMapper.xml

@@ -42,7 +42,7 @@
                d.createdate,
                d.updater_code,
                d.updatedate,
-               su.user_name updater
+               su.nick_name updater
         from t_check_lawitems d
         left join sys_user su on su.user_id=d.updater_code
     </sql>

master/src/main/resources/mybatis/check/TCheckLawsMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTCheckLawsList" parameterType="TCheckLaws" resultMap="TCheckLawsResult">
-        select id, code, name, type, d.status, starttime, remarks, d.dept_id, d.del_flag, creater_code, createdate, updater_code , updatedate,su.user_name updater from t_check_laws d
+        select id, code, name, type, d.status, starttime, remarks, d.dept_id, d.del_flag, creater_code, createdate, updater_code , updatedate,su.nick_name updater from t_check_laws d
         left join sys_user su on su.user_id=d.updater_code
         <where>
             <if test="code != null  and code != ''"> and code = #{code}</if>

master/src/main/resources/mybatis/check/TCheckStandardgasesMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTCheckStandardgasesList" parameterType="TCheckStandardgases" resultMap="TCheckStandardgasesResult">
-        select d.*,su.user_name from t_check_standardgases d
+        select d.*,su.nick_name from t_check_standardgases d
         left join sys_user su on su.user_id=d.updater_code
         <where>
             <if test="code != null  and code != ''"> and code = #{code}</if>

master/src/main/resources/mybatis/task/TTaskInspectionPlanMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTTaskInspectionPlanList" parameterType="TTaskInspectionPlan" resultMap="TTaskInspectionPlanResult">
-        select d.*,bp.plant_name,su.user_name creater from t_task_inspection_plan d
+        select d.*,bp.plant_name,su.nick_name creater from t_task_inspection_plan d
         left join t_base_plant bp on bp.plant_id=d.plant_id
         left join sys_user su on su.user_id=d.creater_code
         <where>