修改 打印数据

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<RecordInspectionInfo> list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids);
-        System.out.println("巡检记录"+list.size());
-        List<RecordInspectionImg> recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids);
-        System.out.println("巡检图片"+recordInspectionImgs.size());
+        List<RecordInspectionTask> list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids);
+        System.out.println("巡检记录"+list.toString());
+        // List<RecordInspectionImg> recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids);
+        // System.out.println("巡检图片"+recordInspectionImgs.size());
         return prefix +"";
     }
 

ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java

@@ -35,6 +35,15 @@ public class RecordInspectionTask extends BaseEntity
     /** 完成状态 */
     @Excel(name = "完成状态")
     private String taskState;
+    private String imgPath;
+
+    public String getImgPath() {
+        return imgPath;
+    }
+
+    public void setImgPath(String imgPath) {
+        this.imgPath = imgPath;
+    }
 
     public void setObjid(Long objid)
     {

ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java

@@ -62,5 +62,5 @@ public interface RecordInspectionTaskMapper
      */
     public int deleteRecordInspectionTaskByObjids(String[] objids);
 
-    List<RecordInspectionInfo> iRecordInspectionTaskService(String[] strArray);
+    List<RecordInspectionTask> iRecordInspectionTaskService(String[] strArray);
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java

@@ -61,5 +61,5 @@ public interface IRecordInspectionTaskService
      */
     public int deleteRecordInspectionTaskByObjid(Long objid);
 
-    List<RecordInspectionInfo> selectTaskInfoByInspectionId(String ids);
+    List<RecordInspectionTask> selectTaskInfoByInspectionId(String ids);
 }

ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java

@@ -95,7 +95,7 @@ public class RecordInspectionTaskServiceImpl implements IRecordInspectionTaskSer
     }
 
     @Override
-    public List<RecordInspectionInfo> selectTaskInfoByInspectionId(String ids) {
+    public List<RecordInspectionTask> selectTaskInfoByInspectionId(String ids) {
         return recordInspectionTaskMapper.iRecordInspectionTaskService(Convert.toStrArray(ids));
     }
 }

ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="areaName"    column="area_name"    />
         <result property="planePosition"    column="plane_position"    />
         <result property="taskState"    column="task_state"    />
+        <result property="imgPath"    column="img_path"    />
     </resultMap>
 
     <sql id="selectRecordInspectionTaskVo">
@@ -73,8 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     <select id="iRecordInspectionTaskService" resultMap="RecordInspectionTaskResult">
-        <include refid="selectRecordInspectionTaskVo"/>
-         where inspection_id in
+
+        select rit.objid, rit.inspection_id, area_id, area_name, plane_position, task_state,
+        rii.img_path
+        from record_inspection_task rit
+        left join bg_wheel_chocks.record_inspection_img rii on rit.objid = rii.task_id
+        where rit.inspection_id in
         <foreach item="objid" collection="array" open="(" separator="," close=")">
             #{objid}
         </foreach>