测试环境

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java

@@ -21,39 +21,39 @@ import java.util.Date;
 public class ProjectTrackingResponse {
 
 
-    @ApiModelProperty("项目大类名字")
-    private String enterpriseDirectory;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填报开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private LocalDate startTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "填报结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private LocalDate endTime;
-
-
-    @ApiModelProperty("数量")
-    private Integer count;
-//    /**
-//     * 项目小类
-//     */
-//    @ApiModelProperty("项目小类")
-//    private Integer projectSmallType;
+//    @ApiModelProperty("项目大类名字")
+//    private String enterpriseDirectory;
+//
+//
+//    @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 String alertContent;
+//    @ApiModelProperty("数量")
+//    private Integer count;
+    /**
+     * 项目小类
+     */
+    @ApiModelProperty("项目小类")
+    private Integer projectSmallType;
+
+    /**
+     * 提醒时间
+     */
+    @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;
+
+
+    /**
+     * 提醒内容
+     */
+    @ApiModelProperty("提醒内容")
+    private String alertContent;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java

@@ -29,11 +29,11 @@ public class JServicesListServiceImpl extends ServiceImpl<JServicesListMapper, J
      */
     @Override
     public Page<JServicesList> page(Page<JServicesList> page, JServicesListRequest js) {
-//        if("3".equals(js.getServicesType())){
-//            return baseMapper.page1(page, js);
-//        }else {
+        if("3".equals(js.getServicesType())){
+            return baseMapper.page1(page, js);
+        }else {
             return baseMapper.page(page, js);
-//        }
+        }
     }
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -34,7 +34,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: test
+    active: druid
   # 文件上传
   servlet:
     multipart:

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

@@ -54,22 +54,22 @@
         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
-# order by a.alert_time desc
+#         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
+order by a.alert_time desc
     </select>
     <select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse">
         SELECT

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

@@ -54,34 +54,34 @@
     </select>
     <select id="selectAllServicesCount"
             resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse">
-        SELECT
-            IFNULL( ROUND( SUM( a.revenue ) / 100000, 1 ), '-' ) AS allRevenue,
-            IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue,
-            a.type AS servicesType,
-            b.qyCount AS qyCount
-        FROM
-            j_total_revenue a
-                LEFT JOIN ( SELECT a.services_type, count( * ) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type
-        WHERE
-            a.years = YEAR (NOW()) - 1
-        GROUP BY
-            a.type,
-            b.qyCount
 #         SELECT
-#     IFNULL( ROUND( a.revenue / 100000, 1 ), '-' ) AS allRevenue,
+#             IFNULL( ROUND( SUM( a.revenue ) / 100000, 1 ), '-' ) AS allRevenue,
 #             IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue,
 #             a.type AS servicesType,
-#     CASE
-#
-#         WHEN a.type = 3 THEN
-#                 ( SELECT COUNT(*) FROM bms_enterprise_basic_info WHERE type = 1 ) ELSE b.qyCount
-#         END AS qyCount
+#             b.qyCount AS qyCount
 #         FROM
 #             j_total_revenue a
-#         LEFT JOIN ( SELECT a.services_type, COUNT(*) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type
+#                 LEFT JOIN ( SELECT a.services_type, count( * ) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type
 #         WHERE
 #             a.years = YEAR (NOW()) - 1
-# ORDER BY FIELD(a.type, 3, 1, 2, 4);
+#         GROUP BY
+#             a.type,
+#             b.qyCount
+SELECT
+    IFNULL( ROUND( a.revenue / 100000, 1 ), '-' ) AS allRevenue,
+    IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue,
+    a.type AS servicesType,
+    CASE
+
+        WHEN a.type = 3 THEN
+                ( SELECT COUNT(*) FROM bms_enterprise_basic_info WHERE type = 1 ) ELSE b.qyCount
+        END AS qyCount
+FROM
+    j_total_revenue a
+        LEFT JOIN ( SELECT a.services_type, COUNT(*) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type
+WHERE
+    a.years = YEAR (NOW()) - 1
+ORDER BY FIELD(a.type, 3, 1, 2, 4);
     </select>
 
 

ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java

@@ -41,12 +41,12 @@ public class XssFilter implements Filter {
             throws IOException, ServletException {
         HttpServletRequest req = (HttpServletRequest) request;
         HttpServletResponse resp = (HttpServletResponse) response;
-        resp.setHeader("Access-Control-Allow-Origin", "http://39.101.188.84:9999");
-//        resp.setHeader("Access-Control-Allow-Origin", "https://idp.sipac.gov.cn");
-        resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
-        resp.setHeader("Access-Control-Max-Age", "3600");
-        resp.setHeader("Access-Control-Allow-Headers", "x-requested-with,Authorization,isrepeatsubmit,Content-Type");
-        resp.setHeader("Access-Control-Allow-Credentials", "true");
+//        resp.setHeader("Access-Control-Allow-Origin", "http://39.101.188.84:9999");
+////        resp.setHeader("Access-Control-Allow-Origin", "https://idp.sipac.gov.cn");
+//        resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
+//        resp.setHeader("Access-Control-Max-Age", "3600");
+//        resp.setHeader("Access-Control-Allow-Headers", "x-requested-with,Authorization,isrepeatsubmit,Content-Type");
+//        resp.setHeader("Access-Control-Allow-Credentials", "true");
         if (handleExcludeURL(req, resp)) {
             chain.doFilter(request, response);
             return;

ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java

@@ -43,14 +43,14 @@ public class FilterConfig {
         initParameters.put("excludes", excludes);
         registration.setInitParameters(initParameters);
 
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true);
-        config.addAllowedOrigin("http://39.101.188.84:9999");
-        config.addAllowedHeader("*");
-        config.addAllowedMethod("*");
-        source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效
-        registration.setOrder(0);
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        CorsConfiguration config = new CorsConfiguration();
+//        config.setAllowCredentials(true);
+//        config.addAllowedOrigin("http://39.101.188.84:9999");
+//        config.addAllowedHeader("*");
+//        config.addAllowedMethod("*");
+//        source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效
+//        registration.setOrder(0);
 
         return registration;
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -84,7 +84,7 @@ public class SysLoginService {
             throw new RuntimeException(e);
         }
         // 验证码校验
-//          validateCaptcha(username, code, uuid);
+        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, strP);
         Map<String, Object> map = redisCache.getCacheObject(username + strP);