From ab6b365e516c1b6d744e15990bf70bcef2378e73 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Wed, 21 Aug 2024 13:28:05 +0800
Subject: [PATCH] bugfix

---
 .../ent/controller/JDataScreenController.java |  3 +-
 .../response/ProjectTrackingResponse.java     | 29 +++++++++----------
 .../mapper/jjh/ent/JDataScreenMapper.xml      | 19 +++++-------
 .../mapper/jjh/ent/JProjectFundMapper.xml     |  3 +-
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java
index 92338ec..2407657 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java
@@ -3,7 +3,6 @@ package com.ruoyi.jjh.ent.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.jjh.ent.entity.response.HonorResponse;
-import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse;
 import com.ruoyi.jjh.ent.service.JDataScreenService;
 import com.ruoyi.jjh.ent.service.SmsAlertsService;
 import io.swagger.annotations.Api;
@@ -54,7 +53,7 @@ public class JDataScreenController extends BaseController {
     @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
     @ApiOperation(value = "项目追踪情况")
     @GetMapping("/projectTracking")
-    public AjaxResult getProjectTracking(ProjectTrackingResponse a) {
+    public AjaxResult getProjectTracking() {
         return success(jDataScreenService.getProjectTracking());
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java
index 5faaa2d..f59fd37 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java
@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * 项目追踪情况返回体
@@ -20,28 +22,23 @@ public class ProjectTrackingResponse {
 
 
     /**
-     * 项目大类名字
+     * 项目小类
      */
-    @ApiModelProperty("项目大类名字")
-    private String enterpriseDirectory;
+    @ApiModelProperty("项目小类")
+    private Integer projectSmallType;
 
     /**
-     * 填报开始时间
+     * 提醒时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填报开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private LocalDate startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date alertTime;
 
-    /**
-     * 填报结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填报结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private LocalDate endTime;
 
     /**
-     * 数量
+     * 提醒内容
      */
-    @ApiModelProperty("数量")
-    private Integer count;
+    @ApiModelProperty("提醒内容")
+    private String alertContent;
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
index d1640df..de24beb 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
@@ -53,15 +53,12 @@
         ORDER BY CAST(c.dict_value AS UNSIGNED);
     </select>
     <select id="getProjectTracking" resultType="com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse">
-        SELECT b.enterprise_directory,
-               b.start_time,
-               b.end_time,
-               COUNT(*) as count
-        FROM bms_declaration_records a
-                 INNER JOIN bms_template_record b ON a.template_record_id = b.id
-        WHERE a.`status` != 0
-        GROUP BY a.template_record_id
-        order by count desc
+        SELECT a.alert_time,
+               a.alert_content,
+               b.project_small_type
+        FROM j_smart_reminders a
+                 left JOIN j_project b on a.project_id = b.id
+        where a.alert_type = 4 and  NOW()  > a.alert_time
     </select>
     <select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse">
         SELECT
@@ -90,7 +87,7 @@
                IFNULL(ROUND(a.year_revenue / 10000, 1), '-')   AS yearRevenue,
                IFNULL(ROUND(a.add_value, 1) , '-')     AS addValue,
                IFNULL(ROUND(a.growth, 1), '-')        AS growth,
-               IFNULL(ROUND(a.gdp_proportion, 4), '-') AS gdpProportion
+               IFNULL(ROUND(a.gdp_proportion, 2), '-') AS gdpProportion
         FROM j_industry_depth a
         WHERE a.years = YEAR(NOW()) - 1
     </select>
@@ -108,7 +105,7 @@
     <select id="getBigIndustry" resultType="com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse">
         SELECT a.categories AS nameType,
                a.categories_code,
-               IFNULL(ROUND(SUM(a.year_revenue) / 10000, 1), '-') AS yearRevenue,
+               IFNULL(ROUND(SUM(a.year_revenue/ 10000) , 1), '-') AS yearRevenue,
                IFNULL(ROUND(SUM(a.add_value), 1), '-')    AS addValue,
                IFNULL(ROUND(AVG(a.growth), 1), '-')                             AS growth,
                IFNULL(ROUND(SUM(a.gdp_proportion), 1), '-')                   AS gdpProportion
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml
index 290fb89..884282c 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml
@@ -79,7 +79,8 @@
         WHERE
             a.tyshxydm = #{username}
         GROUP BY
-            a.ID
+            a.ID,
+            a.fund_amount, a.qymc, a.tyshxydm, a.project_name, a.appropriation_time
         LIMIT 10
     </select>
 </mapper>