|
@@ -71,6 +71,7 @@
|
|
|
<result column="requirement_check_item" property="checkItem" />
|
|
<result column="requirement_check_item" property="checkItem" />
|
|
|
<result column="requirement_content" property="content" />
|
|
<result column="requirement_content" property="content" />
|
|
|
<result column="requirement_period" property="period" />
|
|
<result column="requirement_period" property="period" />
|
|
|
|
|
+ <result column="requirement_sb_type_name" property="sbTypeName" />
|
|
|
</collection>
|
|
</collection>
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
<sql id="Base_Column_List">
|
|
@@ -530,6 +531,7 @@
|
|
|
cr.check_item as requirement_check_item,
|
|
cr.check_item as requirement_check_item,
|
|
|
cr.content as requirement_content,
|
|
cr.content as requirement_content,
|
|
|
cr.period as requirement_period,
|
|
cr.period as requirement_period,
|
|
|
|
|
+ sbtype.name as requirement_sb_type_name,
|
|
|
cr.remark as requirement_remark,
|
|
cr.remark as requirement_remark,
|
|
|
cr.created_user_name as requirement_created_user_name,
|
|
cr.created_user_name as requirement_created_user_name,
|
|
|
cr.created_time as requirement_created_time,
|
|
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_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_standard_requirement csr on csr.standard_id = standard.id
|
|
|
left join t_check_requirement cr on cr.id = csr.requirement_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 (
|
|
WHERE checkjob.id IN (
|
|
|
SELECT job_id FROM (
|
|
SELECT job_id FROM (
|
|
|
SELECT checkjob_inner.id as job_id
|
|
SELECT checkjob_inner.id as job_id
|
|
@@ -635,6 +638,7 @@
|
|
|
cr.check_item as requirement_check_item,
|
|
cr.check_item as requirement_check_item,
|
|
|
cr.content as requirement_content,
|
|
cr.content as requirement_content,
|
|
|
cr.period as requirement_period,
|
|
cr.period as requirement_period,
|
|
|
|
|
+ sbtype.name as requirement_sb_type_name,
|
|
|
cr.remark as requirement_remark,
|
|
cr.remark as requirement_remark,
|
|
|
cr.created_user_name as requirement_created_user_name,
|
|
cr.created_user_name as requirement_created_user_name,
|
|
|
cr.created_time as requirement_created_time,
|
|
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_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_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>
|
|
<where>
|
|
|
<include refid="List_Condition"/>
|
|
<include refid="List_Condition"/>
|
|
|
</where>
|
|
</where>
|
|
@@ -929,6 +934,7 @@
|
|
|
cr.check_item as requirement_check_item,
|
|
cr.check_item as requirement_check_item,
|
|
|
cr.content as requirement_content,
|
|
cr.content as requirement_content,
|
|
|
cr.period as requirement_period,
|
|
cr.period as requirement_period,
|
|
|
|
|
+ sbtype.name as requirement_sb_type_name,
|
|
|
cr.remark as requirement_remark,
|
|
cr.remark as requirement_remark,
|
|
|
cr.created_user_name as requirement_created_user_name,
|
|
cr.created_user_name as requirement_created_user_name,
|
|
|
cr.created_time as requirement_created_time,
|
|
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_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_standard_requirement csr on csr.standard_id = standard.id
|
|
|
left join t_check_requirement cr on cr.id = csr.requirement_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
|
|
WHERE checkjob.id IN
|
|
|
<foreach item="item" index="index" collection="jobIdList" open="(" close=")" separator=",">
|
|
<foreach item="item" index="index" collection="jobIdList" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
#{item}
|
|
@@ -1019,6 +1026,7 @@
|
|
|
cr.check_item as requirement_check_item,
|
|
cr.check_item as requirement_check_item,
|
|
|
cr.content as requirement_content,
|
|
cr.content as requirement_content,
|
|
|
cr.period as requirement_period,
|
|
cr.period as requirement_period,
|
|
|
|
|
+ sbtype.name as requirement_sb_type_name,
|
|
|
cr.remark as requirement_remark,
|
|
cr.remark as requirement_remark,
|
|
|
cr.created_user_name as requirement_created_user_name,
|
|
cr.created_user_name as requirement_created_user_name,
|
|
|
cr.created_time as requirement_created_time,
|
|
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_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_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_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
|
|
WHERE checkjob.id IN
|
|
|
<foreach item="item" index="index" collection="jobIdList" open="(" close=")" separator=",">
|
|
<foreach item="item" index="index" collection="jobIdList" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
#{item}
|