<select id="getInspectFileList" resultType="com.taauav.front.vo.LsInspectFileVo"> | <select id="getInspectFileList" resultType="com.taauav.front.vo.LsInspectFileVo"> | ||||
select f.id, q.id as 'questionId', i.id as 'inspectDriverId', d.id as 'driverId', a.realname as 'driverManagerName', | select f.id, q.id as 'questionId', i.id as 'inspectDriverId', d.id as 'driverId', a.realname as 'driverManagerName', | ||||
i.execution_time, f.gaode_latitude as 'latitude', f.gaode_longitude as 'longitude' | |||||
i.execution_time, f.gaode_latitude as 'latitude', f.gaode_longitude as 'longitude', d.name as 'driverName' | |||||
from tauv_inspect_file as f | from tauv_inspect_file as f | ||||
left join tauv_question_options as q on f.question_id = q.id | left join tauv_question_options as q on f.question_id = q.id | ||||
left join tauv_inspect_driver as i on f.inspect_driver_id = i.id | left join tauv_inspect_driver as i on f.inspect_driver_id = i.id | ||||
<if test="param != null and param.beginTime != null and param.beginTime != ''"> | <if test="param != null and param.beginTime != null and param.beginTime != ''"> | ||||
and i.execution_time between concat(#{param.beginTime}, ' 00:00:00') and concat(#{param.endTime}, ' 23:59:59') | and i.execution_time between concat(#{param.beginTime}, ' 00:00:00') and concat(#{param.endTime}, ' 23:59:59') | ||||
</if> | </if> | ||||
order by i.execution_time desc | |||||
</select> | </select> | ||||
</mapper> | </mapper> |
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.admin.entity.TauvInspectFile; | import com.taauav.admin.entity.TauvInspectFile; | ||||
import com.taauav.common.service.IBaseService; | import com.taauav.common.service.IBaseService; | ||||
import com.taauav.front.vo.LSInspectFileDataVo; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
* @return | * @return | ||||
*/ | */ | ||||
TauvInspectFile getInfoByDriverIdAndQuestionId(Integer inspectDriverId, Integer questionId); | TauvInspectFile getInfoByDriverIdAndQuestionId(Integer inspectDriverId, Integer questionId); | ||||
/** | |||||
* 根据附件id获取数据 | |||||
* @param fileId | |||||
* @return | |||||
*/ | |||||
Response getDetailById(Integer fileId); | |||||
} | } |
import com.taauav.admin.service.*; | import com.taauav.admin.service.*; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | import com.taauav.common.service.impl.BaseServiceImpl; | ||||
import com.taauav.common.util.*; | import com.taauav.common.util.*; | ||||
import com.taauav.front.vo.LSInspectFileDataVo; | |||||
import org.apache.commons.beanutils.ConvertUtils; | import org.apache.commons.beanutils.ConvertUtils; | ||||
import org.apache.commons.codec.digest.DigestUtils; | import org.apache.commons.codec.digest.DigestUtils; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
TauvInspectFile fileInfo = getOne(wrapper); | TauvInspectFile fileInfo = getOne(wrapper); | ||||
return fileInfo; | return fileInfo; | ||||
} | } | ||||
@Override | |||||
public Response getDetailById(Integer fileId) { | |||||
LSInspectFileDataVo inspectFileDataVo = new LSInspectFileDataVo(); | |||||
TauvInspectFile inspectFile = getInfoById(fileId); | |||||
if (inspectFile == null) { | |||||
return response.failure("问题数据不存在!"); | |||||
} | |||||
inspectFileDataVo.setId(fileId); | |||||
inspectFileDataVo.setInspectDriverId(inspectFile.getInspectDriverId()); | |||||
if (inspectFile.getThumbImg() != null && inspectFile.getThumbImg() != "") { | |||||
String path = inspectFile.getThumbImg().replace("_1", "_2"); | |||||
inspectFileDataVo.setFilePath(uploadUrl + path); | |||||
} | |||||
TauvInspectDriver inspectDriver = inspectDriverMapper.selectById(inspectFile.getInspectDriverId()); | |||||
if (inspectDriver != null) { | |||||
inspectFileDataVo.setDriverName(inspectDriver.getDriverName()); | |||||
inspectFileDataVo.setExecutionTime(inspectDriver.getExecutionTime()); | |||||
String cityText = iSysCityService.getCityName(inspectDriver.getDriverArea()); | |||||
inspectFileDataVo.setDriverAreaName(cityText); | |||||
QueryWrapper wrapper = new QueryWrapper(); | |||||
wrapper.eq("inspect_driver_id", inspectDriver.getId()); | |||||
wrapper.eq("num", inspectDriver.getNum()); | |||||
wrapper.eq("mark", 1); | |||||
wrapper.eq("status", 3); | |||||
wrapper.last("limit 1"); | |||||
TauvReport report = reportMapper.selectOne(wrapper); | |||||
if (report != null) { | |||||
inspectFileDataVo.setReportId(report.getId()); | |||||
} | |||||
} | |||||
TauvQuestionOptions questionOptions = questionOptionsMapper.selectById(inspectFile.getQuestionId()); | |||||
if (questionOptions != null) { | |||||
Map<Integer, String> categoryList = questionOptions.getCategoryList(); | |||||
String categoryText = !StringUtils.isEmpty(categoryList.get(questionOptions.getCategory())) ? categoryList.get(questionOptions.getCategory()) : ""; | |||||
inspectFileDataVo.setCategoryText(categoryText); | |||||
Map<Integer, String> typeList = questionOptions.getTypeList(); | |||||
String typeText = !StringUtils.isEmpty(typeList.get(questionOptions.getType())) ? typeList.get(questionOptions.getType()) : ""; | |||||
inspectFileDataVo.setQuestionTypeText(typeText); | |||||
inspectFileDataVo.setQuestionContent(questionOptions.getContent()); | |||||
} | |||||
return response.success(inspectFileDataVo); | |||||
} | |||||
} | } |
import com.taauav.admin.service.ILsAdminService; | import com.taauav.admin.service.ILsAdminService; | ||||
import com.taauav.admin.service.ILsAuthGroupService; | import com.taauav.admin.service.ILsAuthGroupService; | ||||
import com.taauav.admin.service.ILsCityService; | import com.taauav.admin.service.ILsCityService; | ||||
import com.taauav.admin.service.ITauvInspectFileService; | |||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.common.util.StringUtils; | import com.taauav.common.util.StringUtils; | ||||
import com.taauav.front.dto.LsInspectFileDTO; | import com.taauav.front.dto.LsInspectFileDTO; | ||||
private ILsAdminService lsAdminService; | private ILsAdminService lsAdminService; | ||||
@Autowired | @Autowired | ||||
private Response response; | private Response response; | ||||
@Autowired | |||||
private ITauvInspectFileService inspectFileService; | |||||
/** | /** | ||||
* 获取地图权限内区、镇/街道级数据 | * 获取地图权限内区、镇/街道级数据 | ||||
public Response getQuestionPointList(LsInspectFileDTO inspectFileDTO) { | public Response getQuestionPointList(LsInspectFileDTO inspectFileDTO) { | ||||
return lsAdminService.getQuestionList(inspectFileDTO); | return lsAdminService.getQuestionList(inspectFileDTO); | ||||
} | } | ||||
/** | |||||
* 获取问题详情 | |||||
* @param inspectFileId | |||||
* @return | |||||
*/ | |||||
@GetMapping("/detail") | |||||
public Response getQuestionDetail(@RequestParam("inspectFileId") Integer inspectFileId) { | |||||
return inspectFileService.getDetailById(inspectFileId); | |||||
} | |||||
} | } |
package com.taauav.front.vo; | |||||
import lombok.Data; | |||||
import java.util.Date; | |||||
/** | |||||
* @author daixiantong | |||||
*/ | |||||
@Data | |||||
public class LSInspectFileDataVo { | |||||
private Integer id; | |||||
private Integer driverId; | |||||
private Integer inspectDriverId; | |||||
private Integer reportId; | |||||
private String driverName; | |||||
private String driverAreaName; | |||||
private Date executionTime; | |||||
private String categoryText; | |||||
private String questionTypeText; | |||||
private String questionContent; | |||||
private String filePath; | |||||
} |
*/ | */ | ||||
private Integer inspectDriverId; | private Integer inspectDriverId; | ||||
/** | |||||
* 河湖名称 | |||||
*/ | |||||
private String driverName; | |||||
/** | /** | ||||
* 河长姓名 | * 河长姓名 | ||||
*/ | */ |