|
@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<association property="technologicalProcessDetail"
|
|
<association property="technologicalProcessDetail"
|
|
javaType="cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail"
|
|
javaType="cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail"
|
|
column="technological_process_detail_id" select="getTechnologicalProcessDetail"/>
|
|
column="technological_process_detail_id" select="getTechnologicalProcessDetail"/>
|
|
- <collection property="processSequence" ofType="cn.ezhizao.project.business.process.domain.BizProcess"
|
|
|
|
- column="technological_process_id" select="getProcessSequenceItem"/>
|
|
|
|
|
|
+ <association property="processSequence" javaType="cn.ezhizao.project.business.process.domain.BizProcess"
|
|
|
|
+ column="technological_process_detail_id" select="getProcessSequenceItem"/>
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<resultMap id="BizDayworkResult" type="cn.ezhizao.project.business.product.domain.BizDaywork">
|
|
<resultMap id="BizDayworkResult" type="cn.ezhizao.project.business.product.domain.BizDaywork">
|
|
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
JOIN biz_technological_process_detail t2 ON t1.id = t2.process_id
|
|
JOIN biz_technological_process_detail t2 ON t1.id = t2.process_id
|
|
WHERE t1.deleted = 0
|
|
WHERE t1.deleted = 0
|
|
AND t2.deleted = 0
|
|
AND t2.deleted = 0
|
|
- AND t2.technological_process_id = #{technological_processId}
|
|
|
|
|
|
+ AND t2.id = #{technological_process_detail_id}
|
|
AND t1.id != 1 AND t1.id !=2 AND t2.tenant_id != 9
|
|
AND t1.id != 1 AND t1.id !=2 AND t2.tenant_id != 9
|
|
ORDER BY
|
|
ORDER BY
|
|
t2.process_step_number;
|
|
t2.process_step_number;
|