报告配置列表接口

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/ReportIndexResultController.java

@@ -4,9 +4,11 @@ package com.usky.fire.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.BaseGgpFacility;
 import com.usky.fire.service.ReportIndexResultService;
 import com.usky.fire.service.vo.CompanyDataVo;
 import com.usky.fire.service.vo.IndexResultVo;
+import com.usky.fire.service.vo.ReportResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,5 +50,16 @@ public class ReportIndexResultController {
                                                             @RequestParam(value = "createDate", required = false) String createDate) {
         return ApiResult.success(reportIndexResultService.indexResultSelect(id,createDate));
     }
+
+    /**
+     * 报告对比
+     *
+     * @param reportResultVO
+     * @return
+     */
+    @PostMapping("/reportContrast")
+    public ApiResult<List<Object>> reportContrast(@RequestBody ReportResultVO reportResultVO) {
+        return ApiResult.success(reportIndexResultService.reportContrast(reportResultVO));
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/ReportResultController.java

@@ -3,17 +3,19 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.BaseGgpFacility;
 import com.usky.fire.domain.DemReportInfo;
 import com.usky.fire.domain.ReportResult;
 import com.usky.fire.service.DemReportInfoService;
 import com.usky.fire.service.ReportResultService;
+import com.usky.fire.service.vo.BaseGgpFacilityVO;
+import com.usky.fire.service.vo.ReportResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -45,5 +47,19 @@ public class ReportResultController {
                                                               @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
         return ApiResult.success(reportResultService.reportResultList(companyId,sourceType,pageNum, pageSize));
     }
+    /**
+     * 报告结果-查询
+     *
+     * @param reportObject  报告对象
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("newReportResultList")
+    public ApiResult<CommonPage<Object>> newReportResultList(@RequestParam(value = "reportObject", required = false) String reportObject,
+                                                     @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(reportResultService.newReportResultList(reportObject,pageNum, pageSize));
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/ReportIndexResultService.java

@@ -4,6 +4,7 @@ import com.usky.fire.domain.ReportIndexResult;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.service.vo.CompanyDataVo;
 import com.usky.fire.service.vo.IndexResultVo;
+import com.usky.fire.service.vo.ReportResultVO;
 
 import java.util.List;
 
@@ -28,4 +29,11 @@ public interface ReportIndexResultService extends CrudService<ReportIndexResult>
      * @param createDate   生成日期
      */
     List<IndexResultVo> indexResultSelect(Integer id, String createDate);
+
+    /**
+     * 报告对比
+     *
+     * @param reportResultVO
+     */
+    List<Object> reportContrast(ReportResultVO reportResultVO);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/ReportResultService.java

@@ -24,4 +24,14 @@ public interface ReportResultService extends CrudService<ReportResult> {
      * @return
      */
     CommonPage<ReportResult> reportResultList(Integer companyId, String sourceType, Integer pageNum, Integer pageSize);
+
+    /**
+     * 报告结果-查询
+     *
+     * @param reportObject  报告对象
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    CommonPage<Object> newReportResultList(String reportObject,Integer pageNum, Integer pageSize);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportIndexResultServiceImpl.java

@@ -1609,4 +1609,18 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
 
         return list;
     }
+
+    @Override
+    public List<Object> reportContrast(ReportResultVO reportResultVO) {
+        List<Object> list = new ArrayList<>();
+        LambdaQueryWrapper<ReportResult> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(ReportResult::getId,ReportResult::getObjectId,ReportResult::getReportObject,
+                ReportResult::getCreateDate, ReportResult::getOverallScore)
+                .in(ReportResult::getId,reportResultVO.getReportId());
+        List<ReportResult> list1 = reportResultService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+
+        }
+        return list;
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportResultServiceImpl.java

@@ -6,13 +6,21 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
-import com.usky.fire.domain.DemReportInfo;
+import com.usky.fire.domain.BaseCompanyPerson;
+import com.usky.fire.domain.ReportConfig;
 import com.usky.fire.domain.ReportResult;
 import com.usky.fire.mapper.ReportResultMapper;
+import com.usky.fire.service.ReportConfigService;
 import com.usky.fire.service.ReportResultService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 报告结果表 服务实现类
@@ -23,6 +31,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ReportResultServiceImpl extends AbstractCrudService<ReportResultMapper, ReportResult> implements ReportResultService {
+    @Autowired
+    private ReportConfigService reportConfigService;
+
     @Override
     public CommonPage<ReportResult> reportResultList(Integer companyId, String sourceType, Integer pageNum,
                                                      Integer pageSize) {
@@ -33,4 +44,31 @@ public class ReportResultServiceImpl extends AbstractCrudService<ReportResultMap
         page = this.page(page, queryWrapper);
         return ToCommonPage(page);
     }
+    @Override
+    public CommonPage<Object> newReportResultList(String reportObject, Integer pageNum, Integer pageSize) {
+        List<Object> list = new ArrayList<>();
+        IPage<ReportResult> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<ReportResult> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(reportObject),ReportResult::getReportObject, reportObject)
+                .orderByDesc(ReportResult::getId);
+        page = this.page(page, queryWrapper);
+        LambdaQueryWrapper<ReportConfig> queryWrapper1 = Wrappers.lambdaQuery();
+        List<ReportConfig> list1 = reportConfigService.list(queryWrapper1);
+        if (page.getTotal() > 0) {
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id", page.getRecords().get(i).getId());
+                map.put("reportObject", page.getRecords().get(i).getReportObject());
+                map.put("overallScore", page.getRecords().get(i).getOverallScore());
+                map.put("createDate", page.getRecords().get(i).getCreateDate());
+                for (int j = 0; j < list1.size(); j++){
+                    if (page.getRecords().get(i).getConfigId().equals(list1.get(j).getId())){
+                        map.put("reportName", list1.get(j).getReportName());
+                    }
+                }
+                list.add(map);
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityVO.java

@@ -1,9 +1,5 @@
 package com.usky.fire.service.vo;
 
-import com.usky.fire.domain.BaseBuild;
-import com.usky.fire.domain.BaseCompany;
-import com.usky.fire.domain.BaseCompanyAttach1;
-import com.usky.fire.domain.BaseCompanyPerson;
 import lombok.Data;
 
 import java.util.List;

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/ReportResultVO.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-07-17
+ */
+@Data
+public class ReportResultVO {
+
+        private List<Integer> reportId;
+
+}