增加记录点检人 点检时间

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

@@ -20,6 +20,7 @@ import java.util.stream.Stream;
 
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+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;
@@ -1164,6 +1165,13 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 .eq(BentelerPlan::getPauseFlag, false)
                 .eq(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL.value)
         );
+        aLLPlanList.forEach(item -> {
+            FirstArticleCalendar calendar = firstArticleCalendarService.getById(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);
+        });
         return ResponseBeanBuilder.ok(aLLPlanList, Function.identity());
     }