防错-接口-调整-取得检查记录列表

application-facade/src/main/java/com/factory/web/entity/pm/res/PmCheckRecordItemListRes.java

@@ -0,0 +1,38 @@
+package com.factory.web.entity.pm.res;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 检查记录
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class PmCheckRecordItemListRes implements Serializable {
+	
+	@ApiModelProperty(value = "巡检项目id")
+	private Long onsiteItemId;
+	
+	@ApiModelProperty(value = "巡检项目内容")
+	private String itemContent;
+	
+	@ApiModelProperty(value = "一个月内的点检记录")
+	private List<PmCheckRecordRes> checkRecordList;
+
+}

application-facade/src/main/java/com/factory/web/entity/pm/res/PmCheckRecordListRes.java

@@ -32,13 +32,7 @@ public class PmCheckRecordListRes implements Serializable {
 	@ApiModelProperty(value = "工作站名称")
 	private String wsName;
 	
-	@ApiModelProperty(value = "巡检项目id")
-	private Long onsiteItemId;
-	
-	@ApiModelProperty(value = "巡检项目内容")
-	private String itemContent;
-	
-	@ApiModelProperty(value = "一个月内的点检记录")
-	private List<PmCheckRecordRes> checkRecordList;
+	@ApiModelProperty(value = "工作站下的巡检项目")
+	private List<PmCheckRecordItemListRes> itemList;
 
 }

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -70,6 +70,7 @@ import com.factory.web.entity.pm.res.ApprovalUserRes;
 import com.factory.web.entity.pm.res.PmAllCheckFlagRes;
 import com.factory.web.entity.pm.res.PmAllWorkshopListRes;
 import com.factory.web.entity.pm.res.PmCheckListRes;
+import com.factory.web.entity.pm.res.PmCheckRecordItemListRes;
 import com.factory.web.entity.pm.res.PmCheckRecordListRes;
 import com.factory.web.entity.pm.res.PmCheckRecordRes;
 import com.factory.web.entity.pm.res.PmItemNoGoListRes;
@@ -587,28 +588,66 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		return ResponseBeanBuilder.ok(onsiteCalendarList, Function.identity());
     }
 
-	/**
+    /**
      * 取得检查记录列表
      * @param req
      * @return 检查记录列表
      */
     @Override
     public ResponseBean<List<PmCheckRecordListRes>> getPmCheckRecordList(SearchPmCheckRecordListReq req) {
-    	SearchPmPlanReq workshopItemReq = new SearchPmPlanReq();
-    	workshopItemReq.setBentelerPlanId(req.getBentelerPlanId());
-    	List<PmCheckRecordListRes> workshopItemList = preventMistakeMapper.getPmWorkshopItemList(workshopItemReq);
-
-    	for (PmCheckRecordListRes workshopItem : workshopItemList) {
-    		SearchCheckRecordReq itemResultReq = new SearchCheckRecordReq();
-    		itemResultReq.setOnsiteItemId(workshopItem.getOnsiteItemId());
-    		itemResultReq.setYearMonth(req.getYearMonth());
-    		itemResultReq.setTypeFlag(req.getTypeFlag());
-    		List<PmCheckRecordRes> itemResultList = preventMistakeMapper.getPmItemResultList(itemResultReq);
-
-    		workshopItem.setCheckRecordList(itemResultList);
-    	}
+    	List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
+                .eq(OnsiteWorkshop::getBentelerPlanId, req.getBentelerPlanId()));
+		
+    	List<PmCheckRecordListRes> workshopList = new ArrayList<PmCheckRecordListRes>();
+    	PmCheckRecordListRes workshop = null;
+    	for (OnsiteWorkshop onsiteWorkshop : onsiteWorkshopList) {
+    		workshop = new PmCheckRecordListRes();
+    		workshop.setWorkshopId(onsiteWorkshop.getId());
+    		workshop.setWsName(onsiteWorkshop.getWsName());    		
 
-		return ResponseBeanBuilder.ok(workshopItemList, Function.identity());
+			List<OnsiteItem> onsiteItemList = onsiteItemService.list(Wrappers.<OnsiteItem>lambdaQuery()
+	                .eq(OnsiteItem::getWorkshopId, workshop.getWorkshopId()));
+			
+			List<PmCheckRecordItemListRes> itemList = new ArrayList<PmCheckRecordItemListRes>();
+			PmCheckRecordItemListRes item = null;
+			for (OnsiteItem onsiteItem : onsiteItemList) {
+				item = new PmCheckRecordItemListRes();
+				
+				item.setOnsiteItemId(onsiteItem.getId());
+				item.setItemContent(onsiteItem.getItemContent());
+				
+				SearchCheckRecordReq itemResultReq = new SearchCheckRecordReq();
+	    		itemResultReq.setOnsiteItemId(item.getOnsiteItemId());
+	    		itemResultReq.setYearMonth(req.getYearMonth());
+	    		itemResultReq.setTypeFlag(req.getTypeFlag());
+	    		List<PmCheckRecordRes> itemResultList = preventMistakeMapper.getPmItemResultList(itemResultReq);
+	    		
+	    		item.setCheckRecordList(itemResultList);
+
+				itemList.add(item);
+			}
+			
+			workshop.setItemList(itemList);			
+
+			workshopList.add(workshop);
+		}
+    	return ResponseBeanBuilder.ok(workshopList, Function.identity());
+    	
+//    	SearchPmPlanReq workshopItemReq = new SearchPmPlanReq();
+//    	workshopItemReq.setBentelerPlanId(req.getBentelerPlanId());
+//    	List<PmCheckRecordListRes> workshopItemList = preventMistakeMapper.getPmWorkshopItemList(workshopItemReq);
+//
+//    	for (PmCheckRecordListRes workshopItem : workshopItemList) {
+//    		SearchCheckRecordReq itemResultReq = new SearchCheckRecordReq();
+//    		itemResultReq.setOnsiteItemId(workshopItem.getOnsiteItemId());
+//    		itemResultReq.setYearMonth(req.getYearMonth());
+//    		itemResultReq.setTypeFlag(req.getTypeFlag());
+//    		List<PmCheckRecordRes> itemResultList = preventMistakeMapper.getPmItemResultList(itemResultReq);
+//
+//    		workshopItem.setCheckRecordList(itemResultList);
+//    	}
+//
+//		return ResponseBeanBuilder.ok(workshopItemList, Function.identity());
     }
 
     /**