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

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

@@ -8,10 +8,7 @@ import java.io.ObjectOutputStream;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -26,6 +23,8 @@ import com.factory.base.entity.po.remote.UserInfo;
 import com.factory.user.config.handler.LoginContext;
 import com.factory.user.service.UsersService;
 import com.factory.user.util.AuthUtils;
+import com.factory.web.entity.pm.OnsiteCalendar;
+import com.factory.web.service.pm.OnsiteCalendarService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -188,10 +187,13 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
     @Autowired
     private WxService wxService;
-    
+
     @Autowired
     private ApprovalRuleMapper approvalRuleMapper;
 
+    @Autowired
+    private OnsiteCalendarService onsiteCalendarService;
+
     /**
      * 新建首件计划
      *
@@ -199,7 +201,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
      * @return
      */
     @Override
-    public ResponseBean<Void> addFaPlan(AddFaPlanReq req){
+    public ResponseBean<Void> addFaPlan(AddFaPlanReq req) {
         // 校验计划名称是否存在
         if (this.checkPlanNameExist(req.getBentelerPlanName(), null)) {
             return ResponseBeanBuilder.fail("计划名称已存在");
@@ -1181,9 +1183,20 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         aLLPlanList.forEach(item -> {
             FirstArticleCalendar calendar = firstArticleCalendarService.getOne(Wrappers.<FirstArticleCalendar>lambdaQuery().eq(FirstArticleCalendar::getBentelerPlanId, item.getId()));
             Optional<FirstArticleCalendar> calendar1 = Optional.ofNullable(calendar);
-            String userOneName = calendar1.map(calendaro -> calendaro.getPrincipalOneId()).map(principalOneId -> usersService.getById(principalOneId)).map(oneInfo -> oneInfo.getUsername()).orElse("");
-            String userTwoName = calendar1.map(calendaro -> calendaro.getPrincipalTwoId()).map(principalOneId -> usersService.getById(principalOneId)).map(oneInfo -> oneInfo.getUsername()).orElse("");
-            item.setCheckPerson(userOneName + "&" + userTwoName);
+            if (item.getPlanType().equals(1)) {
+                String userOneName = calendar1.map(calendaro -> calendaro.getPrincipalOneId()).map(principalOneId -> usersService.getById(principalOneId)).map(oneInfo -> oneInfo.getUsername()).orElse("");
+                String userTwoName = calendar1.map(calendaro -> calendaro.getPrincipalTwoId()).map(principalOneId -> usersService.getById(principalOneId)).map(oneInfo -> oneInfo.getUsername()).orElse("");
+                String collect = Arrays.asList(userOneName, userTwoName).stream().collect(Collectors.joining("&"));
+                item.setCheckPerson(collect);
+            } else {
+                List<OnsiteCalendar> onsiteCalendarList = onsiteCalendarService.list(Wrappers.<OnsiteCalendar>lambdaQuery()
+                        .eq(OnsiteCalendar::getBentelerPlanId, item.getId()).orderByAsc(OnsiteCalendar::getTypeFlag));
+                String userNames = onsiteCalendarList.stream().map(item1 -> {
+                    return usersService.getById(item1.getUserId()).getUsername();
+                }).collect(Collectors.joining("&"));
+                item.setCheckPerson(userNames);
+            }
+
         });
         return ResponseBeanBuilder.ok(aLLPlanList, Function.identity());
     }
@@ -1244,27 +1257,19 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
             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;
-                }
+            /* 首件检查结果 */
+            /* 200件检查结果 */
+            /* 中断检查结果(一天提交多个中断task，暂时都取出来了) */
+            /* 判断当前检查项目是否是放行 */
+            firstArticleItemList.stream().filter(item -> LocalDate.now().getDayOfWeek().getValue() != 1 && item.getPrefix().equals("W") || !item.getPrefix().equals("W")).forEach(firstArticleItem -> {
                 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);
-
-                /* 200件检查结果 */
                 List<FirstArticleItemResult> twoHundredItemResultList = this.getItemResultList(firstArticleItem.getId(), req.getCheckDate(), 1);
                 firstArticleItem.setTwoHundredItemResultList(twoHundredItemResultList);
-
-                /* 中断检查结果(一天提交多个中断task，暂时都取出来了) */
                 List<FirstArticleItemResult> catchItemResultList = this.getItemResultList(firstArticleItem.getId(), req.getCheckDate(), 2);
                 firstArticleItem.setCatchItemResultList(catchItemResultList);
-
-                /* 判断当前检查项目是否是放行 */
                 SearchFaItemReleaseCountReq searchFaItemReleaseCountReq = new SearchFaItemReleaseCountReq();
                 searchFaItemReleaseCountReq.setCheckDate(req.getCheckDate());
                 searchFaItemReleaseCountReq.setFirstArticleItemId(firstArticleItem.getId());
@@ -1279,7 +1284,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 List<FirstArticleApprovalTask> faItemRelease = firstArticleMapper.getFaItemRelease(searchFaItemReleaseCountReq);
                 faItemRelease.stream().filter(item -> !item.getResult().equals(0));
                 firstArticleItem.setPermitDesc(faItemRelease); // 备注
-            }
+            });
 
             firstArticleWorkshop.setFirstArticleItemList(firstArticleItemList);
         }