修改 calendar 表相关字段 部分关联

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

@@ -108,6 +108,9 @@ import com.factory.web.service.pm.PlanBindService;
 import com.factory.web.service.pm.PreventMistakeService;
 import com.factory.wx.entity.req.SendMsgReq;
 import com.factory.wx.service.WxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import cn.hutool.core.convert.Convert;
 import lombok.extern.slf4j.Slf4j;
@@ -173,7 +176,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
     @Autowired
     private WxService wxService;
-    
+
     @Autowired
     private ApprovalRuleMapper approvalRuleMapper;
 
@@ -598,7 +601,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         SearchFaTaskInfoReq searchFaTaskInfoReq = new SearchFaTaskInfoReq();
         searchFaTaskInfoReq.setBentelerPlanId(req.getBentelerPlanId());
         searchFaTaskInfoReq.setTypeFlag(req.getTypeFlag());
-
+        //获取对应task信息
         FirstArticleTask faTaskInfo = null;
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
             searchFaTaskInfoReq.setUserId(req.getUserId());
@@ -612,7 +615,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         if (faTaskInfo != null) {
             firstArticleTaskId = faTaskInfo.getId();
         }
-
+        //工作站列表（包含此类别检查 W前缀的  只有周一才查出来）
         List<FirstArticleWorkshop> listRes = firstArticleMapper.getFaWorkshopListForPad(req);
 
         SearchFaItemListForPadReq searchFaItemListReq = null;
@@ -890,9 +893,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             firstArticleApprovalTaskService.remove(Wrappers.<FirstArticleApprovalTask>lambdaQuery()
                     .eq(FirstArticleApprovalTask::getFirstArticleTaskId, firstArticleTask.getId()));
             this.setApproval(firstArticleTask.getId(),null);
-            
+
             ApprovalUserRes approvalUserRes = preventMistakeService.getApprovalUserInfo(1, 2);
-           
+
         }
 
         /* 更新中断的操作人 */

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

@@ -93,7 +93,16 @@
         </if>
         AND TO_DAYS(fat.task_time) = TO_DAYS(NOW())
         AND (fac.principal_one_id = #{req.userId} or fac.principal_two_id = #{req.userId} )
-        -- GROUP BY fat.id
+
+        and (
+        DATE_FORMAT(now(), '%w') = 1
+        and exists(select i.prefix from first_article_item i
+        where i.workshop_id in (select id from first_article_workshop
+        where benteler_plan_id = fac.benteler_plan_id) and i.prefix = 'W')
+
+        or exists(select i.prefix from first_article_item i
+        where i.workshop_id in (select id from first_article_workshop
+        where benteler_plan_id = fac.benteler_plan_id)and i.prefix != 'W'))
     </select>
 
     <!--取得Pad端工作站列表 -->
@@ -108,6 +117,7 @@
         AND faw.benteler_plan_id = #{req.bentelerPlanId}
         <if test="req.typeFlag == 0"> <!-- 首件 -->
             AND fai.first_flag = 1
+
         </if>
         <if test="req.typeFlag == 1"> <!-- 200件 -->
             AND fai.two_hundred_flag = 1
@@ -115,6 +125,9 @@
         <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>
 
     <!--取得Pad端巡检项目列表 -->
@@ -153,6 +166,9 @@
         <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>
 
     <!--取得不放行任务对应的工作站 -->
@@ -222,7 +238,6 @@
         first_article_calendar fac
         WHERE fat.first_article_calendar_id = fac.id
         AND fac.benteler_plan_id = #{req.bentelerPlanId}
-        AND TO_DAYS(fat.task_time) = TO_DAYS(NOW())
         AND fat.type_flag = #{req.typeFlag}
         <if test="req.userId != null">
             AND (fac.principal_one_id = #{req.userId} OR fac.principal_two_id = #{req.userId})
@@ -230,6 +245,9 @@
         <if test="req.status != null">
             AND fat.`status` = #{req.status}
         </if>
+        AND TO_DAYS(fat.task_time) = TO_DAYS(NOW())
+
+
     </select>
     <!-- 查询中断最新的task -->
     <select id="getFaTaskInfoCatchLatest" resultType="com.factory.web.entity.fa.FirstArticleTask">