|
@@ -1,6 +1,6 @@
|
|
|
<?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">
|
|
|
-<mapper namespace="com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLogMapper">
|
|
|
+<mapper namespace="com.github.zuihou.business.productionReadyCenter.dao.AAutoNodeLogMapper">
|
|
|
|
|
|
<!-- 通用查询映射结果 -->
|
|
|
<resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog">
|
|
@@ -20,8 +20,20 @@
|
|
|
|
|
|
<!-- 通用查询结果列 -->
|
|
|
<sql id="Base_Column_List">
|
|
|
- id,create_time,create_user,update_time,update_user,
|
|
|
- auto_node_id, exe_status, exe_result, start_time, end_time, feedback, feedback_file
|
|
|
+ id,create_time ,create_user,update_time,update_user,
|
|
|
+ auto_node_id, exe_status, exe_result, start_time, end_time, feedback, feedback_file, resourceName,instructionName,procedureName
|
|
|
</sql>
|
|
|
|
|
|
+ <select id="pageList" resultMap="BaseResultMap">
|
|
|
+ select
|
|
|
+ <include refid="Base_Column_List"/>
|
|
|
+ from (
|
|
|
+ select l.*, c.name as resourceName, d.name as instructionName, p.`name` as procedureName from imcs_a_auto_node_log l
|
|
|
+ left join imcs_a_auto_node a ON l.auto_node_id = a.id
|
|
|
+ left join imcs_tenant_productionresource c on a.resource_id = c.id
|
|
|
+ left join imcs_b_bom_procedure p on a.procedure_id = p.id
|
|
|
+ left join view_module_instruction d on a.instruction_id = d.id
|
|
|
+ ) s ${ew.customSqlSegment}
|
|
|
+ </select>
|
|
|
+
|
|
|
</mapper>
|