修改 打印数据

master
wanghao 6 months ago
parent 54aab1a1d5
commit 10d3cea5f6

@ -6,6 +6,7 @@ import com.ruoyi.manage.domain.RecordInspectionImg;
import com.ruoyi.manage.domain.RecordInspectionInfo; import com.ruoyi.manage.domain.RecordInspectionInfo;
import com.ruoyi.manage.service.IRecordInspectionImgService; import com.ruoyi.manage.service.IRecordInspectionImgService;
import com.ruoyi.manage.service.IRecordInspectionInfoService; import com.ruoyi.manage.service.IRecordInspectionInfoService;
import com.ruoyi.manage.service.IRecordInspectionTaskService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -35,7 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class RecordInspectionController extends BaseController { public class RecordInspectionController extends BaseController {
private String prefix = "manage/record_inspection"; private String prefix = "manage/record_inspection";
@Autowired @Autowired
private IRecordInspectionInfoService recordInspectionInfoService; private IRecordInspectionTaskService iRecordInspectionTaskService;
@Autowired @Autowired
private IRecordInspectionImgService recordInspectionImgService; private IRecordInspectionImgService recordInspectionImgService;
@Autowired @Autowired
@ -56,7 +57,7 @@ public class RecordInspectionController extends BaseController {
public String print(String ids) { public String print(String ids) {
System.out.println(ids); System.out.println(ids);
List<RecordInspectionInfo> list=recordInspectionInfoService.selectInfoByInspectionId(ids); List<RecordInspectionInfo> list=iRecordInspectionTaskService.selectTaskInfoByInspectionId(ids);
System.out.println("巡检记录"+list.size()); System.out.println("巡检记录"+list.size());
List<RecordInspectionImg> recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids); List<RecordInspectionImg> recordInspectionImgs = recordInspectionImgService.selectImgByInspectionId(ids);
System.out.println("巡检图片"+recordInspectionImgs.size()); System.out.println("巡检图片"+recordInspectionImgs.size());

@ -1,6 +1,8 @@
package com.ruoyi.manage.mapper; package com.ruoyi.manage.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.manage.domain.RecordInspectionInfo;
import com.ruoyi.manage.domain.RecordInspectionTask; import com.ruoyi.manage.domain.RecordInspectionTask;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
@ -59,4 +61,6 @@ public interface RecordInspectionTaskMapper
* @return * @return
*/ */
public int deleteRecordInspectionTaskByObjids(String[] objids); public int deleteRecordInspectionTaskByObjids(String[] objids);
List<RecordInspectionInfo> iRecordInspectionTaskService(String[] strArray);
} }

@ -1,6 +1,8 @@
package com.ruoyi.manage.service; package com.ruoyi.manage.service;
import java.util.List; import java.util.List;
import com.ruoyi.manage.domain.RecordInspectionInfo;
import com.ruoyi.manage.domain.RecordInspectionTask; import com.ruoyi.manage.domain.RecordInspectionTask;
/** /**
@ -58,4 +60,6 @@ public interface IRecordInspectionTaskService
* @return * @return
*/ */
public int deleteRecordInspectionTaskByObjid(Long objid); public int deleteRecordInspectionTaskByObjid(Long objid);
List<RecordInspectionInfo> selectTaskInfoByInspectionId(String ids);
} }

@ -3,28 +3,7 @@ package com.ruoyi.manage.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.manage.domain.RecordInspectionInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.manage.mapper.RecordInspectionTaskMapper; import com.ruoyi.manage.mapper.RecordInspectionTaskMapper;
@ -114,4 +93,9 @@ public class RecordInspectionTaskServiceImpl implements IRecordInspectionTaskSer
public int deleteRecordInspectionTaskByObjid(Long objid) { public int deleteRecordInspectionTaskByObjid(Long objid) {
return recordInspectionTaskMapper.deleteRecordInspectionTaskByObjid(objid); return recordInspectionTaskMapper.deleteRecordInspectionTaskByObjid(objid);
} }
@Override
public List<RecordInspectionInfo> selectTaskInfoByInspectionId(String ids) {
return recordInspectionTaskMapper.iRecordInspectionTaskService(Convert.toStrArray(ids));
}
} }

@ -72,5 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{objid} #{objid}
</foreach> </foreach>
</delete> </delete>
<select id="iRecordInspectionTaskService" resultMap="RecordInspectionTaskResult">
<include refid="selectRecordInspectionTaskVo"/>
where inspection_id in
<foreach item="objid" collection="array" open="(" separator="," close=")">
#{objid}
</foreach>
</select>
</mapper> </mapper>
Loading…
Cancel
Save