Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

5 天以前 e5c29d6ac2b210a9385723598d79a42ae5a9679e

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml

@@ -375,8 +375,13 @@
    SELECT
        plan.plan_name AS planName,
        pro.project_name AS projectName,
        IF(#{terminateTime} < plan.plan_start_time, 6,
          IF(#{terminateTime} < plan.plan_stop_time, 5, 4)) AS state,
<!--        IF(#{terminateTime} &lt; plan.plan_start_time, 6,-->
<!--          IF(#{terminateTime} &lt; plan.plan_stop_time, 5, 4)) AS state,-->
        IF(plan.executing_state = 3, 5,
            IF(NOW() &lt; plan_start_time, 2,
                IF(NOW() &lt; plan_stop_time, 3, 4)
            )
        ) AS state,
        plan.plan_start_time AS planStartTime,
        plan.plan_stop_time AS planStopTime,
        #{terminateTime} AS realStopTime,
@@ -384,7 +389,7 @@
        NULL AS failureCount
    FROM ir_irrigate_plan plan
      INNER JOIN ir_project pro ON pro.id = plan.project_id
    WHERE plan.id =2025041515194900009
    WHERE plan.id = #{planId}
    AND plan.deleted = 0
  </select>

@@ -439,7 +444,7 @@
        IF(plan_state = 1, 1,
            IF(executing_state = 3, 5,
                IF(NOW() &lt; plan_start_time, 2,
                  IF(NOW() > plan_stop_time, 3, 4)
                  IF(NOW() &lt; plan_stop_time, 3, 4)
                )
            )
    ) AS planState