diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java index e54d28c..33c9457 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionController.java @@ -57,11 +57,10 @@ public class RecordInspectionController extends BaseController { @GetMapping("/print") public String print(String ids) { System.out.println(ids); + List list = recordInspectionService.selectListByids(ids); + + List infolist=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids); - List list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids); - System.out.println("巡检记录"+list.toString()); - // List recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids); - // System.out.println("巡检图片"+recordInspectionImgs.size()); return prefix +""; } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java index 9c52c28..9963eb8 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java @@ -109,6 +109,7 @@ public class RecordInspectionTask extends BaseEntity .append("areaName", getAreaName()) .append("planePosition", getPlanePosition()) .append("taskState", getTaskState()) + .append("imgPath", getImgPath()) .toString(); } } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java index e104b9c..4d1e68f 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java @@ -61,4 +61,6 @@ public interface RecordInspectionMapper public int deleteRecordInspectionByInspectionIds(String[] inspectionIds); int countInsertRecordNumber(); + + List selectListByids(String[] strArray); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java index 30dda54..1f24a60 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java @@ -60,4 +60,5 @@ public interface IRecordInspectionService public int deleteRecordInspectionByInspectionId(Long inspectionId); + List selectListByids(String ids); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java index 7567d85..bac344e 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java @@ -93,5 +93,10 @@ public class RecordInspectionServiceImpl implements IRecordInspectionService { return recordInspectionMapper.deleteRecordInspectionByInspectionId(inspectionId); } + @Override + public List selectListByids(String ids) { + + return recordInspectionMapper.selectListByids(Convert.toStrArray(ids)); + } } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml index 0b50270..39a1a48 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml @@ -82,5 +82,20 @@ - + \ No newline at end of file