@Data | @Data | ||||
public class TauvInspectDriverDTO extends BaseInspectDriverDTO { | public class TauvInspectDriverDTO extends BaseInspectDriverDTO { | ||||
/** | /** | ||||
* 飞行小组 | |||||
* 飞手 | |||||
*/ | */ | ||||
private String flightGroup; | |||||
private String flightGroupText; | |||||
private String flightHand; | |||||
private String flightHandText; | |||||
/** | /** | ||||
* 添加时间 | * 添加时间 | ||||
*/ | */ | ||||
private String driverEnd; | private String driverEnd; | ||||
/** | /** | ||||
* 执行开始时间 | |||||
* 执行时间 | |||||
*/ | */ | ||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||||
private Date executionStartTime; | |||||
private String formatExecutionStartTime; | |||||
/** | |||||
* 执行结束时间 | |||||
*/ | |||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
private Date executionEndTime; | |||||
private String formatExecutionEndTime; | |||||
private Date executionTime; | |||||
private String formatExecutionTime; | |||||
/** | /** | ||||
* 飞行时长 | * 飞行时长 |
/** | /** | ||||
* 巡检开始时间 | * 巡检开始时间 | ||||
*/ | */ | ||||
private Integer executionStartTime; | |||||
private String formatExecutionStartTime; | |||||
private Integer executionTime; | |||||
private String formatExecutionTime; | |||||
/** | /** | ||||
* 最近上传时间 | * 最近上传时间 | ||||
*/ | */ |
<if test="param.inspectTime != null and param.inspectTime != ''"> | <if test="param.inspectTime != null and param.inspectTime != ''"> | ||||
and inspect.inspect_time >= #{param.inspectTime} | and inspect.inspect_time >= #{param.inspectTime} | ||||
</if> | </if> | ||||
<!-- <if test="param.flightGroup != null and param.flightGroup != ''">--> | |||||
<!-- and driver.flight_group = #{param.flightGroup}--> | |||||
<!-- <if test="param.flightHand != null and param.flightHand != ''">--> | |||||
<!-- and driver.flight_hand = #{param.flightHand}--> | |||||
<!-- </if>--> | <!-- </if>--> | ||||
<if test="param.status != null and param.status != '' "> | <if test="param.status != null and param.status != '' "> | ||||
and driver.status in | and driver.status in | ||||
</if> | </if> | ||||
<if test="param.allocation != null and param.allocation>0"> | <if test="param.allocation != null and param.allocation>0"> | ||||
and driver.flight_group > 0 | |||||
and driver.flight_hand > 0 | |||||
</if> | </if> | ||||
<!-- <if test="param.driverExam != null and param.driverExam > 0">--> | <!-- <if test="param.driverExam != null and param.driverExam > 0">--> | ||||
<!-- and driver.driver_exam = #{param.driverExam}--> | <!-- and driver.driver_exam = #{param.driverExam}--> | ||||
</foreach> | </foreach> | ||||
</if> | </if> | ||||
<if test="param.flightGroup != null and param.flightGroup>0"> | |||||
and flight_group = #{param.flightGroup} | |||||
<if test="param.flightHand != null and param.flightHand>0"> | |||||
and flight_hand = #{param.flightHand} | |||||
</if> | </if> | ||||
<if test="param.startTime !=null and param.endTime != null"> | <if test="param.startTime !=null and param.endTime != null"> | ||||
and execution_start_time between #{param.startTime} and #{param.endTime} | |||||
and execution_time between #{param.startTime} and #{param.endTime} | |||||
</if> | </if> | ||||
<if test="param.isReview != null and param.isReview>0"> | <if test="param.isReview != null and param.isReview>0"> | ||||
and is_review = #{param.isReview} | and is_review = #{param.isReview} | ||||
<!-- <if test="param.driverExam != null and param.driverExam > 0">--> | <!-- <if test="param.driverExam != null and param.driverExam > 0">--> | ||||
<!-- and driver_exam = #{param.driverExam}--> | <!-- and driver_exam = #{param.driverExam}--> | ||||
<!-- </if>--> | <!-- </if>--> | ||||
order by status asc,execution_start_time desc,inspect_no desc,num asc,id desc | |||||
order by status asc,execution_time desc,inspect_no desc,num asc,id desc | |||||
</select> | </select> | ||||
</mapper> | </mapper> |
</foreach> | </foreach> | ||||
</if> | </if> | ||||
<if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if> | <if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if> | ||||
<if test="param.flightGroup != null and param.flightGroup > 0"> and a.flight_group = #{param.flightGroup}</if> | |||||
<if test="param.flightHand != null and param.flightHand > 0"> and a.flight_hand = #{param.flightHand}</if> | |||||
<if test="param.driverArea != null and param.driverArea !=''"> and a.driver_area in | <if test="param.driverArea != null and param.driverArea !=''"> and a.driver_area in | ||||
<foreach collection="param.driverArea" item="area" open="(" close=")" separator=","> | <foreach collection="param.driverArea" item="area" open="(" close=")" separator=","> | ||||
#{area} | #{area} | ||||
<!--内部用户报告数据查询--> | <!--内部用户报告数据查询--> | ||||
<select id="getInnerUserSearchDataList" parameterType="java.util.Map" resultType="com.taauav.admin.dto.TauvReportDTO"> | <select id="getInnerUserSearchDataList" parameterType="java.util.Map" resultType="com.taauav.admin.dto.TauvReportDTO"> | ||||
select a.* from tauv_report a left join tauv_report_check b on a.id=b.report_id | select a.* from tauv_report a left join tauv_report_check b on a.id=b.report_id | ||||
where a.mark=1 and (a.flight_group = #{param.adminId} or b.check_user = #{param.adminId}) | |||||
where a.mark=1 and (a.flight_hand = #{param.adminId} or b.check_user = #{param.adminId}) | |||||
<if test="param.status != null and param.status != ''"> | <if test="param.status != null and param.status != ''"> | ||||
and a.status in <foreach collection="param.status" item="status" separator="," open="(" close=")"> | and a.status in <foreach collection="param.status" item="status" separator="," open="(" close=")"> | ||||
#{status} | #{status} | ||||
</if> | </if> | ||||
<if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if> | <if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if> | ||||
<if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if> | <if test="param.inspectStatus != null and param.inspectStatus >0"> and b.status = #{param.inspectStatus}</if> | ||||
<if test="param.flightGroup != null and param.flightGroup > 0"> and a.flight_group = #{param.flightGroup}</if> | |||||
<if test="param.flightHand != null and param.flightHand > 0"> and a.flight_hand = #{param.flightHand}</if> | |||||
<if test="param.driverArea != null and param.driverArea !=''"> and a.driver_area in | <if test="param.driverArea != null and param.driverArea !=''"> and a.driver_area in | ||||
<foreach collection="param.driverArea" item="area" open="(" close=")" separator=","> | <foreach collection="param.driverArea" item="area" open="(" close=")" separator=","> | ||||
#{area} | #{area} |
* @param admin | * @param admin | ||||
* @return | * @return | ||||
*/ | */ | ||||
Boolean isFlightGroup(SysAdmin admin); | |||||
Boolean isFlightHand(SysAdmin admin); | |||||
} | } |
* @return | * @return | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Boolean isFlightGroup(SysAdmin admin) { | |||||
public Boolean isFlightHand(SysAdmin admin) { | |||||
QueryWrapper wrapper = new QueryWrapper(); | QueryWrapper wrapper = new QueryWrapper(); | ||||
wrapper.eq("mark", 1); | wrapper.eq("mark", 1); | ||||
wrapper.eq("name", "flight_auth_group"); | wrapper.eq("name", "flight_auth_group"); |
return response.failure(info.get("error")); | return response.failure(info.get("error")); | ||||
} | } | ||||
Integer groupId = (Integer) info.get("flightGroup"); | Integer groupId = (Integer) info.get("flightGroup"); | ||||
Long startTime = new Long(info.get("executionStartTime").toString()); | |||||
Long startTime = new Long(info.get("executionTime").toString()); | |||||
Long inspectTime = new Long(info.get("inspectTime").toString()); | Long inspectTime = new Long(info.get("inspectTime").toString()); | ||||
if (startTime > 0) { | if (startTime > 0) { | ||||
info.put("executionTime", FunctionUtils.formatTime(startTime.intValue(), "yyyy-MM-dd HH:mm:ss")); | info.put("executionTime", FunctionUtils.formatTime(startTime.intValue(), "yyyy-MM-dd HH:mm:ss")); | ||||
info.put("executionTime", ""); | info.put("executionTime", ""); | ||||
} | } | ||||
if (inspectTime > 0) { | if (inspectTime > 0) { | ||||
info.put("formatinspectTime", FunctionUtils.formatTime(inspectTime.intValue(), "yyyy-MM-dd HH:mm:ss")); | |||||
info.put("formatInspectTime", FunctionUtils.formatTime(inspectTime.intValue(), "yyyy-MM-dd HH:mm:ss")); | |||||
} else { | } else { | ||||
info.put("formatinspectTime", ""); | |||||
info.put("formatInspectTime", ""); | |||||
} | } | ||||
SysAdmin adminInfo = iSysAdminService.getAdminInfo(groupId); | SysAdmin adminInfo = iSysAdminService.getAdminInfo(groupId); | ||||
info.put("flightGroupText", StringUtils.isEmpty(adminInfo) ? "" : adminInfo.getRealname()); | info.put("flightGroupText", StringUtils.isEmpty(adminInfo) ? "" : adminInfo.getRealname()); | ||||
// driver.setFormatExecutionEndTime(FunctionUtils.formatTime(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss")); | // driver.setFormatExecutionEndTime(FunctionUtils.formatTime(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss")); | ||||
driver.setFormatCreateTime(DateUtil.format(driver.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); | driver.setFormatCreateTime(DateUtil.format(driver.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); | ||||
driver.setFormatInspectTime(DateUtil.format(driver.getInspectTime(), "yyyy-MM-dd HH:mm:ss")); | driver.setFormatInspectTime(DateUtil.format(driver.getInspectTime(), "yyyy-MM-dd HH:mm:ss")); | ||||
if (!StringUtils.isEmpty(driver.getExecutionStartTime())) { | |||||
driver.setFormatExecutionStartTime(DateUtil.format(driver.getExecutionStartTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
} | |||||
if (!StringUtils.isEmpty(driver.getExecutionEndTime())) { | |||||
driver.setFormatExecutionEndTime(DateUtil.format(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
if (!StringUtils.isEmpty(driver.getExecutionTime())) { | |||||
driver.setFormatExecutionTime(DateUtil.format(driver.getExecutionTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
} | } | ||||
// if (!StringUtils.isEmpty(driver.getExecutionEndTime())) { | |||||
// driver.setFormatExecutionEndTime(DateUtil.format(driver.getExecutionEndTime(), "yyyy-MM-dd HH:mm:ss")); | |||||
// } | |||||
if (!StringUtils.isEmpty(driver.getDriverArea())) { | if (!StringUtils.isEmpty(driver.getDriverArea())) { | ||||
SysCity cityInfo = iSysCityService.getInfoById(driver.getDriverArea()); | SysCity cityInfo = iSysCityService.getInfoById(driver.getDriverArea()); | ||||
driver.setDriverAreaText(StringUtils.isEmpty(cityInfo) ? "" : cityInfo.getName()); | driver.setDriverAreaText(StringUtils.isEmpty(cityInfo) ? "" : cityInfo.getName()); |
Map<Integer, String> statusList = picDTO.getStatusList(); | Map<Integer, String> statusList = picDTO.getStatusList(); | ||||
String format = "yyyy-MM-dd HH:mm:ss"; | String format = "yyyy-MM-dd HH:mm:ss"; | ||||
for (TauvInspectDriverPicDTO driverPicDTO : list) { | for (TauvInspectDriverPicDTO driverPicDTO : list) { | ||||
Integer executionStartTime = driverPicDTO.getExecutionStartTime(); | |||||
if (!StringUtils.isEmpty(executionStartTime)) { | |||||
driverPicDTO.setFormatExecutionStartTime(FunctionUtils.formatTime(executionStartTime, format)); | |||||
Integer executionTime = driverPicDTO.getExecutionTime(); | |||||
if (!StringUtils.isEmpty(executionTime)) { | |||||
driverPicDTO.setFormatExecutionTime(FunctionUtils.formatTime(executionTime, format)); | |||||
} | } | ||||
Integer status = driverPicDTO.getStatus().intValue(); | Integer status = driverPicDTO.getStatus().intValue(); | ||||
driverPicDTO.setStatusText(StringUtils.isEmpty(status) ? "" : statusList.get(status)); | driverPicDTO.setStatusText(StringUtils.isEmpty(status) ? "" : statusList.get(status)); |
// String cityIdStr = adminInfo.getCityIds(); | // String cityIdStr = adminInfo.getCityIds(); | ||||
if (!"1".equals(adminId.toString())) { | if (!"1".equals(adminId.toString())) { | ||||
// 谁执行的报告谁生成 | // 谁执行的报告谁生成 | ||||
map.put("flightGroup", adminId); | |||||
map.put("flightHand", adminId); | |||||
} | } | ||||
// 生成的报告必须是已复核完成的 | // 生成的报告必须是已复核完成的 | ||||
map.put("inspectStatus", 6); | map.put("inspectStatus", 6); |