From 2b2debfe30b2bddcd95625cba5bdba28e1546353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 22 Jan 2026 16:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E5=B7=A5=E5=85=B7-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cleanadvisory/entity/CleanAdvisory.java   |  1 +
 .../mapper/CleanAdvisoryMapper.java           |  5 +
 .../mapper/xml/CleanAdvisoryMapper.xml        | 91 ++++++++++++++-----
 .../impl/CleanAdvisoryServiceImpl.java        | 24 +++++
 4 files changed, 96 insertions(+), 25 deletions(-)

diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/entity/CleanAdvisory.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/entity/CleanAdvisory.java
index 236412d..bbaf450 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/entity/CleanAdvisory.java
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/entity/CleanAdvisory.java
@@ -43,6 +43,7 @@ public class CleanAdvisory implements Serializable {
     private String izYg;
     private String izJs;
     private String izJg;
+    private String izGys;
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java
index 6e7685f..7ea9cb4 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java
@@ -31,4 +31,9 @@ public interface CleanAdvisoryMapper extends BaseMapper<CleanAdvisory> {
     void cleanNotice(CleanAdvisory cleanAdvisory);
 
     void cleanAccountInfo(CleanAdvisory cleanAdvisory);
+
+    void deleteOpeSuppliersApply(CleanAdvisory cleanAdvisory);
+    void deleteSuppliersOrg(CleanAdvisory cleanAdvisory);
+    void deleteBizSuppliersApply(CleanAdvisory cleanAdvisory);
+    void deleteSuppliersInfo(CleanAdvisory cleanAdvisory);
 }
diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
index ff894dd..88a7081 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
@@ -2,16 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nu.modules.cleanadvisory.mapper.CleanAdvisoryMapper">
     <select id="findPage" parameterType="com.nu.modules.cleanadvisory.entity.CleanAdvisory" resultType="com.nu.modules.cleanadvisory.entity.CleanAdvisory">
+        select
+            a.id,
+            b.id AS applyId,
+            a.open_id AS openId,
+            b.name,
+            a.tel,
+            '1' AS advisoryType,
+            a.iz_yg AS izYg,
+            a.iz_js AS izJs,
+            a.iz_jg AS izJg,
+            a.iz_gys AS izGys,
+            a.create_time AS createTime,
+            b.create_time AS updateTime,
+            '' AS comName
+            FROM nu_biz_advisory_info a
+            INNER JOIN nu_biz_elder_info b ON a.open_id = b.guardian_open_id
+        <where>
+            <if test="params.tel != null and params.tel != ''">
+                AND a.tel = #{params.tel}
+            </if>
+            <if test="params.openId != null and params.openId != ''">
+                AND a.open_id = #{params.openId}
+            </if>
+        </where>
+        union
         select
             a.id,
             b.id as applyId,
             a.open_id as openId,
             b.name,
             a.tel,
-            a.advisory_type as advisoryType,
+            '2' as advisoryType,
             a.iz_yg as izYg,
             a.iz_js as izJs,
             a.iz_jg as izJg,
+            a.iz_gys AS izGys,
             a.create_time as createTime,
             b.create_time as updateTime,
             '' as comName
@@ -31,33 +57,11 @@
             a.open_id as openId,
             b.name,
             a.tel,
-            a.advisory_type as advisoryType,
-            a.iz_yg as izYg,
-            a.iz_js as izJs,
-            a.iz_jg as izJg,
-            a.create_time as createTime,
-            b.create_time as updateTime,
-            '' as comName
-        from nu_biz_advisory_info a inner join nu_employees_advisory_info b on a.open_id = b.open_id
-        <where>
-            <if test="params.tel != null and params.tel != ''">
-                AND a.tel = #{params.tel}
-            </if>
-            <if test="params.openId != null and params.openId != ''">
-                AND a.open_id = #{params.openId}
-            </if>
-        </where>
-        union
-        select
-            a.id,
-            b.id as applyId,
-            a.open_id as openId,
-            b.name,
-            a.tel,
-            a.advisory_type as advisoryType,
+            '3' as advisoryType,
             a.iz_yg as izYg,
             a.iz_js as izJs,
             a.iz_jg as izJg,
+            a.iz_gys AS izGys,
             a.create_time as createTime,
             b.create_time as updateTime,
             ifnull(b.com_name,'') as comName
@@ -70,6 +74,31 @@
                 AND a.open_id = #{params.openId}
             </if>
         </where>
+        union
+        select
+            a.id,
+            b.id AS applyId,
+            a.open_id AS openId,
+            b.person_in_charge as name,
+            a.tel,
+            '4' AS advisoryType,
+            a.iz_yg AS izYg,
+            a.iz_js AS izJs,
+            a.iz_jg AS izJg,
+            a.iz_gys AS izGys,
+            a.create_time AS createTime,
+            b.create_time AS updateTime,
+            ifnull( b.suppliers_name, '' ) AS comName
+        FROM nu_biz_advisory_info a
+        INNER JOIN nu_biz_suppliers_apply b ON a.open_id = b.open_id
+        <where>
+            <if test="params.tel != null and params.tel != ''">
+                AND a.tel = #{params.tel}
+            </if>
+            <if test="params.openId != null and params.openId != ''">
+                AND a.open_id = #{params.openId}
+            </if>
+        </where>
         order by id desc
     </select>
 
@@ -113,4 +142,16 @@
     <update id="updateBaseInfo">
         update nu_base_info set open_id = null , elder_id = null,status = 0 where open_id = #{openId}
     </update>
+    <delete id="deleteOpeSuppliersApply">
+        delete from nu_biz_suppliers_apply where open_id = #{openId}
+    </delete>
+    <delete id="deleteSuppliersOrg">
+        delete from nu_biz_suppliers_org where open_id = #{openId}
+    </delete>
+    <delete id="deleteBizSuppliersApply">
+        delete from nu_config_suppliers_apply where suppliers_id = #{id}
+    </delete>
+    <delete id="deleteSuppliersInfo">
+        delete from nu_config_suppliers_info where id = #{id}
+    </delete>
 </mapper>
diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
index 0b128ed..7e9d2c1 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
@@ -69,6 +69,30 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             cleanAdvisory.setNoticeType("1");
             baseMapper.cleanNotice(cleanAdvisory);
         }
+        //清除机构咨询信息
+        if (advisoryType.equals("4") || advisoryType.equals("-1")) {
+            cleanAdvisory.setIzGys("0");
+            cleanAdvisory.setAdvisoryType("0");
+            updateById(cleanAdvisory);
+            onlycleanAdvisoryServiceImpl.clearSuppliers(cleanAdvisory);
+            //清除消息通知
+            cleanAdvisory.setNoticeType("4");
+            baseMapper.cleanNotice(cleanAdvisory);
+        }
+    }
+
+    public void clearSuppliers(CleanAdvisory cleanAdvisory) {
+        baseMapper.deleteOpeSuppliersApply(cleanAdvisory);
+        baseMapper.deleteSuppliersOrg(cleanAdvisory);
+        onlycleanAdvisoryServiceImpl.deleteSuppliers("101", cleanAdvisory);
+        onlycleanAdvisoryServiceImpl.deleteSuppliers("102", cleanAdvisory);
+        onlycleanAdvisoryServiceImpl.deleteSuppliers("103", cleanAdvisory);
+    }
+
+    @DS("#dataSourceCode")
+    public void deleteSuppliers(String dataSourceCode, CleanAdvisory cleanAdvisory) {
+        baseMapper.deleteBizSuppliersApply(cleanAdvisory);
+        baseMapper.deleteSuppliersInfo(cleanAdvisory);
     }
 
     public void clearEmp(CleanAdvisory cleanAdvisory) {