From b7d16954c4eb49be0018bbb93a42db43888ec302 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 22 Oct 2025 09:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=90=E7=BB=B4=E5=B7=A5?= =?UTF-8?q?=E5=85=B7-=E5=85=A5=E9=A9=BB=E6=B8=85=E9=99=A4-=E9=95=BF?= =?UTF-8?q?=E8=80=85=E3=80=81=E5=91=98=E5=B7=A5=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CleanAdvisoryMapper.java | 8 +++ .../mapper/xml/CleanAdvisoryMapper.xml | 12 ++++ .../impl/CleanAdvisoryServiceImpl.java | 64 ++++++++++++++----- 3 files changed, 68 insertions(+), 16 deletions(-) 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 e92f176..5630b5c 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 @@ -19,4 +19,12 @@ public interface CleanAdvisoryMapper extends BaseMapper { void updateBaseInfo(CleanAdvisory cleanAdvisory); void deleteBizEmployeesOrg(CleanAdvisory cleanAdvisory); + + void deleteElderInfo(CleanAdvisory cleanAdvisory); + + void deleteElderModifyInfo(CleanAdvisory cleanAdvisory); + + void deleteEmpApply(CleanAdvisory cleanAdvisory); + + void deleteEmpInfo(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 7299325..6b5473a 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 @@ -95,6 +95,18 @@ delete from nu_nu_bill where open_id = #{openId} + + delete from nu_biz_elder_info where guardian_open_id = #{openId} + + + delete from nu_biz_elder_modify_info where guardian_open_id = #{openId} + + + delete from nu_biz_employees_apply where open_id = #{openId} + + + delete from nu_biz_employees_info where open_id = #{openId} + update nu_base_info set open_id = null , elder_id = null,status = 0 where open_id = #{openId} 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 8db4470..d4fd5ef 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 @@ -25,55 +25,87 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl findPage(Page page, CleanAdvisory cleanAdvisory){ - return baseMapper.findPage(page,cleanAdvisory); + public IPage findPage(Page page, CleanAdvisory cleanAdvisory) { + return baseMapper.findPage(page, cleanAdvisory); } @Override @DS("ope") - public void clean(CleanAdvisory cleanAdvisory){ + public void clean(CleanAdvisory cleanAdvisory) { String advisoryType = cleanAdvisory.getAdvisoryType(); //清除长者咨询信息 - if(advisoryType.equals("1")){ + if (advisoryType.equals("1")) { cleanAdvisory.setIzJs("0"); cleanAdvisory.setAdvisoryType("0"); updateById(cleanAdvisory); - //预留删除长者表数据 - clearBill(cleanAdvisory); + //清除长者/监护人信息、变更信息 + onlycleanAdvisoryServiceImpl.clearElder(cleanAdvisory); + //清除老人账单数据、还原护理单元状态 + onlycleanAdvisoryServiceImpl.clearBill(cleanAdvisory); } //清除员工咨询信息 - if(advisoryType.equals("2")){ + if (advisoryType.equals("2")) { cleanAdvisory.setIzYg("0"); cleanAdvisory.setAdvisoryType("0"); updateById(cleanAdvisory); baseMapper.deleteEmployeesAdvisory(cleanAdvisory); baseMapper.deleteBizEmployeesOrg(cleanAdvisory); + //清除各业务员工数据 + onlycleanAdvisoryServiceImpl.clearEmp(cleanAdvisory); } //清除机构咨询信息 - if(advisoryType.equals("3")){ + if (advisoryType.equals("3")) { cleanAdvisory.setIzJg("0"); cleanAdvisory.setAdvisoryType("0"); updateById(cleanAdvisory); baseMapper.deleteOrgApply(cleanAdvisory); } } - //清除长者信息 - public void clearBill(CleanAdvisory cleanAdvisory){ - //预留删除长者表数据 - onlycleanAdvisoryServiceImpl.deleteBill("101",cleanAdvisory); - onlycleanAdvisoryServiceImpl.deleteBill("102",cleanAdvisory); - onlycleanAdvisoryServiceImpl.deleteBill("103",cleanAdvisory); + + public void clearEmp(CleanAdvisory cleanAdvisory) { + onlycleanAdvisoryServiceImpl.deleteEmp("101", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteEmp("102", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteEmp("103", cleanAdvisory); } @DS("#dataSourceCode") - public void deleteBill(@RequestParam("dataSourceCode") String dataSourceCode,CleanAdvisory cleanAdvisory) { + public void deleteEmp(String dataSourceCode, CleanAdvisory cleanAdvisory) { + baseMapper.deleteEmpApply(cleanAdvisory); + baseMapper.deleteEmpInfo(cleanAdvisory); + } + + public void clearElder(CleanAdvisory cleanAdvisory) { + onlycleanAdvisoryServiceImpl.deleteElder("ope", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteElder("101", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteElder("102", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteElder("103", cleanAdvisory); + } + + @DS("#dataSourceCode") + public void deleteElder(String dataSourceCode, CleanAdvisory cleanAdvisory) { + baseMapper.deleteElderInfo(cleanAdvisory); + if (!"ope".equals(dataSourceCode)) { + baseMapper.deleteElderModifyInfo(cleanAdvisory); + } + } + + //清除长者信息 + public void clearBill(CleanAdvisory cleanAdvisory) { + //预留删除长者表数据 + onlycleanAdvisoryServiceImpl.deleteBill("101", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteBill("102", cleanAdvisory); + onlycleanAdvisoryServiceImpl.deleteBill("103", cleanAdvisory); + } + + @DS("#dataSourceCode") + public void deleteBill(@RequestParam("dataSourceCode") String dataSourceCode, CleanAdvisory cleanAdvisory) { baseMapper.deleteBill(cleanAdvisory); baseMapper.updateBaseInfo(cleanAdvisory); } @Override @DS("ope") - public void delete(CleanAdvisory cleanAdvisory){ + public void delete(CleanAdvisory cleanAdvisory) { clearBill(cleanAdvisory); baseMapper.deleteEmployeesAdvisory(cleanAdvisory); baseMapper.deleteBizEmployeesOrg(cleanAdvisory);