Merge branch 'han' of uskycloud/usky-modules into server-165

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

@@ -1,9 +1,18 @@
 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.DemReportInfo;
+import com.usky.fire.domain.ReportResult;
+import com.usky.fire.service.DemReportInfoService;
+import com.usky.fire.service.ReportResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -17,6 +26,24 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/reportResult")
 public class ReportResultController {
+    @Autowired
+    private ReportResultService reportResultService;
 
+    /**
+     * 消防报告-历史报告列表查询
+     *
+     * @param companyId  单位ID
+     * @param sourceType  来源类型
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("reportResultList")
+    public ApiResult<CommonPage<ReportResult>> reportResultList(@RequestParam(value = "companyId", required = false) Integer companyId,
+                                                              @RequestParam(value = "sourceType", required = false) String sourceType,
+                                                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(reportResultService.reportResultList(companyId,sourceType,pageNum, pageSize));
+    }
 }
 

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

@@ -1,5 +1,7 @@
 package com.usky.fire.service;
 
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DemReportInfo;
 import com.usky.fire.domain.ReportResult;
 import com.usky.common.mybatis.core.CrudService;
 
@@ -12,5 +14,14 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2023-06-28
  */
 public interface ReportResultService extends CrudService<ReportResult> {
-
+    /**
+     * 消防报告-历史报告列表查询
+     *
+     * @param companyId  单位名称
+     * @param sourceType  来源类型
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    CommonPage<ReportResult> reportResultList(Integer companyId, String sourceType, Integer pageNum, Integer pageSize);
 }

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

@@ -96,6 +96,9 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
     @Autowired
     private DemReformReviewService demReformReviewService;
 
+    @Autowired
+    private ReportIndexResultService reportIndexResultService;
+
 
     @Override
     public Object enterprise(String moduleType, String dataType, String streetTown){
@@ -863,21 +866,21 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
                 BaseCompany::getCompanyId)
                 .eq(BaseCompany::getCompanyId, companyId);
         list2 = baseCompanyService.list(queryWrapper1);
-        List<DemReportGrade> list3 = new ArrayList<>();
-        LambdaQueryWrapper<DemReportGrade> queryWrapper2 = Wrappers.lambdaQuery();
-        queryWrapper2.select(DemReportGrade::getId, DemReportGrade::getCompanyId, DemReportGrade::getTotalGrade,
-                DemReportGrade::getBuildIntegrity,DemReportGrade::getFacilityStatus,
-                DemReportGrade::getSelfManage,DemReportGrade::getLawEnforce,DemReportGrade::getFireRisk)
-                .eq(DemReportGrade::getCompanyId, companyId)
-                .orderByDesc(DemReportGrade::getId).last(" limit 1");
-        list3 = demReportGradeService.list(queryWrapper2);
+        List<ReportIndexResult> list3 = new ArrayList<>();
+        LambdaQueryWrapper<ReportIndexResult> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.select(ReportIndexResult::getId, ReportIndexResult::getIndexCode, ReportIndexResult::getIndexName,
+                ReportIndexResult::getIndexScore,ReportIndexResult::getCreateDate,
+                ReportIndexResult::getIndexData,ReportIndexResult::getIndexData,ReportIndexResult::getScoreDesc)
+                .eq(ReportIndexResult::getObjectId, list2.get(0).getId())
+                .orderByDesc(ReportIndexResult::getId).last(" limit 74");
+        list3 = reportIndexResultService.list(queryWrapper2);
         List<DemFireReform> list4 = new ArrayList<>();
         LambdaQueryWrapper<DemFireReform> queryWrapper3 = Wrappers.lambdaQuery();
         queryWrapper3.select(DemFireReform::getId, DemFireReform::getCompanyId, DemFireReform::getReformPart,
                 DemFireReform::getSendTime,DemFireReform::getReformStatus,
                 DemFireReform::getLimitTime,DemFireReform::getReformCode)
                 .eq(DemFireReform::getCompanyId, companyId)
-                .orderByDesc(DemFireReform::getId).last(" limit 1");;
+                .orderByDesc(DemFireReform::getId).last(" limit 1");
         list4 = demFireReformService.list(queryWrapper3);
         List<DemReformReview> list5 = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list4)) {
@@ -885,7 +888,7 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
             queryWrapper4.select(DemReformReview::getId, DemReformReview::getReformId, DemReformReview::getReformTime,
                     DemReformReview::getReviewTime)
                     .eq(DemReformReview::getReformId, list4.get(0).getId())
-                    .orderByDesc(DemReformReview::getId).last(" limit 1");;
+                    .orderByDesc(DemReformReview::getId).last(" limit 1");
             list5 = demReformReviewService.list(queryWrapper4);
         }
         Map<String, Object> map = new HashMap<>();
@@ -894,14 +897,20 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
         map.put("linkPhone", list2.get(0).getLinkPhone());
         map.put("address", list2.get(0).getAddress());
         if (CollectionUtils.isNotEmpty(list3)) {
-            map.put("totalGrade", list3.get(0).getTotalGrade());
-            map.put("buildIntegrity", list3.get(0).getBuildIntegrity());
-            map.put("facilityStatus", list3.get(0).getFacilityStatus());
-            map.put("selfManage", list3.get(0).getSelfManage());
-            map.put("lawEnforce", list3.get(0).getLawEnforce());
-            map.put("fireRisk", list3.get(0).getFireRisk());
+            for (int i = 0; i < list3.size(); i++) {
+                if (list3.get(i).getIndexCode().equals("10001")){
+                    map.put("buildIntegrity", list3.get(i).getIndexScore());
+                }else if (list3.get(i).getIndexCode().equals("10003")){
+                    map.put("facilityStatus", list3.get(i).getIndexScore());
+                }else if (list3.get(i).getIndexCode().equals("10004")){
+                    map.put("selfManage", list3.get(i).getIndexScore());
+                }else if (list3.get(i).getIndexCode().equals("10005")){
+                    map.put("lawEnforce", list3.get(i).getIndexScore());
+                }else if (list3.get(i).getIndexCode().equals("10006")){
+                    map.put("fireRisk", list3.get(i).getIndexScore());
+                }
+            }
         }else {
-            map.put("totalGrade", 0);
             map.put("buildIntegrity", 0);
             map.put("facilityStatus", 0);
             map.put("selfManage", 0);

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

@@ -1,5 +1,12 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.ReportResult;
 import com.usky.fire.mapper.ReportResultMapper;
 import com.usky.fire.service.ReportResultService;
@@ -16,5 +23,14 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ReportResultServiceImpl extends AbstractCrudService<ReportResultMapper, ReportResult> implements ReportResultService {
-
+    @Override
+    public CommonPage<ReportResult> reportResultList(Integer companyId, String sourceType, Integer pageNum,
+                                                     Integer pageSize) {
+        IPage<ReportResult> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<ReportResult> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ReportResult::getObjectId, companyId)
+                    .orderByDesc(ReportResult::getId);
+        page = this.page(page, queryWrapper);
+        return ToCommonPage(page);
+    }
 }