点检结果列表为前端增加工作站信息字段

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleItem.java

@@ -32,6 +32,9 @@ public class FirstArticleItem implements Serializable {
 
     @ApiModelProperty(value = "工作站id")
     private Long workshopId;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "工作站名称")
+    private String workshopName;
 
     @ApiModelProperty(value = "测量点描述")
     private String itemContent;

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

@@ -1206,9 +1206,17 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         List<FirstArticleWorkshop> firstArticleWorkshopList = firstArticleWorkshopService.list(Wrappers.<FirstArticleWorkshop>lambdaQuery()
                 .eq(FirstArticleWorkshop::getBentelerPlanId, req.getBentelerPlanId()));
         for (FirstArticleWorkshop firstArticleWorkshop : firstArticleWorkshopList) {
+
             List<FirstArticleItem> firstArticleItemList = firstArticleItemService.list(Wrappers.<FirstArticleItem>lambdaQuery()
                     .eq(FirstArticleItem::getWorkshopId, firstArticleWorkshop.getId()));
             for (FirstArticleItem firstArticleItem : firstArticleItemList) {
+                if (LocalDate.now().getDayOfWeek().getValue() != 1 && firstArticleItem.getPrefix().equals("W")) {
+                    firstArticleItemList.remove(firstArticleItem);
+                    continue;
+                }
+                FirstArticleWorkshop workshop = firstArticleWorkshopService.getById(firstArticleItem.getWorkshopId());
+                firstArticleItem.setWorkshopName(workshop.getPlName() + "__" + workshop.getWsName());
+
                 /* 首件检查结果 */
                 List<FirstArticleItemResult> firstItemResultList = this.getItemResultList(firstArticleItem.getId(), req.getCheckDate(), 0);
                 firstArticleItem.setFirstItemResultList(firstItemResultList);
@@ -1234,6 +1242,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     firstArticleItem.setReleaseFlag(0); // 0没有
                 }
 
+
             }
 
             firstArticleWorkshop.setFirstArticleItemList(firstArticleItemList);

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

@@ -332,7 +332,7 @@
         <if test="req.typeFlag == 2"> <!-- 中断 -->
             AND fai.catch_flag = 1
         </if>
-
+        and ((DATE_FORMAT(now(), '%w') = 1 and fai.prefix = 'W') or fai.prefix != 'W')
     </select>