Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae

 modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml

@@ -104,11 +104,23 @@
          and d.model_id = e.id
        order by c.CREATE_DATE
    </select>
    <select id="getModelList" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
    <select id="getModelList"
            resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
        SELECT *
        FROM simulat_assess_task_phase_model
        WHERE fz_id = ${fzId}
          AND is_delete = 0
        order by sort
    </select>
    <select id="getModelByProductGk" resultType="com.zt.life.modules.mainPart.taskReliability.model.ModelRbd">
        select a.*
        from model_rbd a,
             operat_condit_model b
        where a.id = b.model_id
          and b.operat_condit_id = ${gkId}
          and b.product_id = ${productId}
          and a.is_delete = 0
          and b.is_delete = 0
        limit 1
    </select>
</mapper>