bug修复

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/domain/other/WReport.java

@@ -1,10 +1,12 @@
 package com.zfjg.manage.api.domain.other;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -66,4 +68,8 @@ public class WReport implements Serializable {
     private LocalDateTime createTime;
 
     private LocalDateTime updateTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime sTime;
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/WReportDto.java

@@ -1,10 +1,13 @@
 package com.zfjg.manage.api.dto.other;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -31,4 +34,8 @@ public class WReportDto {
     private List<String> doHandler;
 
     private String caseData;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime sTime;
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/WReportQuery.java

@@ -8,6 +8,8 @@ import java.time.LocalDateTime;
 
 @Data
 public class WReportQuery {
+    private Long id;
+
     private String orgId;
 
     private String username;
@@ -20,5 +22,9 @@ public class WReportQuery {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime sTime;
+
     private String year;
 }

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/vo/other/WReportVo.java

@@ -1,6 +1,8 @@
 package com.zfjg.manage.api.vo.other;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zfjg.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +11,7 @@ import java.time.LocalDateTime;
 
 @Data
 public class WReportVo {
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     private String orgId;

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/WReportController.java

@@ -63,12 +63,19 @@ public class WReportController extends BaseController {
         String apkUrl = wReportBizService.removeReport(id);
         return R.ok(apkUrl);
     }
+
     @ApiOperation(value = "详情")
     @GetMapping("/info")
-    public R<WReportDto> info(@RequestParam Long id) {
+    public R<WReportDto> info(@RequestParam String ids) {
+        Long id = 0L;
+        try {
+            id = Long.parseLong(ids);
+        } catch (Exception e) {
+            return R.fail();
+        }
         WReportDto wReportDto1 = Optional.ofNullable(wReportBizService.info(id)).map(e -> {
             WReportDto wReportDto = new WReportDto();
-            BeanUtils.copyProperties(e,wReportDto);
+            BeanUtils.copyProperties(e, wReportDto);
             wReportDto.setFiles(Optional.ofNullable(e.getFDown()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
             wReportDto.setDoHandler(Optional.ofNullable(e.getDDo()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
             wReportDto.setNotCategory(Optional.ofNullable(e.getNType()).map(item -> Arrays.asList(item.split("\\|\\|\\|"))).orElseGet(ArrayList::new));
@@ -118,5 +125,4 @@ public class WReportController extends BaseController {
     }
 
 
-
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/WReportServiceImpl.java

@@ -22,8 +22,10 @@ import com.zfjg.system.api.RemoteUserService;
 import com.zfjg.system.api.domain.SysDept;
 import com.zfjg.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -102,9 +104,20 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
     @Override
     public List<WReport> reportDetail(WReportQuery wReportQuery) {
         LambdaQueryWrapper<WReport> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(WReport::getOrgId, wReportQuery.getOrgId());
+        if (ObjectUtil.isNotEmpty(wReportQuery.getId())) {
+            queryWrapper.eq(WReport::getId, wReportQuery.getId());
+        }
+        if (StringUtils.isNotEmpty(wReportQuery.getYear())) {
+            if (!wReportQuery.getYear().equals("2024")) {
+                return new ArrayList<>();
+            }
+        }
+        if (StringUtils.isNoneBlank(wReportQuery.getOrgId())) {
+            queryWrapper.eq(WReport::getOrgId, wReportQuery.getOrgId());
+        }
         if (StringUtils.isNoneBlank(wReportQuery.getUsername())) {
-            queryWrapper.eq(WReport::getWUser, wReportQuery.getUsername());
+            R<SysUser> info2 = remoteUserService.getInfo2(wReportQuery.getUsername(), SecurityConstants.INNER);
+            queryWrapper.eq(WReport::getWUser, info2.getData().getNickName());
         }
         if (ObjectUtil.isNotEmpty(wReportQuery.getStartTime())) {
             queryWrapper.gt(WReport::getCreateTime, wReportQuery.getStartTime());
@@ -118,13 +131,15 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
     @Override
     public TableInfo<WReportVo> listReport(WReportQuery wReportQuery) {
         QueryWrapper<WReport> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(wReportQuery.getYear())) {
+            if (!wReportQuery.getYear().equals("2024")) {
+                return new TableInfo<>();
+            }
+        }
         if (StringUtils.isNoneBlank(wReportQuery.getOrgId())) {
             queryWrapper.eq("org_id", wReportQuery.getOrgId());
         }
-        if (StringUtils.isNoneBlank(wReportQuery.getYear())){
-            queryWrapper.ge("create_time", wReportQuery.getYear());
-            queryWrapper.le("create_time", wReportQuery.getYear());
-        }
+
         if (StringUtils.isNoneBlank(wReportQuery.getUsername())) {
             R<SysUser> info2 = remoteUserService.getInfo2(wReportQuery.getUsername(), SecurityConstants.INNER);
             queryWrapper.eq("w_user", info2.getData().getNickName());
@@ -135,7 +150,7 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
         if (ObjectUtil.isNotEmpty(wReportQuery.getEndTime())) {
             queryWrapper.lt("create_time", wReportQuery.getEndTime());
         }
-        queryWrapper.groupBy("org_id");
+        queryWrapper.groupBy("org_id", "w_user");
         queryWrapper.select("ANY_VALUE(id) as id", "ANY_VALUE(org_id) as org_id", "ANY_VALUE(org_name) as org_name", "ANY_VALUE(w_user) as w_user", "ANY_VALUE(create_time) as create_time", "ANY_VALUE(w_type) as w_type", "sum(w_type_c) as w_type_c", "ANY_VALUE(n_type) as n_type", "sum(n_type_c) as n_type_c", "ANY_VALUE(s_type) as s_type", "sum(s_type_c) as s_type_c");
 //        queryWrapper.select("id", "org_id", "org_name", "w_user", "create_time", "w_type", "w_type_c", "n_type", "n_type_c", "s_type", "as s_type_c");
         List<WReport> wReports = this.list(queryWrapper);
@@ -171,7 +186,7 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
         if (StringUtils.isNoneBlank(wReportQuery.getOrgId())) {
             queryWrapper.eq("org_id", wReportQuery.getOrgId());
         }
-        if (StringUtils.isNoneBlank(wReportQuery.getYear())){
+        if (StringUtils.isNoneBlank(wReportQuery.getYear())) {
             queryWrapper.ge("create_time", wReportQuery.getYear());
             queryWrapper.le("create_time", wReportQuery.getYear());
         }