Merge remote-tracking branch 'origin/master'

wente

2024-06-07 4bff52e938ae2c260fe54d32ef680908868bb27e

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

@@ -1,11 +1,16 @@
<?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.zt.life.modules.taskReliability.dao.TaskPhaseDao">
<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseDao">

    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.TaskPhase">
        select a.*
        from task_phase a
    <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhase">
        SELECT
        a.*,
        b.operatConditDuration
        FROM
        task_phase a
        LEFT JOIN (select phase_id , SUM(operat_condit_duration_rate) as operatConditDuration from task_phase_model
        where is_delete =0 group by phase_id) b ON a.id = b.phase_id
        <where>
            a.is_delete = 0
            and a.task_id=${taskId}