查询所有巡检点下的巡检内容+巡检项

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/controller/CmmsInspectSpotController.java

@@ -204,4 +204,23 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
         return super.importExcel(request, response, CmmsInspectSpot.class);
     }
 
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 查询出所有巡检点下的巡检内容巡检项
+	*   date: 2024/1/26
+	*/
+	 @ApiOperation(value="巡检点-查询所有巡检点下巡检内容巡检项", notes="巡检点-查询所有巡检点下巡检内容巡检项")
+	 @GetMapping(value = "/listDetails")
+	 public Result<IPage<CmmsInspectSpotVo>> queryPageDetailsList(CmmsInspectSpot cmmsInspectSpot,
+														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														   HttpServletRequest req) {
+		 //QueryWrapper<CmmsInspectSpot> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpot, req.getParameterMap());
+		 Page<CmmsInspectSpotVo> page = new Page<CmmsInspectSpotVo>(pageNo, pageSize);
+		 //IPage<CmmsInspectSpot> pageList = cmmsInspectSpotService.page(page, queryWrapper);
+		 List<CmmsInspectSpotVo> list = cmmsInspectSpotService.getCmmsInspectSpotListDetails(page, cmmsInspectSpot);
+		 page.setRecords(list);
+		 return Result.OK(page);
+	 }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/ICmmsInspectSpotService.java

@@ -30,4 +30,6 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
      *   date: 2024/1/26
      */
     CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id);
+
+    List<CmmsInspectSpotVo> getCmmsInspectSpotListDetails(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/impl/CmmsInspectSpotServiceImpl.java

@@ -130,6 +130,30 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         return cmmsInspectSpotVo;
     }
 
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 查询出所有巡检点下的巡检内容巡检项
+    *   date: 2024/1/26
+    */
+    @Override
+    public List<CmmsInspectSpotVo> getCmmsInspectSpotListDetails(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot) {
+        List<CmmsInspectSpotVo> cmmsInspectSpotList = inspectSpotMapper.getCmmsInspectSpotList(page, cmmsInspectSpot);
+        for (int i = 0; i < cmmsInspectSpotList.size(); i++) {
+            String id = cmmsInspectSpotList.get(i).getId();
+            List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(id);
+            ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
+            for (CmmsInspectSpotEquip spot:list) {
+                CmmsInspectContentVo inspectContent = iCmmsInspectContentService.getCmmsInspectContentById(spot.getInspectcontid());
+                contentList.add(inspectContent);
+            }
+            cmmsInspectSpotList.get(i).setInspectContentList(contentList);
+        }
+
+        return cmmsInspectSpotList;
+    }
+
     private void insertCmmsInspectcheckContentItem(CmmsInspectSpotVo cmmsInspectSpot) {
         List<CmmsInspectContentVo> list = cmmsInspectSpot.getInspectContentList();
         String id = cmmsInspectSpot.getId();