From afa42b3c7d410879a11b18883387bd1019ccb86e Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 12 八月 2025 14:24:46 +0800
Subject: [PATCH] 时间戳更新，25年8月底 修改任务记录导出数据接口参数字段 增加任务记录查询条件
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
index 98702f1..e2eeaa0 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -164,11 +164,12 @@
if(null != vo.getSysStatus() && !vo.getSysStatus().isEmpty()){
Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
+ .eq("task_detail_id", vo.getId())
.in("sys_status", vo.getSysStatus());
if (null != vo.getHavePic()){
- if(vo.getHavePic()==0){
+ if(vo.getHavePic().equals("0")){
channelWrapper.isNull("image_url");
- }else if(vo.getHavePic()==1){
+ }else if(vo.getHavePic().equals("1")){
channelWrapper.isNotNull("image_url");
}
}
@@ -181,11 +182,12 @@
}
if(null != vo.getArtificialStatus()&& !vo.getArtificialStatus().isEmpty()){
Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
+ .eq("task_detail_id", vo.getId())
.in("artificial_status", vo.getArtificialStatus());
if (null != vo.getHavePic()){
- if(vo.getHavePic()==0){
+ if(vo.getHavePic().equals("0")){
channelWrapper.isNull("image_url");
- }else if(vo.getHavePic()==1){
+ }else if(vo.getHavePic().equals("1")){
channelWrapper.isNotNull("image_url");
}
}
@@ -246,7 +248,7 @@
if(collect.size() > 0){
collect.add(-1);
}
- List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(),vo.getHavePic());
+ List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(), vo.getHavePic() != null ? Integer.valueOf(vo.getHavePic()) : null);
List<Icon> icons = iconService.selectList(null);
for (PictureDetails pictureDetail : pictureDetails) {
String videoChannel = pictureDetail.getVideoChannel();
@@ -299,7 +301,7 @@
* @param response
*/
@Override
- public void downloadTaskRecord(List<String> ids, String code, Integer status,Integer sysStatus, HttpServletResponse response) {
+ public void downloadTaskRecord(List<String> ids, String code, List<Integer> status,Integer sysStatus, HttpServletResponse response) {
List<Map<String, Object>> mapList = this.baseMapper.getDownloadTaskRecord(ids, code, status,sysStatus);
try {
HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
--
Gitblit v1.7.1