导出接口 调用 查找点检信息接口 调整参数

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

@@ -1023,7 +1023,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     /**
      * 任务和巡检结果记录历史
      *
-     * @param onsiteTaskId
+     * @param @onsiteTaskId
      * @return
      */
     @Override
@@ -1252,7 +1252,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     /**
      * 取得用户列表
      *
-     * @param req
+     * @param @req
      * @return 取得用户列表
      */
     public List<UserListRes> getUserList() {
@@ -1264,13 +1264,14 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
     @Override
     public ResponseBean<FileRes> exportFaCheckRecordList(SearchFaCheckRecordListReq req) {
-        BentelerPlan plan = planService.getById(req.getBentelerPlanId());
+		Long bentelerPlanId = req.getBentelerPlanId();
+		BentelerPlan plan = planService.getById(bentelerPlanId);
 
         List<FirstArticleWorkshop> firstArticleWorkshopList = getFaCheckRecordList(req).getData().getFirstArticleWorkshopList();
-        FirstArticleTitle title = getFaTitle(req.getBentelerPlanId());
+        FirstArticleTitle title = getFaTitle(bentelerPlanId);
         Map<String, String> titleMap = Convert.toMap(String.class, String.class, title);
         titleMap.put("title", plan.getName());
-        List<FaCalendarRes> faCalendarList = getFaCalendarList(SearchFaCalendarReq.builder().checkDate(req.getCheckDate()).build());
+        List<FaCalendarRes> faCalendarList = getFaCalendarList(SearchFaCalendarReq.builder().checkDate(req.getCheckDate()).bentelerPlanId(bentelerPlanId).build());
         titleMap.put("iniCheckData", faCalendarList.stream().filter(item2 -> item2.getTypeFlag().equals(0)).findFirst().map(item3 -> item3.getTaskTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"))).orElse("无"));
         titleMap.put("twoCheckData", faCalendarList.stream().filter(item2 -> item2.getTypeFlag().equals(1)).findFirst().map(item3 -> item3.getTaskTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"))).orElse("无"));
         titleMap.put("breakCheckData", faCalendarList.stream().filter(item2 -> item2.getTypeFlag().equals(2)).findFirst().map(item3 -> item3.getTaskTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"))).orElse("无"));
@@ -1415,7 +1416,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     /**
      * byte[]转成Object
      *
-     * @param byte[]
+     * @param @byte[]
      * @return Object
      */
     private Object byteArrayToObject(byte[] buffer) throws Exception {