数据大屏统计修改

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JHeadQuartersRevenueController.java

@@ -39,7 +39,7 @@ public class JHeadQuartersRevenueController {
      * @param js   请求参数
      * @return 数据
      */
-    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')")
     @ApiOperation(value = "分页查询总部企业", response = JHeadQuartersRevenue.class)
     @GetMapping
     public AjaxResult page(Page<JHeadQuartersRevenue> page, JHeadQuartersRevenueRequest js) {
@@ -49,7 +49,7 @@ public class JHeadQuartersRevenueController {
     /**
      * 查询总部企业数量
      */
-    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
+    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')")
     @ApiOperation(value = "查询总部企业数量", response = JHqCountResponse.class)
     @GetMapping("/selectZbCount")
     public AjaxResult selectZbCount() {

ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml

@@ -38,7 +38,8 @@
                             where status = 5
                             GROUP BY project_middle_type) AS ys ON b.dict_value = ys.project_middle_type
                  LEFT JOIN (SELECT project_small_type,
-                                   IF(project_small_type = 14, COUNT(DISTINCT credit_code), COUNT(*)) AS count
+                                   IF(project_small_type = 14 or project_small_type = 1 or project_small_type = 2
+                                          or project_small_type = 3	, COUNT(DISTINCT credit_code), COUNT(*)) AS count
                             FROM j_project
                             where status = 5
                             GROUP BY project_small_type) AS us ON c.dict_value = us.project_small_type
@@ -53,13 +54,22 @@
         ORDER BY CAST(c.dict_value AS UNSIGNED);
     </select>
     <select id="getProjectTracking" resultType="com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse">
-        SELECT a.alert_time,
+        SELECT b.enterprise_directory,
-               a.alert_content,
+               b.start_time,
-               b.project_small_type
+               b.end_time,
-        FROM j_smart_reminders a
+               COUNT(*) as count
-                 left JOIN j_project b on a.project_id = b.id
+        FROM bms_declaration_records a
-        where a.alert_type = 4 and  NOW()  > a.alert_time
+                 INNER JOIN bms_template_record b ON a.template_record_id = b.id
-        order by a.alert_time desc
+        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
+# order by a.alert_time desc
     </select>
     <select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse">
         SELECT