Преглед на файлове

feat(check): 添加设备类型名称字段到检查任务映射

- 在 CheckJobMapper.xml 中添加 requirement_sb_type_name 字段映射
- 新增 sbtype 表关联查询以获取设备类型名称
- 在多个查询语句中添加设备类型名称字段支持
- 更新 resultMap 配置以包含新的设备类型名称属性
dazhaxie преди 12 часа
родител
ревизия
a82e604629
променени са 1 файла, в които са добавени 9 реда и са изтрити 0 реда
  1. 9 0
      platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

+ 9 - 0
platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -71,6 +71,7 @@
             <result column="requirement_check_item" property="checkItem" />
             <result column="requirement_content" property="content" />
             <result column="requirement_period" property="period" />
+            <result column="requirement_sb_type_name" property="sbTypeName" />
         </collection>
     </resultMap>
     <sql id="Base_Column_List">
@@ -530,6 +531,7 @@
         cr.check_item as requirement_check_item,
         cr.content as requirement_content,
         cr.period as requirement_period,
+        sbtype.name as requirement_sb_type_name,
         cr.remark as requirement_remark,
         cr.created_user_name as requirement_created_user_name,
         cr.created_time as requirement_created_time,
@@ -545,6 +547,7 @@
         left join t_sb_position position on position.id = sbinfo.position_id
         left join t_check_standard_requirement csr on csr.standard_id = standard.id
         left join t_check_requirement cr on cr.id = csr.requirement_id
+        left join t_sb_type sbtype on sbtype.id = cr.sb_type
         WHERE checkjob.id IN (
             SELECT job_id FROM (
                 SELECT checkjob_inner.id as job_id
@@ -635,6 +638,7 @@
         cr.check_item as requirement_check_item,
         cr.content as requirement_content,
         cr.period as requirement_period,
+        sbtype.name as requirement_sb_type_name,
         cr.remark as requirement_remark,
         cr.created_user_name as requirement_created_user_name,
         cr.created_time as requirement_created_time,
@@ -651,6 +655,7 @@
         <!-- 关联保养要求表 -->
         left join t_check_standard_requirement csr on csr.standard_id = standard.id
         left join t_check_requirement cr on cr.id = csr.requirement_id and cr.status = 1
+        left join t_sb_type sbtype on sbtype.id = cr.sb_type
         <where>
             <include refid="List_Condition"/>
         </where>
@@ -929,6 +934,7 @@
         cr.check_item as requirement_check_item,
         cr.content as requirement_content,
         cr.period as requirement_period,
+        sbtype.name as requirement_sb_type_name,
         cr.remark as requirement_remark,
         cr.created_user_name as requirement_created_user_name,
         cr.created_time as requirement_created_time,
@@ -944,6 +950,7 @@
         left join t_sb_position position on position.id = sbinfo.position_id
         left join t_check_standard_requirement csr on csr.standard_id = standard.id
         left join t_check_requirement cr on cr.id = csr.requirement_id
+        left join t_sb_type sbtype on sbtype.id = cr.sb_type
         WHERE checkjob.id IN
         <foreach item="item" index="index" collection="jobIdList" open="(" close=")" separator=",">
             #{item}
@@ -1019,6 +1026,7 @@
         cr.check_item as requirement_check_item,
         cr.content as requirement_content,
         cr.period as requirement_period,
+        sbtype.name as requirement_sb_type_name,
         cr.remark as requirement_remark,
         cr.created_user_name as requirement_created_user_name,
         cr.created_time as requirement_created_time,
@@ -1034,6 +1042,7 @@
         left join t_sb_position position on position.id = sbinfo.position_id
         left join t_check_standard_requirement csr on csr.standard_id = standard.id
         left join t_check_requirement cr on cr.id = csr.requirement_id and cr.status = 1
+        left join t_sb_type sbtype on sbtype.id = cr.sb_type
         WHERE checkjob.id IN
         <foreach item="item" index="index" collection="jobIdList" open="(" close=")" separator=",">
             #{item}