脱敏

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

@@ -21,24 +21,39 @@ import java.util.Date;
 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")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "填报结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDate endTime;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
-    private Date alertTime;
+
-
+    @ApiModelProperty("数量")
-
+    private Integer count;
-    /**
+//    /**
-     * 提醒内容
+//     * 项目小类
-     */
+//     */
-    @ApiModelProperty("提醒内容")
+//    @ApiModelProperty("项目小类")
-    private String alertContent;
+//    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())){
+//        if("3".equals(js.getServicesType())){
-            return baseMapper.page1(page, js);
+//            return baseMapper.page1(page, js);
-        }else {
+//        }else {
             return baseMapper.page(page, js);
-        }
+//        }
     }
 
     /**

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

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

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

@@ -55,20 +55,33 @@
     <select id="selectAllServicesCount"
             resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse">
         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
+            b.qyCount AS qyCount
-
-                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
+                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

@@ -42,6 +42,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");
         if (handleExcludeURL(req, resp)) {
             chain.doFilter(request, response);
             return;