导入计划 负责人名称 首件计划 详情 周一代码bug

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -1642,6 +1642,11 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 beanMap.put("tool", item1.getToolId().equals("-1") ? "非工具校验" : item1.getToolId() + item1.getToolDesc());
                 beanMap.put("id", String.valueOf(id.get()));
                 id.getAndIncrement();
+                beanMap.put("blank1", " ");
+                beanMap.put("blank2", " ");
+                beanMap.put("blank3", " ");
+                beanMap.put("blank4", " ");
+
                 arrayList.add(beanMap);
 
             });

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

@@ -34,17 +34,17 @@
         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}, '%')
-		    </if>
-		 group by bp.id
-		 ) temp
-		 <where>
-		    <choose>
-		    	<when test="req.planStatus != null and req.planStatus==0">
-		    	   temp.count0 > 0
+        bp.deleted= 0 and (bp.`status` = 4 or bp.`status` = 3) <!-- 审核通过已生效计划 -->
+        AND bp.plan_type = 1
+        <if test="req.bentelerPlanName != null and req.bentelerPlanName != ''">
+            AND bp.`name` LIKE CONCAT('%', #{req.bentelerPlanName}, '%')
+        </if>
+        group by bp.id
+        ) temp
+        <where>
+            <choose>
+                <when test="req.planStatus != null and req.planStatus==0">
+                    temp.count0 > 0
 		    	</when>
 		    	<when test="req.planStatus != null and req.planStatus==2">
 		    	   temp.count2 > 0