Merge branch 'dev' of http://10.0.0.126:8500/liushimin/biz_supplier_manage into dev

2025-07-02 09:56:48 +08:00
parent c8e1a1463f 059ec704b3
commit 1be76886e0
55 changed files with 751 additions and 115 deletions
--- a/src/main/resources/application-master.yml
+++ b/src/main/resources/application-master.yml
@ -73,12 +73,15 @@ spring:

  # 生产区 redis 配置
  redis:
-    host: localhost      # Redis 服务器地址，默认本地:ml-citation{ref="1,4" data="citationList"}
-    port: 6379           # 监听端口，默认 6379:ml-citation{ref="1,4" data="citationList"}
-    #  password: Yhblsqt%21 # 访问密码（若无密码可省略）:ml-citation{ref="1,4" data="citationList"}
-    # database: 4          # 选择数据库编号，默认 0:ml-citation{ref="1,6" data="citationList"}
-    timeout: 3000        # 连接超时时间（单位：毫秒）:ml-citation{ref="4,6" data="citationList"}
-
+    sentinel:
+      master: mymaster
+      nodes: 10.60.161.59:26379, 10.60.161.59:26380, 10.60.161.59:26381
+    password: pass
+    database:
+      sharding: 1
+      cache: 2
+      idempotent: 3
+      userinfo: 4



@ -154,3 +157,13 @@ management:
      cors:
        allowed-origins: "*"
        allowed-methods: "*"
+login:
+  password:
+    privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8sGQAshhH/H1G/lOJdAZYBdPOto38d7zSv2BCi9JDmhM/yqWUv345zUt1OKM8VGx10daDfu6a8WWLCGa6RTU1P6jaWgZwqnIwcWRz9Q82NAu935gVHidiGA/yX52ZE061BZrA63l1uSxEpOCEyMD4UpPb6K0yxrBKzX4hz7OgjAgMBAAECgYAT/jx8QJisxSmV8v/TNjpQHKp0hYT7pTcAFHHctDylrSnLci7TVbt2TsNObvVJbWdC3V/vlJmeVjD9jJnRytO/pgc+p8I3Q3pfF7ACiBAz1+4VZM40vFz0RfQKJ/kZB3DiGohprOw60kRR0eMtHuaA07luhBCbne6700Paf+OOAQJBAP9THm3KEcnChnRBC6yPdNHLN/XplgGaIJU2Wo0biI8Oz2bM3eJGPSwrVCqObOwVPNYJIfEQRhlWlB9kpBS0ECECQQCvorUUJwJhV+Fx6bhUK5aa1/rDTODPmS1MycvLtjOp7ig1sGcb4g9Vl8uRPzsvQZ6Z+sNTD4mFFnYFneCvPL/DAkAMZo4QyQKqKO98z/fwLpt+4P7by7eEZmb0uEoXlmHAiPibxpF0PvMTpRsWYgp6QOHOh20Fl0PAUUsqZyns833hAkBEzV9UIqfrDCsTnbQIvP6FcAAay53xlRbK0u5Twe9hLRtxVMY/hQHuzMUBBB0iOPlxZmtnuVls2kynjJ4853ZTAkEAu+lLTmM7DBV9jDEc9sNM7UNa0MvAUb6r9DsTKHGLLRqB7ljQ1R2RiLRknFaegUPEVsvdMszH2rdy3CaIWkC5OQ==
+    publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvLBkALIYR/x9Rv5TiXQGWAXTzraN/He80r9gQovSQ5oTP8qllL9+Oc1LdTijPFRsddHWg37umvFliwhmukU1NT+o2loGcKpyMHFkc/UPNjQLvd+YFR4nYhgP8l+dmRNOtQWawOt5dbksRKTghMjA+FKT2+itMsawSs1+Ic+zoIwIDAQAB
+  token:
+    time_limit: 20
+  captcha:
+    privateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8sGQAshhH/H1G/lOJdAZYBdPOto38d7zSv2BCi9JDmhM/yqWUv345zUt1OKM8VGx10daDfu6a8WWLCGa6RTU1P6jaWgZwqnIwcWRz9Q82NAu935gVHidiGA/yX52ZE061BZrA63l1uSxEpOCEyMD4UpPb6K0yxrBKzX4hz7OgjAgMBAAECgYAT/jx8QJisxSmV8v/TNjpQHKp0hYT7pTcAFHHctDylrSnLci7TVbt2TsNObvVJbWdC3V/vlJmeVjD9jJnRytO/pgc+p8I3Q3pfF7ACiBAz1+4VZM40vFz0RfQKJ/kZB3DiGohprOw60kRR0eMtHuaA07luhBCbne6700Paf+OOAQJBAP9THm3KEcnChnRBC6yPdNHLN/XplgGaIJU2Wo0biI8Oz2bM3eJGPSwrVCqObOwVPNYJIfEQRhlWlB9kpBS0ECECQQCvorUUJwJhV+Fx6bhUK5aa1/rDTODPmS1MycvLtjOp7ig1sGcb4g9Vl8uRPzsvQZ6Z+sNTD4mFFnYFneCvPL/DAkAMZo4QyQKqKO98z/fwLpt+4P7by7eEZmb0uEoXlmHAiPibxpF0PvMTpRsWYgp6QOHOh20Fl0PAUUsqZyns833hAkBEzV9UIqfrDCsTnbQIvP6FcAAay53xlRbK0u5Twe9hLRtxVMY/hQHuzMUBBB0iOPlxZmtnuVls2kynjJ4853ZTAkEAu+lLTmM7DBV9jDEc9sNM7UNa0MvAUb6r9DsTKHGLLRqB7ljQ1R2RiLRknFaegUPEVsvdMszH2rdy3CaIWkC5OQ==
+    publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvLBkALIYR/x9Rv5TiXQGWAXTzraN/He80r9gQovSQ5oTP8qllL9+Oc1LdTijPFRsddHWg37umvFliwhmukU1NT+o2loGcKpyMHFkc/UPNjQLvd+YFR4nYhgP8l+dmRNOtQWawOt5dbksRKTghMjA+FKT2+itMsawSs1+Ic+zoIwIDAQAB
+    time_limit: 2 #Minutes
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -1,7 +1,3 @@
-# 对应 apollo 配置中心的应用名
-app:
-  id: biz-supplier-manage
-

 spring:
  profiles:
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
@ -896,8 +896,9 @@
            resultType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo">
        SELECT
        csb.id,
+        csb.supplier_type as supplierType,
        MAX(csb.name) AS name,
-        csb.social_credit_code AS socialCreditCode,
+        MAX(csb.social_credit_code) AS socialCreditCode,
        MAX(cas.dept_id) AS deptId,
        MAX(caw.id) AS accessWorkId,
        MAX(caw.update_time) AS admissionTime,
@ -941,6 +942,7 @@
        LEFT JOIN (
        SELECT
        casc.supplier_id,
+        GROUP_CONCAT(casc.category_id SEPARATOR ', ') AS categoryId,
        GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName
        FROM
        cosco_access_supplier_category casc
@ -987,6 +989,16 @@
            </foreach>
        </if>
        )
+        <if test="vo.name!=null and vo.name!=''">
+            and csb.name like concat('%',#{vo.name},'%')
+        </if>
+        <if test="vo.deptId!=null and vo.deptId!=''">
+            and cas.dept_id = #{vo.deptId}
+        </if>
+        <if test="vo.categoryId!=null and vo.categoryId!=''">
+            and category_info.categoryId like concat('%',#{vo.categoryId},'%')
+        </if>
+

        GROUP BY
        csb.id
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
@ -221,7 +221,8 @@
            #{id}
        </foreach>
    </update>
-    <select id="getSupplierExitStatistics" parameterType="map" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo">
+
+    <select id="getSupplierQualificationExpireList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo">
        SELECT
        csq.authority,
        csq.term_of_validity,
@ -251,6 +252,44 @@
        JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id
        WHERE
        csq.del_flag = 'normal'
+        AND ( csq.term_of_validity &lt; CURDATE() OR csq.term_of_validity
+        BETWEEN CURDATE() AND DATE_ADD( CURDATE(), INTERVAL 30 DAY ) )
+        <if test="supplierName!=null and supplierName!=''">
+            and csb.name like concat('%',#{supplierName},'%')
+        </if>
+        ORDER BY
+        csq.term_of_validity ASC
+    </select>
+    <select id="getSupplierExitStatistics" parameterType="map" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo">
+        SELECT
+        csq.authority,
+        csq.term_of_validity,
+        csb.NAME supplierName,
+        CASE
+
+        WHEN csb.supplier_type = 'ovs' THEN
+        '境外'
+        WHEN csb.supplier_type = 'ovs' THEN
+        '境内' ELSE '境内'
+        END AS area,
+        csq.id,
+        '准入单位' AS accessUnit,
+        '准入部门' AS accessDept,
+        (
+        SELECT
+        GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        FROM
+        cosco_access_supplier_category casc
+        JOIN cosco_category cc ON cc.id = casc.category_id
+        WHERE
+        casc.del_flag = 'normal'
+        AND casc.supplier_id = csb.id
+        ) AS categoryName
+        FROM
+        cosco_supplier_qualifications csq
+        JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id
+        WHERE
+        csq.del_flag = 'normal'
        AND ( csq.term_of_validity &lt; CURDATE() OR csq.term_of_validity
            BETWEEN CURDATE() AND DATE_ADD( CURDATE(), INTERVAL 30 DAY ) )
        <if test="vo.supplierName!=null and vo.supplierName!=''">
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
@ -197,13 +197,41 @@
            #{id}
        </foreach>
    </update>
+
+    <select id="getSupplierExitStatisticsList"
+            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo">
+        select
+        csb.name supplierName,
+        case when csb.supplier_type = 'ovs' then '境外'
+        when csb.supplier_type = 'ovs' then '境内'
+        else '境内' end as area ,
+        csb.id,
+        '退出单位' as accessUnit,
+        '退出部门' as accessDept,
+        cse.create_by as applyUser,
+        cse.update_time as applyTime,
+        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        from cosco_supplierexit_supplier_category cssc
+        join cosco_category cc
+        ON cc.id = cssc.category_id
+        where   cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as categoryName
+        from cosco_supplierexit  cse
+        join cosco_supplierexit_supplier css
+        on cse.id= css.supplierexit_id
+        join cosco_supplier_base csb on csb.id=css.supplier_id
+        where cse.approve_status=1
+        <if test="supplierName!=null and supplierName!=''">
+            and csb.name like concat('%',#{supplierName},'%')
+        </if>
+    </select>
    <select id="getSupplierExitStatistics" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo" parameterType="map">
        select
            csb.name supplierName,
            case when csb.supplier_type = 'ovs' then '境外'
                 when csb.supplier_type = 'ovs' then '境内'
                 else '境内' end as area ,
-            csb.id,
+        cse.id,
            '退出单位' as accessUnit,
            '退出部门' as accessDept,
            cse.create_by as applyUser,