调整返回审批信息

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -336,7 +336,7 @@
     </select>
      -->
 
-    <!--取得审批人 -->
+    <!--取得审批人 如果是待生产审核  则显示质量经理的审核信息-->
     <select id="getLatestApprovalInfo" resultType="com.factory.web.entity.pm.OnsiteApprovalPlan"><![CDATA[
         SELECT oap.benteler_plan_id,
                oap.approval_level,
@@ -347,10 +347,11 @@
         FROM onsite_approval_plan oap,
              (
                  SELECT oap.benteler_plan_id,
-                        MAX(oap.approval_level) AS approval_level
+                        if(oap.status = 0 and oap.approval_level = 2, 1, MAX(oap.approval_level)) AS approval_level
                  FROM onsite_approval_plan oap
                  WHERE oap.benteler_plan_id = #{req.bentelerPlanId}
-                   and oap.status != 0
+                 order by oap.status desc, oap.approval_level desc
+                 limit 1
              ) a
         WHERE oap.benteler_plan_id = a.benteler_plan_id
           AND oap.approval_level = a.approval_level