调整入驻清除-清除所有：点击同一电话号任一数据的清除所有时，清除该电话下所有数据，而非对应一条数据，同时清空注册手机号及小程序内部通知

nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/entity/CleanAdvisory.java

@@ -49,4 +49,8 @@ public class CleanAdvisory implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+    //消息通知类型
+    @TableField(exist = false)
+    private String noticeType;
 }

nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java

@@ -27,4 +27,8 @@ public interface CleanAdvisoryMapper extends BaseMapper<CleanAdvisory> {
     void deleteEmpApply(CleanAdvisory cleanAdvisory);
 
     void deleteEmpInfo(CleanAdvisory cleanAdvisory);
+
+    void cleanNotice(CleanAdvisory cleanAdvisory);
+
+    void cleanAccountInfo(CleanAdvisory cleanAdvisory);
 }

nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml

@@ -104,6 +104,12 @@
     <delete id="deleteEmpInfo">
         delete from nu_biz_employees_info where open_id = #{openId}
     </delete>
+    <delete id="cleanNotice">
+        delete from nu_wx_notice where open_id = #{openId} and client_type = #{noticeType}
+    </delete>
+    <delete id="cleanAccountInfo">
+        delete from nu_biz_advisory_info where open_id = #{openId}
+    </delete>
     <update id="updateBaseInfo">
         update nu_base_info set open_id = null , elder_id = null,status = 0 where open_id = #{openId}
     </update>

nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java

@@ -42,6 +42,9 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             onlycleanAdvisoryServiceImpl.clearElder(cleanAdvisory);
             //清除老人账单数据、还原护理单元状态
             onlycleanAdvisoryServiceImpl.clearBill(cleanAdvisory);
+            //清除消息通知
+            cleanAdvisory.setNoticeType("3");
+            baseMapper.cleanNotice(cleanAdvisory);
         }
         //清除员工咨询信息
         if (advisoryType.equals("2") || advisoryType.equals("-1")) {
@@ -52,6 +55,9 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             baseMapper.deleteBizEmployeesOrg(cleanAdvisory);
             //清除各业务员工数据
             onlycleanAdvisoryServiceImpl.clearEmp(cleanAdvisory);
+            //清除消息通知
+            cleanAdvisory.setNoticeType("2");
+            baseMapper.cleanNotice(cleanAdvisory);
         }
         //清除机构咨询信息
         if (advisoryType.equals("3") || advisoryType.equals("-1")) {
@@ -59,6 +65,9 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             cleanAdvisory.setAdvisoryType("0");
             updateById(cleanAdvisory);
             baseMapper.deleteOrgApply(cleanAdvisory);
+            //清除消息通知
+            cleanAdvisory.setNoticeType("1");
+            baseMapper.cleanNotice(cleanAdvisory);
         }
     }
 
@@ -108,6 +117,8 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     public void delete(CleanAdvisory cleanAdvisory) {
         cleanAdvisory.setAdvisoryType("-1");
         onlycleanAdvisoryServiceImpl.clean(cleanAdvisory);
+        //清除账号信息
+        baseMapper.cleanAccountInfo(cleanAdvisory);
     }
 
 }