From d9fc75048bd3081c38b2d817339a95d8e9f9029e Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 18 Oct 2024 09:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=80=BB?=
 =?UTF-8?q?=E9=83=A8=E4=BC=81=E4=B8=9A=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ent/entity/response/JHqCountResponse.java |  6 ++
 .../mapper/JHeadQuartersRevenueMapper.java    |  6 ++
 .../impl/JHeadQuartersRevenueServiceImpl.java | 10 ++-
 .../BmsEnterpriseBasicInfoMapper.xml          |  1 -
 .../jjh/ent/JHeadQuartersRevenueMapper.xml    | 87 +++++++++++++++----
 5 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java
index 980979e..e54f4a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java
@@ -30,4 +30,10 @@ public class JHqCountResponse {
     @ApiModelProperty("区级")
     private Integer count3;
 
+    /**
+     * 全部
+     */
+    @ApiModelProperty("全部")
+    private Integer allCount;
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java
index 5a39a30..9079784 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java
@@ -25,8 +25,14 @@ public interface JHeadQuartersRevenueMapper extends BaseMapper<JHeadQuartersReve
      */
     Page<JHeadQuartersRevenue> page(Page<JHeadQuartersRevenue> page, @Param("req") JHeadQuartersRevenueRequest js);
 
+    Page<JHeadQuartersRevenue> page1(Page<JHeadQuartersRevenue> page,@Param("req")  JHeadQuartersRevenueRequest js);
     /**
      * 查询总部企业数量
      */
     JHqCountResponse selectZbCount();
+
+    /**
+     * 查询总部企业全部的数量
+     */
+    Integer selectAllCount();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java
index 0561032..295b089 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java
@@ -27,7 +27,11 @@ public class JHeadQuartersRevenueServiceImpl extends ServiceImpl<JHeadQuartersRe
      */
     @Override
     public Page<JHeadQuartersRevenue> page(Page<JHeadQuartersRevenue> page, JHeadQuartersRevenueRequest js) {
-        return baseMapper.page(page, js);
+        if(js.getProjectSmallType()!=null){
+            return baseMapper.page1(page, js);
+        }else {
+            return baseMapper.page(page, js);
+        }
     }
 
 
@@ -36,6 +40,8 @@ public class JHeadQuartersRevenueServiceImpl extends ServiceImpl<JHeadQuartersRe
      */
     @Override
     public JHqCountResponse selectZbCount() {
-        return baseMapper.selectZbCount();
+        JHqCountResponse jHqCountResponse = baseMapper.selectZbCount();
+        jHqCountResponse.setAllCount(baseMapper.selectAllCount());
+        return jHqCountResponse;
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml
index 2c07b2a..18e6437 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml
@@ -8,7 +8,6 @@
         <where>
             <if test="req.enterpriseInfo != null  and req.enterpriseInfo != ''">
                 qymc like concat('%', #{req.enterpriseInfo}, '%')
-                or tyshxydm like concat('%', #{req.enterpriseInfo}, '%')
             </if>
         </where>
     </select>
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml
index 084b536..1fe42c1 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml
@@ -5,8 +5,57 @@
 <mapper namespace="com.ruoyi.jjh.ent.mapper.JHeadQuartersRevenueMapper">
     <select id="page" resultType="com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue">
         SELECT
+        DISTINCT credit_code as tyshxydm,
         a.qymc,
-        a.tyshxydm,
+        CASE
+        WHEN a.hydm REGEXP
+        '^(06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)'
+        THEN '制造业总部'
+        WHEN a.hydm REGEXP '^(47|48|49|50)' THEN '建筑业总部'
+        WHEN a.hydm REGEXP '^(51|52|61|62)' THEN '批零住餐总部'
+        ELSE '服务业总部'
+        END as type,
+        a.hydm,
+        IFNULL( ROUND( a.revenue / 10000, 1 ), '-' ) AS revenue,
+        IFNULL( ROUND( a.taxation / 10000, 1 ), '-' ) AS taxation,
+        a.years,
+        IFNULL( ROUND( a.output / 10000, 1 ), '-' ) AS output,
+        IFNULL( ROUND( a.sales / 10000, 1 ), '-' ) AS sales
+        FROM
+         j_project b left join j_headquarters_revenue a on b.credit_code = a.tyshxydm
+        <where>
+             b.status = 5 and b.project_big_type = 1
+            <if test="req.qymc != null and req.qymc != '' ">
+                and a.qymc like concat('%',#{req.qymc},'%')
+            </if>
+            <if test="req.tyshxydm != null and req.tyshxydm != '' ">
+                and a.tyshxydm = #{req.tyshxydm}
+            </if>
+            <if test="req.years != null and req.years != '' ">
+                and a.years = #{req.years}
+            </if>
+            <if test="req.type == 1">
+                and a.hydm REGEXP
+                '^(06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)'
+            </if>
+            <if test="req.type == 2">
+                and a.hydm REGEXP '^(47|48|49|50)'
+            </if>
+            <if test="req.type == 3">
+                and a.hydm REGEXP '^(51|52|61|62)'
+            </if>
+            <if test="req.type == 4">
+            </if>
+            <if test="req.type == 5">
+                and a.hydm not REGEXP
+                '^(51|52|61|62|47|48|49|50|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)'
+            </if>
+        </where>
+    </select>
+    <select id="page1" resultType="com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue">
+        SELECT
+        a.qymc,
+        b.credit_code as tyshxydm,
         CASE
         WHEN a.hydm REGEXP
         '^(06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)'
@@ -25,7 +74,7 @@
         j_headquarters_revenue a
         LEFT JOIN j_project b ON a.tyshxydm = b.credit_code
         <where>
-            b.project_middle_type = 1
+            b.project_middle_type = 1 and b.status = 5
             <if test="req.qymc != null and req.qymc != '' ">
                 and a.qymc like concat('%',#{req.qymc},'%')
             </if>
@@ -55,22 +104,26 @@
                 and b.project_small_type = #{req.projectSmallType}
             </if>
         </where>
+        group by b.credit_code,a.qymc,type, a.hydm,
+        a.years
     </select>
     <select id="selectZbCount" resultType="com.ruoyi.jjh.ent.entity.response.JHqCountResponse">
-        SELECT DISTINCT
-            SUM(
-                    IF
-                    ( b.project_small_type = 1, 1, 0 )) AS count1,
-            SUM(
-                    IF
-                    ( b.project_small_type = 2, 1, 0 )) AS count2,
-            sum(
-                    IF
-                    ( b.project_small_type = 3, 1, 0 )) AS count3
-        FROM
-            j_headquarters_revenue a
-                LEFT JOIN j_project b ON a.tyshxydm = b.credit_code
-        WHERE
-            b.project_middle_type = 1
+        SELECT
+            NULL AS allCount,
+            SUM(IF(distinct_projects.project_small_type = 1, 1, 0)) AS count1,
+            SUM(IF(distinct_projects.project_small_type = 2, 1, 0)) AS count2,
+            SUM(IF(distinct_projects.project_small_type = 3, 1, 0)) AS count3
+        FROM (
+                 SELECT DISTINCT a.tyshxydm, b.project_small_type
+                 FROM j_headquarters_revenue a
+                          LEFT JOIN j_project b ON a.tyshxydm = b.credit_code
+                 WHERE b.project_middle_type = 1
+             ) AS distinct_projects
+    </select>
+    <select id="selectAllCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(DISTINCT credit_code)
+        FROM j_project
+        where status = 5 and project_big_type = 1
     </select>
 </mapper>