@ -26,20 +26,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- <result property="wfProcessId" column="wf_process_id" /> -->
<result property= "deviceId" column= "device_id" />
<result property= "approveStatus" column= "approveStatus" />
<result property= "repairConfirm" column= "repair_confirm" />
<result property= "confirmer" column= "confirm_user" />
<result property= "deviceCode" column= "device_code" />
<result property= "deviceName" column= "device_name" />
<result property= "deviceLocation" column= "device_location" />
<result property= "deviceSpec" column= "device_spec" />
<result property= "instanceActivityId" column= "instance_activity_id" />
<result property= "faultType" column= "fault_type" />
<result property= "faultLevel" column= "fault_level" />
<result property= "faultDescription" column= "fault_description" />
<result property= "applyUserPhone" column= "apply_user_phone" />
<result property= "designOperations" column= "design_operations" />
<result property= "repairType" column= "repair_type" />
<result property= "outsrcId" column= "outsrc_id" />
<result property= "processHandleResolution" column= "process_handle_resolution" />
<result property= "knowledgeRepairId" column= "knowledge_repair_id" />
<result property= "verifyMethod" column= "verify_method" />
</resultMap>
<resultMap id= "DmsBillsFaultInstanceDmsFaultInstanceActivityResult" type= "DmsBillsFaultInstance" extends= "DmsBillsFaultInstanceResult" >
<collection property= "dmsFaultInstanceActivityList" notNullColumn= "sub_instance_activity_id" javaType= "java.util.List" resultMap= "DmsFaultInstanceActivityResult" />
</resultMap>
@ -67,17 +72,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property= "createTime" column= "sub_create_time" />
<result property= "transferUserId" column= "sub_transfer_user_id" />
<result property= "attr1" column= "sub_attr1" />
<result property= "repairContent" column= "sub_repair_content" />
<result property= "protectedMethod" column= "sub_protected_method" />
<result property= "repairer" column= "sub_repairer" />
<result property= "repairConfirm" column= "sub_repair_confirm" />
<result property= "confirmTime" column= "sub_confirm_time" />
</resultMap>
<sql id= "selectDmsBillsFaultInstanceVo" >
select repair_instance_id, fault_source_type, fault_source_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time,device_id,approveStatus from dms_bills_fault_instance
select repair_instance_id, fault_source_type, fault_source_id, bills_fault_code, bills_status, apply_user, apply_user_phone, apply_ time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time, device_id, APPROVESTATUS AS approveStatus, knowledge_repair_id, verify_method, repair_confirm, confirm_user from dms_bills_fault_instance
</sql>
<select id= "selectDmsBillsFaultInstanceList" parameterType= "DmsBillsFaultInstance" resultMap= "DmsBillsFaultInstanceResult" >
<include refid= "selectDmsBillsFaultInstanceVo" />
<where >
approveStatus != '4'
( approveStatus != '4' OR approveStatus IS NULL)
<if test= "faultSourceType != null and faultSourceType != ''" > and fault_source_type = #{faultSourceType}</if>
<if test= "faultSourceId != null " > and fault_source_id = #{faultSourceId}</if>
<if test= "repairInstanceId != null " > and repair_instance_id = #{repairInstanceId}</if>
@ -114,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "billsFaultCode != null and billsFaultCode != ''" > bills_fault_code,</if>
<if test= "billsStatus != null and billsStatus != ''" > bills_status,</if>
<if test= "applyUser != null" > apply_user,</if>
<if test= "applyUserPhone != null" > apply_user_phone,</if>
<if test= "faultLevel != null" > fault_level,</if>
<if test= "applyTime != null" > apply_time,</if>
<if test= "realBeginTime != null" > real_begin_time,</if>
<if test= "realEndTime != null" > real_end_time,</if>
@ -126,6 +137,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "updateBy != null" > update_by,</if>
<if test= "updateTime != null" > update_time,</if>
<if test= "deviceId != null" > device_id,</if>
<if test= "knowledgeRepairId != null" > knowledge_repair_id,</if>
<if test= "verifyMethod != null" > verify_method,</if>
<!-- 已废弃审批流 -->
<!-- <if test="wfProcessId != null">wf_process_id,</if> -->
</trim>
@ -136,6 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "billsFaultCode != null and billsFaultCode != ''" > #{billsFaultCode},</if>
<if test= "billsStatus != null and billsStatus != ''" > #{billsStatus},</if>
<if test= "applyUser != null" > #{applyUser},</if>
<if test= "applyUserPhone != null" > #{applyUserPhone},</if>
<if test= "faultLevel != null" > #{faultLevel},</if>
<if test= "applyTime != null" > #{applyTime},</if>
<if test= "realBeginTime != null" > #{realBeginTime},</if>
<if test= "realEndTime != null" > #{realEndTime},</if>
@ -148,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "updateBy != null" > #{updateBy},</if>
<if test= "updateTime != null" > #{updateTime},</if>
<if test= "deviceId != null" > #{deviceId},</if>
<if test= "knowledgeRepairId != null" > #{knowledgeRepairId},</if>
<if test= "verifyMethod != null" > #{verifyMethod},</if>
<!-- 已废弃审批流 -->
<!-- <if test="wfProcessId != null">#{wfProcessId},</if> -->
</trim>
@ -161,6 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "billsFaultCode != null and billsFaultCode != ''" > bills_fault_code = #{billsFaultCode},</if>
<if test= "billsStatus != null and billsStatus != ''" > bills_status = #{billsStatus},</if>
<if test= "applyUser != null" > apply_user = #{applyUser},</if>
<if test= "applyUserPhone != null" > apply_user_phone = #{applyUserPhone},</if>
<if test= "faultLevel != null" > fault_level = #{faultLevel},</if>
<if test= "applyTime != null" > apply_time = #{applyTime},</if>
<if test= "realBeginTime != null" > real_begin_time = #{realBeginTime},</if>
<if test= "realEndTime != null" > real_end_time = #{realEndTime},</if>
@ -175,7 +194,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test= "deviceId != null" > device_id = #{deviceId},</if>
<if test= "approveStatus != null" > approveStatus = #{approveStatus},</if>
<if test= "repairConfirm != null" > repair_confirm = #{repairConfirm},</if>
<if test= "confirmer != null" > confirmer = #{confirmer},</if>
<if test= "confirmer != null" > confirm_user = #{confirmer},</if>
<if test= "knowledgeRepairId != null" > knowledge_repair_id = #{knowledgeRepairId},</if>
<if test= "verifyMethod != null" > verify_method = #{verifyMethod},</if>
</trim>
where repair_instance_id = #{repairInstanceId}
</update>
@ -191,15 +212,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<sql id= "selectDmsBillsFaultInstanceJoinVo" >
select dbfi.repair_instance_id, dbfi.fault_source_type, dbfi.fault_source_id, dbfi.bills_fault_code, dbfi.bills_status,
dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id,dbfi.approveStatus,
dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id, dbfi.APPROVESTATUS as approveStatus,
dbdl.device_code,
dbdl.device_name,
dbdl.device_address as device_location,
@ -226,12 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by dbfi.repair_instance_id desc
</select>
<select id= "selectFaultInstanceJoinFirstAndDeviceById" parameterType= "Long" resultMap= "DmsBillsFaultInstanceResult" >
select dbfi.repair_instance_id, dbfi.fault_source_type, dbfi.fault_source_id, dbfi.bills_fault_code, dbfi.bills_status,
dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id,dbfi.approveStatus,
dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id, dbfi.APPROVESTATUS as approveStatus,
dbdl.device_code,
dbdl.device_name,
dbdl.device_address as device_location,
@ -248,31 +260,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where dbfi.repair_instance_id = #{repairInstanceId} and dfia.process_step_order=1
</select>
<select id= "selectFaultInstanceJoinActivityByRepairInstanceId" parameterType= "Long" resultMap= "DmsBillsFaultInstanceDmsFaultInstanceActivityResult" >
select a.repair_instance_id, a.fault_source_type, a.fault_source_id, a.bills_fault_code, a.bills_status, a.apply_user, a.apply_time, a.real_begin_time, a.real_end_time, a.require_end_time, a.instance_type, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time,a.approveStatus,
select a.repair_instance_id, a.fault_source_type, a.fault_source_id, a.bills_fault_code, a.bills_status,
a.apply_user, a.apply_user_phone, a.apply_time, a.real_begin_time, a.real_end_time, a.require_end_time,
a.instance_type, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.device_id,
a.APPROVESTATUS as approveStatus, a.knowledge_repair_id, a.verify_method, a.fault_level, a.confirm_user, a.repair_confirm,
dbdl.device_code,
dbdl.device_name,
dbdl.device_address as device_location,
dbdl.device_model as device_spec,
b.instance_activity_id as sub_instance_activity_id, b.repair_instance_id as sub_repair_instance_id, b.process_activity_id as sub_process_activity_id, b.fault_type as sub_fault_type, b.fault_description as sub_fault_description, b.design_operations as sub_design_operations, b.device_id as sub_device_id, b.repair_type as sub_repair_type, b.outsrc_id as sub_outsrc_id, b.process_handle_resolution as sub_process_handle_resolution, b.remark as sub_remark, b.process_handle_status as sub_process_handle_status, b.process_step_order as sub_process_step_order, b.start_time as sub_start_time, b.end_time as sub_end_time, b.handle_user_id as sub_handle_user_id, b.handle_by as sub_handle_by, b.handle_time as sub_handle_time,
a.approveStatus
b.instance_activity_id as sub_instance_activity_id, b.repair_instance_id as sub_repair_instance_id,
b.process_activity_id as sub_process_activity_id, b.fault_type as sub_fault_type,
b.fault_description as sub_fault_description, b.design_operations as sub_design_operations,
b.device_id as sub_device_id, b.repair_type as sub_repair_type, b.outsrc_id as sub_outsrc_id,
b.process_handle_resolution as sub_process_handle_resolution, b.remark as sub_remark,
b.process_handle_status as sub_process_handle_status, b.process_step_order as sub_process_step_order,
b.start_time as sub_start_time, b.end_time as sub_end_time, b.handle_user_id as sub_handle_user_id,
b.handle_by as sub_handle_by, b.handle_time as sub_handle_time,
b.repair_content as sub_repair_content, b.protected_method as sub_protected_method,
b.repairer as sub_repairer, b.repair_confirm as sub_repair_confirm, b.confirm_time as sub_confirm_time,
-- 将第1步的关键字段固定从首步别名表中读取，
bf.fault_type as fault_type, bf.fault_description as fault_description,
bf.design_operations as design_operations, bf.process_handle_resolution as process_handle_resolution
from dms_bills_fault_instance a
left join base_deviceledger dbdl on a.device_id=dbdl.OBJ_ID
left join dms_fault_instance_activity bf on bf.repair_instance_id = a.repair_instance_id and bf.process_step_order = 1
left join dms_fault_instance_activity b on b.repair_instance_id = a.repair_instance_id
where a.repair_instance_id = #{repairInstanceId} order by b.process_step_order
</select>
<select id= "selectCountByRepairInstanceIdAndDeviceCode" resultType= "Long" >
select count(1) from dms_bills_fault_instance dbfi where dbfi.repair_instance_id=#{repairInstanceId}
and exists (select 1 from base_deviceledger dbdl where dbfi.device_id=dbdl.OBJ_ID and dbdl.device_code=#{deviceCode})
</select>
<select id= "selectFaultInstanceJoinFirstById" parameterType= "Long" resultMap= "DmsBillsFaultInstanceResult" >
select dbfi.repair_instance_id, dbfi.fault_source_type, dbfi.fault_source_id, dbfi.bills_fault_code, dbfi.bills_status,
dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id,
@ -299,7 +321,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.real_end_time,
b.repair_confirm,
b.update_time,
b.confirmer
b.confirm_user as confirm er
from
dms_fault_instance_activity x left join base_deviceledger a on x.device_id = a.OBJ_ID
left join dms_bills_fault_instance b on x.repair_instance_id = b.repair_instance_id where x.repair_instance_id = #{repairInstanceId}
@ -310,7 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id= "selectDmsBillsFaultInstanceCompletedList" resultType= "com.aucma.dms.domain.DmsBillsFaultInstance"
parameterType="com.aucma.dms.domain.DmsBillsFaultInstance">
select repair_instance_id, fault_source_type, fault_source_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time,device_id,approveStatus,repair_confirm from dms_bills_fault_instance
select repair_instance_id, fault_source_type, fault_source_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time, device_id, APPROVESTATUS as approveStatus, repair_confirm from dms_bills_fault_instance
<where >
bills_status = 2
<if test= "faultSourceType != null and faultSourceType != ''" > and fault_source_type = #{faultSourceType}</if>
@ -340,6 +362,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
x.fault_id = a.repair_instance_id where x.fault_id = #{repairInstanceId}
</select>
</mapper>
