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 6cd10eb..e54d28c 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 @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.manage.domain.RecordInspectionImg; import com.ruoyi.manage.domain.RecordInspectionInfo; +import com.ruoyi.manage.domain.RecordInspectionTask; import com.ruoyi.manage.service.IRecordInspectionImgService; import com.ruoyi.manage.service.IRecordInspectionInfoService; import com.ruoyi.manage.service.IRecordInspectionTaskService; @@ -37,8 +38,8 @@ public class RecordInspectionController extends BaseController { private String prefix = "manage/record_inspection"; @Autowired private IRecordInspectionTaskService iRecordInspectionTaskService; - @Autowired - private IRecordInspectionImgService recordInspectionImgService; + // @Autowired + // private IRecordInspectionImgService recordInspectionImgService; @Autowired private IRecordInspectionService recordInspectionService; @@ -57,10 +58,10 @@ public class RecordInspectionController extends BaseController { public String print(String ids) { System.out.println(ids); - List list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids); - System.out.println("巡检记录"+list.size()); - List recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids); - System.out.println("巡检图片"+recordInspectionImgs.size()); + 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 8361210..9c52c28 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 @@ -35,8 +35,17 @@ public class RecordInspectionTask extends BaseEntity /** 完成状态 */ @Excel(name = "完成状态") private String taskState; + private String imgPath; - public void setObjid(Long objid) + public String getImgPath() { + return imgPath; + } + + public void setImgPath(String imgPath) { + this.imgPath = imgPath; + } + + public void setObjid(Long objid) { this.objid = objid; } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java index 541da18..694febd 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java @@ -62,5 +62,5 @@ public interface RecordInspectionTaskMapper */ public int deleteRecordInspectionTaskByObjids(String[] objids); - List iRecordInspectionTaskService(String[] strArray); + List iRecordInspectionTaskService(String[] strArray); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java index f94beb4..76591f4 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java @@ -61,5 +61,5 @@ public interface IRecordInspectionTaskService */ public int deleteRecordInspectionTaskByObjid(Long objid); - List selectTaskInfoByInspectionId(String ids); + List selectTaskInfoByInspectionId(String ids); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java index a418f0d..51c9e1d 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java @@ -95,7 +95,7 @@ public class RecordInspectionTaskServiceImpl implements IRecordInspectionTaskSer } @Override - public List selectTaskInfoByInspectionId(String ids) { + public List selectTaskInfoByInspectionId(String ids) { return recordInspectionTaskMapper.iRecordInspectionTaskService(Convert.toStrArray(ids)); } } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml index 110a50d..86cf7e8 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -73,8 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"