<if test="param.driverName != null and param.driverName!=''"> | <if test="param.driverName != null and param.driverName!=''"> | ||||
and driver_name like CONCAT('%',#{param.driverName},'%') | and driver_name like CONCAT('%',#{param.driverName},'%') | ||||
</if> | </if> | ||||
<!-- <if test="param.driverArea != null and param.driverArea != ''">--> | |||||
<!-- and driver_area in--> | |||||
<!-- <foreach collection="param.driverArea" item="area" open="(" close=")" separator=",">--> | |||||
<!-- #{area}--> | |||||
<!-- </foreach>--> | |||||
<!-- </if>--> | |||||
<if test="param.driverArea != null and param.driverArea != ''"> | <if test="param.driverArea != null and param.driverArea != ''"> | ||||
and driver_area in | |||||
<foreach collection="param.driverArea" item="area" open="(" close=")" separator=","> | |||||
#{area} | |||||
</foreach> | |||||
and driver_area = #{param.driverArea} | |||||
</if> | </if> | ||||
<if test="param.status != null and param.status != '' "> | <if test="param.status != null and param.status != '' "> |
if (map.containsKey("driverAreaType") && !StringUtils.isEmpty(map.get("driverAreaType")) && map.containsKey("driverArea") && !StringUtils.isEmpty(map.get("driverArea"))) { | if (map.containsKey("driverAreaType") && !StringUtils.isEmpty(map.get("driverAreaType")) && map.containsKey("driverArea") && !StringUtils.isEmpty(map.get("driverArea"))) { | ||||
Integer driverAreaType = Integer.valueOf(map.get("driverAreaType").toString()); | Integer driverAreaType = Integer.valueOf(map.get("driverAreaType").toString()); | ||||
BigInteger driverArea = BigInteger.valueOf(Long.valueOf(map.get("driverArea").toString())); | BigInteger driverArea = BigInteger.valueOf(Long.valueOf(map.get("driverArea").toString())); | ||||
List<BigInteger> cityIds = new ArrayList<>(); | |||||
if (driverArea != null) { | |||||
if (driverAreaType == 1) { | |||||
// 区划所有(取本级及子级区划ID) | |||||
cityIds = lsCityService.getChildCityIds(driverArea); | |||||
// 加入当前选中的区划 | |||||
cityIds.add(driverArea); | |||||
} else { | |||||
// 本级河湖区划 | |||||
cityIds.add(driverArea); | |||||
} | |||||
} | |||||
String cityIdsStr = org.apache.commons.lang3.StringUtils.join(cityIds.toArray(), ","); | |||||
String[] cityIdsList = cityIdsStr.split(","); | |||||
map.put("driverArea", cityIdsList); | |||||
// List<BigInteger> cityIds = new ArrayList<>(); | |||||
// if (driverArea != null) { | |||||
// if (driverAreaType == 1) { | |||||
// // 区划所有(取本级及子级区划ID) | |||||
// cityIds = lsCityService.getChildCityIds(driverArea); | |||||
// // 加入当前选中的区划 | |||||
// cityIds.add(driverArea); | |||||
// } else { | |||||
// // 本级河湖区划 | |||||
// cityIds.add(driverArea); | |||||
// } | |||||
// } | |||||
// String cityIdsStr = org.apache.commons.lang3.StringUtils.join(cityIds.toArray(), ","); | |||||
// String[] cityIdsList = cityIdsStr.split(","); | |||||
map.put("driverArea", driverArea); | |||||
} else { | } else { | ||||
map.remove("driverArea"); | map.remove("driverArea"); | ||||
} | } |
// 问题数量 | // 问题数量 | ||||
Integer questionNum = inspectFileService.getReviewNumByInspectDriverId(item.getId(), report.getInspectDriverId()); | Integer questionNum = inspectFileService.getReviewNumByInspectDriverId(item.getId(), report.getInspectDriverId()); | ||||
// 报告备注 | // 报告备注 | ||||
TauvReportRemark remarkInfo = reportRemarkService.getInfoByReportIdAndQuestionId(report.getId(), report.getId()); | |||||
TauvReportRemark remarkInfo = reportRemarkService.getInfoByReportIdAndQuestionId(report.getId(), item.getId()); | |||||
LSReportQuestionListVo reportQuestionListVo = new LSReportQuestionListVo(); | LSReportQuestionListVo reportQuestionListVo = new LSReportQuestionListVo(); | ||||
reportQuestionListVo.setId(item.getId()); | reportQuestionListVo.setId(item.getId()); | ||||
reportQuestionListVo.setCategory(item.getCategory()); | reportQuestionListVo.setCategory(item.getCategory()); |