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 3ddc772..6cd10eb 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 @@ -6,6 +6,7 @@ import com.ruoyi.manage.domain.RecordInspectionImg; import com.ruoyi.manage.domain.RecordInspectionInfo; import com.ruoyi.manage.service.IRecordInspectionImgService; import com.ruoyi.manage.service.IRecordInspectionInfoService; +import com.ruoyi.manage.service.IRecordInspectionTaskService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo; public class RecordInspectionController extends BaseController { private String prefix = "manage/record_inspection"; @Autowired - private IRecordInspectionInfoService recordInspectionInfoService; + private IRecordInspectionTaskService iRecordInspectionTaskService; @Autowired private IRecordInspectionImgService recordInspectionImgService; @Autowired @@ -56,7 +57,7 @@ public class RecordInspectionController extends BaseController { public String print(String ids) { System.out.println(ids); - List list=recordInspectionInfoService.selectInfoByInspectionId(ids); + List list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids); System.out.println("巡检记录"+list.size()); List recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids); System.out.println("巡检图片"+recordInspectionImgs.size()); 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 9279361..541da18 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 @@ -1,6 +1,8 @@ package com.ruoyi.manage.mapper; import java.util.List; + +import com.ruoyi.manage.domain.RecordInspectionInfo; import com.ruoyi.manage.domain.RecordInspectionTask; import org.springframework.stereotype.Repository; /** @@ -59,4 +61,6 @@ public interface RecordInspectionTaskMapper * @return 结果 */ public int deleteRecordInspectionTaskByObjids(String[] objids); + + 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 54bf8b5..f94beb4 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 @@ -1,6 +1,8 @@ package com.ruoyi.manage.service; import java.util.List; + +import com.ruoyi.manage.domain.RecordInspectionInfo; import com.ruoyi.manage.domain.RecordInspectionTask; /** @@ -58,4 +60,6 @@ public interface IRecordInspectionTaskService * @return 结果 */ public int deleteRecordInspectionTaskByObjid(Long objid); + + 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 83cac9c..a418f0d 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 @@ -3,28 +3,7 @@ package com.ruoyi.manage.service.impl; import java.util.List; - - - - - - - - - - - - - - - - - - - - - - +import com.ruoyi.manage.domain.RecordInspectionInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.manage.mapper.RecordInspectionTaskMapper; @@ -114,4 +93,9 @@ public class RecordInspectionTaskServiceImpl implements IRecordInspectionTaskSer public int deleteRecordInspectionTaskByObjid(Long objid) { return recordInspectionTaskMapper.deleteRecordInspectionTaskByObjid(objid); } + + @Override + 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 c602091..110a50d 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml @@ -72,5 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{objid} + \ No newline at end of file