更新

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -335,9 +335,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			searchPmPlanReq.setBentelerPlanId(pmPlan.getBentelerPlanId());
 			OnsiteApprovalPlan latestApprovalInfo = this.getLatestApprovalInfo(searchPmPlanReq);
 			if(latestApprovalInfo!=null) {
-				pmPlan.setApprovalLevel(latestApprovalInfo.getApprovalLevel());
-				pmPlan.setApprovalUserId(latestApprovalInfo.getApprovalUserId());
-				pmPlan.setStatus(latestApprovalInfo.getStatus());
+				//不要修改这个状态，否则前端判断出错
+//				pmPlan.setApprovalLevel(latestApprovalInfo.getApprovalLevel());
+//				pmPlan.setApprovalUserId(latestApprovalInfo.getApprovalUserId());
+//				pmPlan.setStatus(latestApprovalInfo.getStatus());
 				pmPlan.setReason(latestApprovalInfo.getReason());
 				pmPlan.setUpdatedTime(latestApprovalInfo.getUpdatedTime());
 				pmPlan.setApprovalPerson(latestApprovalInfo.getApprovalPerson());

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

@@ -78,7 +78,7 @@
         benteler_plan bp
         WHERE fat.first_article_calendar_id = fac.id
         AND fac.benteler_plan_id = bp.id
-        AND bp.pause_flag = 0
+        AND bp.pause_flag = 0 and bp.`status`= 4 AND bp.deleted = 0
         AND fat.type_flag <> 2]]>
         <!-- 0 初始化 1 待审核状态 2放行 3 不通过 4 员工提交直接通过 -->
         <if test="req.type == 0"> <!-- 未完成 -->

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

@@ -213,7 +213,7 @@
         join benteler_plan bp on oc.benteler_plan_id = bp.id
         left join onsite_workshop ow on ow.benteler_plan_id = bp.id
         left join onsite_item oi on oi.type_flag = oc.type_flag
-        WHERE bp.pause_flag = 0 AND bp.status = 4 AND bp.deleted = 0
+        WHERE bp.pause_flag = 0 AND bp.`status` = 4 AND bp.deleted = 0
         AND TO_DAYS(ot.task_time) >= TO_DAYS(NOW()) AND oc.user_id = #{req.userId}
 		<choose>
 			<when test="req.type == 0"> <!-- 未完成 -->