通报情况、超期情况、通报事项统计

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjReportController.java

@@ -32,7 +32,7 @@ public class BjReportController extends BaseController {
     /**
      * 获取通报情况统计信息
      */
-    @Operation(summary = "获取通报情况统计信息")
+    @Operation(summary = "获取通报情况统计信息-表格")
 //    @SaCheckPermission("business:report:query")
     @GetMapping("/total")
     public AjaxResult getInfo() {

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjReportItemController.java

@@ -33,17 +33,17 @@ public class BjReportItemController extends BaseController {
     /**
      * 获取通报事项统计信息
      */
-    @Operation(summary = "获取通报事项统计信息")
+    @Operation(summary = "获取通报事项统计信息-卡片")
 //    @SaCheckPermission("business:timeLimit:query")
-    @GetMapping("/total")
+    @GetMapping("/totalCard")
     public AjaxResult getInfo() {
         List<ReportAllTotal> allList = Lists.newArrayList();
-        allList.add(ReportAllTotal.builder().name("通报事项总计").number(2873).proportion(new BigDecimal("100")).build());
-        allList.add(ReportAllTotal.builder().name("涉客船舶相关违法违规行为").number(368).proportion(new BigDecimal("24")).build());
-        allList.add(ReportAllTotal.builder().name("从事休闲活动船舶相关违法违规行为").number(74).proportion(new BigDecimal("15")).build());
-        allList.add(ReportAllTotal.builder().name("渔船相关违法违规信息").number(368).proportion(new BigDecimal("9")).build());
-        allList.add(ReportAllTotal.builder().name("水上新业态风险隐患信息").number(1346).proportion(new BigDecimal("13")).build());
-        allList.add(ReportAllTotal.builder().name("通航水域船舶碰撞桥梁垮塌风险").number(968).proportion(new BigDecimal("28")).build());
+        allList.add(ReportAllTotal.builder().title("通报事项总计").count(2873).countName("通报事项（件）").percent(new BigDecimal("100")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("涉客船舶相关违法违规行为").count(368).countName("通报事项（件）").percent(new BigDecimal("24")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("从事休闲活动船舶相关违法违规行为").count(74).countName("通报事项（件）").percent(new BigDecimal("15")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("渔船相关违法违规信息").count(368).countName("通报事项（件）").percent(new BigDecimal("9")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("水上新业态风险隐患信息").count(1346).countName("通报事项（件）").percent(new BigDecimal("13")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("通航水域船舶碰撞桥梁垮塌风险").count(968).countName("通报事项（件）").percent(new BigDecimal("28")).percentName("占比（%）").isMain(true).build());
         return success(allList);
     }
 

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjTimeLimitController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.controller;
 
+import com.ruoyi.business.domain.vo.NameValue;
 import com.ruoyi.business.domain.vo.ReportAllTotal;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -35,28 +36,52 @@ public class BjTimeLimitController extends BaseController {
     /**
      * 获取超期情况统计信息
      */
-    @Operation(summary = "获取超期情况统计信息")
+    @Operation(summary = "获取超期情况统计信息-卡片")
 //    @SaCheckPermission("business:timeLimit:query")
-    @GetMapping("/total")
-    public AjaxResult getInfo() {
+    @GetMapping("/totalCard")
+    public AjaxResult totalCard() {
         Map<Integer, List<ReportAllTotal>> resultMap = new HashMap<>();
         List<ReportAllTotal> allList = Lists.newArrayList();
         List<ReportAllTotal> outList = Lists.newArrayList();
-        allList.add(ReportAllTotal.builder().name("超期情况总数").number(2873).proportion(new BigDecimal("100")).build());
-        allList.add(ReportAllTotal.builder().name("海南海事局").number(368).proportion(new BigDecimal("24")).build());
-        allList.add(ReportAllTotal.builder().name("广西海事局").number(74).proportion(new BigDecimal("15")).build());
-        allList.add(ReportAllTotal.builder().name("广东海事局").number(307).proportion(new BigDecimal("9")).build());
-        allList.add(ReportAllTotal.builder().name("福建海事局").number(1346).proportion(new BigDecimal("13")).build());
-        allList.add(ReportAllTotal.builder().name("浙江海事局").number(1346).proportion(new BigDecimal("13")).build());
-        outList.add(ReportAllTotal.builder().name("行业外超期情况总数").number(2873).proportion(new BigDecimal("100")).build());
-        outList.add(ReportAllTotal.builder().name("地方政府").number(368).proportion(new BigDecimal("24")).build());
-        outList.add(ReportAllTotal.builder().name("船舶检验机构").number(74).proportion(new BigDecimal("15")).build());
-        outList.add(ReportAllTotal.builder().name("农业农村部门").number(307).proportion(new BigDecimal("9")).build());
-        outList.add(ReportAllTotal.builder().name("海警机构").number(1346).proportion(new BigDecimal("13")).build());
-        outList.add(ReportAllTotal.builder().name("公安机构").number(1346).proportion(new BigDecimal("13")).build());
+        allList.add(ReportAllTotal.builder().title("超期情况总数").count(2873).countName("通报超期（件）").percent(new BigDecimal("100")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("海南海事局").count(368).countName("通报超期（件）").percent(new BigDecimal("24")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("广西海事局").count(74).countName("通报超期（件）").percent(new BigDecimal("15")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("广东海事局").count(307).countName("通报超期（件）").percent(new BigDecimal("9")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("福建海事局").count(1346).countName("通报超期（件）").percent(new BigDecimal("13")).percentName("占比（%）").isMain(true).build());
+        allList.add(ReportAllTotal.builder().title("浙江海事局").count(1346).countName("通报超期（件）").percent(new BigDecimal("13")).percentName("占比（%）").isMain(true).build());
+        outList.add(ReportAllTotal.builder().title("行业外超期情况总数").count(2873).countName("通报超期（件）").percent(new BigDecimal("100")).percentName("占比（%）").isMain(true).build());
+        outList.add(ReportAllTotal.builder().title("地方政府").count(368).countName("通报超期（件）").percent(new BigDecimal("24")).percentName("占比（%）").isMain(true).build());
+        outList.add(ReportAllTotal.builder().title("船舶检验机构").count(74).countName("通报超期（件）").percent(new BigDecimal("15")).percentName("占比（%）").isMain(true).build());
+        outList.add(ReportAllTotal.builder().title("农业农村部门").count(307).countName("通报超期（件）").percent(new BigDecimal("9")).percentName("占比（%）").isMain(true).build());
+        outList.add(ReportAllTotal.builder().title("海警机构").count(1346).countName("通报超期（件）").percent(new BigDecimal("13")).percentName("占比（%）").isMain(true).build());
+        outList.add(ReportAllTotal.builder().title("公安机构").count(1346).countName("通报超期（件）").percent(new BigDecimal("13")).percentName("占比（%）").isMain(true).build());
         resultMap.put(0, allList);
         resultMap.put(1, outList);
         return success(resultMap);
     }
 
+    /**
+     * 获取超期情况统计信息
+     */
+    @Operation(summary = "获取超期情况统计信息-饼图")
+//    @SaCheckPermission("business:timeLimit:query")
+    @GetMapping("/totalPie")
+    public AjaxResult getInfo() {
+        Map<Integer, List<NameValue>> resultMap = new HashMap<>();
+        List<NameValue> allList = Lists.newArrayList();
+        List<NameValue> outList = Lists.newArrayList();
+        allList.add(NameValue.builder().name("海南海事局").value(100).build());
+        allList.add(NameValue.builder().name("广西海事局").value(50).build());
+        allList.add(NameValue.builder().name("广东海事局").value(45).build());
+        allList.add(NameValue.builder().name("福建海事局").value(35).build());
+        allList.add(NameValue.builder().name("浙江海事局").value(20).build());
+        outList.add(NameValue.builder().name("地方政府").value(100).build());
+        outList.add(NameValue.builder().name("船舶检验机构").value(50).build());
+        outList.add(NameValue.builder().name("农业农村部门").value(45).build());
+        outList.add(NameValue.builder().name("海警机构").value(35).build());
+        outList.add(NameValue.builder().name("公安机构").value(20).build());
+        resultMap.put(0, allList);
+        resultMap.put(1, outList);
+        return success(resultMap);
+    }
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjBuildCheckVo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.business.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -53,6 +54,7 @@ public class BjBuildCheckVo implements Serializable {
     /**
      * 检查日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date checkDate;
 
     /**
@@ -103,6 +105,7 @@ public class BjBuildCheckVo implements Serializable {
     /**
      * 发布时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date releaseDate;
 
     /**

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/NameValue.java

@@ -0,0 +1,13 @@
+package com.ruoyi.business.domain.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+public class NameValue {
+
+    private String name;
+
+    private Integer value;
+}

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/ReportAllTotal.java

@@ -9,9 +9,15 @@ import java.math.BigDecimal;
 @Data
 public class ReportAllTotal {
 
-    private String name;
+    private String title;
 
-    private Integer number;
+    private Integer count;
 
-    private BigDecimal proportion;
+    private String countName;
+
+    private BigDecimal percent;
+
+    private String percentName;
+
+    private Boolean isMain = true;
 }

ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjServiceCheckMapper.xml

@@ -36,11 +36,11 @@
                release_flag
         from bj_service_check
         where del_flag = '0'
-        <if test="bo.shipRegisterNumber != null and bo.shipRegisterNumber != ''">
-            and ship_id like concat('%',#{bo.shipRegisterNumber},'%')
+        <if test="bo.shipId != null and bo.shipId != ''">
+            and ship_id like concat('%',#{bo.shipId},'%')
         </if>
-        <if test="bo.shipImo != null and bo.shipImo != ''">
-            and ship_imo like concat('%',#{bo.shipImo},'%')
+        <if test="bo.shipRegisterNumber != null and bo.shipRegisterNumber != ''">
+            and ship_register_number like concat('%',#{bo.shipRegisterNumber},'%')
         </if>
         <if test="bo.startCheckDate != null and bo.endCheckDate != null">
             and check_date between #{bo.startCheckDate} and #{bo.endCheckDate}