调整返回审批信息

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

@@ -22,17 +22,19 @@
 			GROUP_CONCAT( uu.username ) AS check_person,
 			bp.created_time,
 			bp.pause_flag,
-			SUM(IF(fat.`status` = 0 or fat.`status` = 1, 1,0)) AS count0,
-			SUM(IF(fat.`status` = 2 or fat.`status` = 4, 1,0)) AS count1,
-			SUM(IF(fat.`status` = 3, 1,0)) AS count2
-		FROM
-			benteler_plan bp
-			join onsite_approval_plan oap on bp.id = oap.benteler_plan_id AND oap.approval_level = 2 AND oap.`status` = 1
-			left join first_article_calendar fac on bp.id = fac.benteler_plan_id
-			left join us_user uu on  (fac.principal_one_id = uu.id or fac.principal_two_id = uu.id)
-			left join first_article_task fat on fac.id = fat.first_article_calendar_id and TO_DAYS(fat.task_time) = TO_DAYS(NOW())
-		WHERE
-			bp.deleted= 0 and bp.`status` = 4 <!-- 审核通过已生效计划 -->
+              <!-- 未完成  已完成  待重检-->
+        SUM(IF(fat.`status` = 0 or fat.`status` = 1, 1,0)) AS count0,
+        SUM(IF(fat.`status` = 2 or fat.`status` = 4, 1,0)) AS count1,
+        SUM(IF(fat.`status` = 3, 1,0)) AS count2
+        FROM
+        benteler_plan bp
+        join onsite_approval_plan oap on bp.id = oap.benteler_plan_id AND oap.approval_level = 2 AND oap.`status` = 1
+        left join first_article_calendar fac on bp.id = fac.benteler_plan_id
+        left join us_user uu on (fac.principal_one_id = uu.id or fac.principal_two_id = uu.id)
+        left join first_article_task fat on fac.id = fat.first_article_calendar_id and TO_DAYS(fat.task_time) =
+        TO_DAYS(NOW())
+        WHERE
+        bp.deleted= 0 and bp.`status` = 4 <!-- 审核通过已生效计划 -->
 			AND bp.plan_type = 1
 			<if test="req.bentelerPlanName != null and req.bentelerPlanName != ''">
 		    AND bp.`name` LIKE CONCAT('%', #{req.bentelerPlanName}, '%')
@@ -317,6 +319,7 @@
         AND fair.first_article_item_id = fai.id
         AND fair.first_article_item_id = #{req.firstArticleItemId}
         AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
+        AND fat.type_flag = #{req.typeFlag}
         <if test="req.typeFlag == 0"> <!-- 首件 -->
             AND fai.first_flag = 1
         </if>
@@ -326,6 +329,7 @@
         <if test="req.typeFlag == 2"> <!-- 中断 -->
             AND fai.catch_flag = 1
         </if>
+
     </select>
 
 

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

@@ -337,7 +337,7 @@
      -->
 
     <!--取得审批人 -->
-    <select id="getLatestApprovalInfo" resultType="com.factory.web.entity.pm.OnsiteApprovalPlan">
+    <select id="getLatestApprovalInfo" resultType="com.factory.web.entity.pm.OnsiteApprovalPlan"><![CDATA[
         SELECT oap.benteler_plan_id,
                oap.approval_level,
                oap.approval_user_id,
@@ -350,11 +350,12 @@
                         MAX(oap.approval_level) AS approval_level
                  FROM onsite_approval_plan oap
                  WHERE oap.benteler_plan_id = #{req.bentelerPlanId}
+                   and oap.status != 0
              ) a
         WHERE oap.benteler_plan_id = a.benteler_plan_id
           AND oap.approval_level = a.approval_level
           AND oap.benteler_plan_id = #{req.bentelerPlanId}
-    </select>
+        ]]></select>
 
     <!-- 取得计划下的点检项目数 -->
     <select id="getPmItemCount" resultType="int">