✨ 报告分页列表

tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java

@@ -18,6 +18,7 @@ import com.inscloudtech.common.utils.file.FileUploadUtils;
 import com.inscloudtech.functional.domain.TestReport;
 import com.inscloudtech.functional.domain.TestReportSubmit;
 import com.inscloudtech.functional.service.TestReportService;
+import com.inscloudtech.functional.service.TestReportSubmitService;
 import com.inscloudtech.system.domain.SysOss;
 import com.inscloudtech.system.domain.vo.SysOssVo;
 import com.inscloudtech.system.service.ISysOssService;
@@ -45,6 +46,9 @@ public class TestReportController {
 
     private final ISysOssService iSysOssService;
 
+    private final TestReportSubmitService testReportSubmitService;
+
+
     /**
      * 分页查询
      * @param
@@ -87,14 +91,35 @@ public class TestReportController {
     @Log(title = "测试报告管理", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     public R add(@RequestBody TestReportSubmit vo) {
-
         return R.ok(testReportService.add(vo));
     }
 
     /**
-     * 上传测试报告文件
-     *
+     * 测试报告分页查询
+     * @param
+     * @param
+     * @return
      */
+    @GetMapping("/pageSubmit" )
+    public TableDataInfo<TestReport> pageSubmit(PageQuery pageQuery, TestReportSubmit testReport) {
+        Page page = new Page();
+        page.setSize(pageQuery.getPageSize());
+        page.setCurrent(pageQuery.getPageNum());
+        if (!StpUtil.hasRole("admin")) {
+            testReport.setCreateBy(LoginHelper.getUserId().toString());
+        }
+
+        Page result = testReportSubmitService.page(page, Wrappers.query(testReport));
+        TableDataInfo dataInfo = new TableDataInfo();
+        dataInfo.setTotal(result.getTotal());
+        dataInfo.setRows(result.getRecords());
+        return dataInfo;
+    }
+
+//    /**
+//     * 上传测试报告文件
+//     *
+//     */
     @Log(title = "测试报告管理", businessType = BusinessType.INSERT)
     @PostMapping(value = "/uploadReport", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R upload( @RequestPart("file") MultipartFile file,

tp-functional/src/main/java/com/inscloudtech/functional/service/TestReportSubmitService.java

@@ -0,0 +1,12 @@
+package com.inscloudtech.functional.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.inscloudtech.functional.domain.TestReportSubmit;
+
+
+
+public interface TestReportSubmitService extends IService<TestReportSubmit> {
+
+}
+

tp-functional/src/main/java/com/inscloudtech/functional/service/impl/TestReportServiceImpl.java

@@ -221,7 +221,7 @@ public class TestReportServiceImpl extends ServiceImpl<TestReportMapper, TestRep
                 .orderByAsc(SysDictData::getDictSort));
         Map<String, List<SysDictData>> groupByType = sysDictDataList.stream().collect(Collectors.groupingBy(SysDictData::getDictType));
         for (String option : groupByType.keySet()) {
-            List<SysDictData> report_option_1 = groupByType.get("report_option_1");
+            List<SysDictData> report_option_1 = groupByType.get(option);
             Optional<SysDictData> first = report_option_1.stream().filter(item -> item.getDictValue().equals(vo.getReportOption1())).findFirst();
             if (!first.isPresent()) {
                 continue;

tp-functional/src/main/java/com/inscloudtech/functional/service/impl/TestReportSubmitServiceImpl.java

@@ -0,0 +1,37 @@
+package com.inscloudtech.functional.service.impl;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.inscloudtech.common.constant.UserConstants;
+import com.inscloudtech.common.core.domain.entity.SysDictData;
+import com.inscloudtech.common.exception.ServiceException;
+import com.inscloudtech.common.helper.LoginHelper;
+import com.inscloudtech.functional.domain.TestReport;
+import com.inscloudtech.functional.domain.TestReportSubmit;
+import com.inscloudtech.functional.mapper.DictDataMapper;
+import com.inscloudtech.functional.mapper.TestReportMapper;
+import com.inscloudtech.functional.mapper.TestReportSubmitMapper;
+import com.inscloudtech.functional.service.TestReportService;
+import com.inscloudtech.functional.service.TestReportSubmitService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * @author zfcf
+ * @date 2024-08-28
+ */
+@Service
+@RequiredArgsConstructor
+public class TestReportSubmitServiceImpl extends ServiceImpl<TestReportSubmitMapper, TestReportSubmit> implements TestReportSubmitService {
+
+
+}