From b3d0c0465cace0e882693ca3cb83fb1db541c58b Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 19 Nov 2025 13:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=9B=B8=E5=85=B301=E8=BD=AC?= =?UTF-8?q?YN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advisoryinfo/api/IAdvisoryInfoApi.java | 2 + .../nu/modules/sysconfig/SysConfigEntity.java | 2 +- .../service/impl/AdvisoryInfoServiceImpl.java | 63 +++++++++++-------- .../mapper/xml/EmployeesOrgMapper.xml | 2 +- .../xml/NuEmployeesAdvisoryInfoMapper.xml | 2 +- .../service/impl/EmployeesOrgServiceImpl.java | 14 ++--- .../NuEmployeesAdvisoryInfoServiceImpl.java | 6 +- .../service/impl/OrgApplyInfoServiceImpl.java | 11 ++++ .../modules/sysconfig/entity/SysConfig.java | 4 +- .../listener/EmployeesMQListener.java | 42 ++++++------- .../nu/modules/wechat/elder/api/ElderApi.java | 3 + .../orgapplyinfo/api/OrgApplyInfoApi.java | 15 ----- .../main/java/com/nu/dto/BodyTagMQDto.java | 2 +- .../main/java/com/nu/dto/CategoryMQDto.java | 2 +- .../java/com/nu/dto/DirectiveAsyncMQDto.java | 2 +- .../java/com/nu/dto/DirectiveTypeMQDto.java | 2 +- .../java/com/nu/dto/ElderTagTypeMQDto.java | 2 +- .../main/java/com/nu/dto/EmotionTagMQDto.java | 2 +- .../java/com/nu/dto/InstructionTagMQDto.java | 2 +- .../main/java/com/nu/dto/SysConfigMQDto.java | 2 +- .../eldertagtypere/entity/ElderTagTypeRe.java | 6 +- .../entity/ConfigMaterialCategory.java | 4 +- .../entity/ConfigMaterialInfo.java | 4 +- .../entity/ConfigMaterialMedication.java | 4 +- .../entity/ConfigMaterialType.java | 4 +- .../directivebk/entity/DirectiveBkItem.java | 4 +- .../entity/DirectivePackage.java | 2 +- .../body/entity/DirectiveBodyTag.java | 2 +- .../emotion/entity/DirectiveEmotionTag.java | 2 +- .../instructiontag/entity/InstructionTag.java | 2 +- .../entity/ConfigServiceCategory.java | 2 +- .../entity/ConfigServiceDirective.java | 2 +- .../modules/servicetag/entity/ServiceTag.java | 2 +- .../servicetype/entity/ConfigServiceType.java | 2 +- .../controller/SysDepartController.java | 4 +- .../service/impl/SysDepartServiceImpl.java | 8 +-- 36 files changed, 125 insertions(+), 111 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/api/IAdvisoryInfoApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/api/IAdvisoryInfoApi.java index 3404717..822b9c6 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/api/IAdvisoryInfoApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/api/IAdvisoryInfoApi.java @@ -20,4 +20,6 @@ public interface IAdvisoryInfoApi { String addGuardian(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo); void changeClientType(String openId, String type); + + void upJs(String guardianOpenId, Boolean izJs); } diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/SysConfigEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/SysConfigEntity.java index adca0c1..ddd0677 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/SysConfigEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/SysConfigEntity.java @@ -45,7 +45,7 @@ public class SysConfigEntity implements Serializable { */ private String descr; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ private String izEnabled; /** diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/impl/AdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/impl/AdvisoryInfoServiceImpl.java index f152dfa..b18e69f 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/impl/AdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/impl/AdvisoryInfoServiceImpl.java @@ -72,14 +72,14 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); - uw.eq("open_id",advisoryInfoDto.getOpenId()); + uw.eq("open_id", advisoryInfoDto.getOpenId()); AdvisoryInfo upData = new AdvisoryInfo(); upData.setAvatar(advisoryInfoDto.getAvatar());//改头像 upData.setNickName(advisoryInfoDto.getNickName());//改昵称 @@ -88,23 +88,23 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("open_id",advisoryInfoDto.getOpenId()); + qw.eq("open_id", advisoryInfoDto.getOpenId()); AdvisoryInfo one = baseMapper.selectOne(qw); AdvisoryInfo advisoryInfo = new AdvisoryInfo(); - BeanUtils.copyProperties(advisoryInfoDto,advisoryInfo); - if(one == null){ + BeanUtils.copyProperties(advisoryInfoDto, advisoryInfo); + if (one == null) { baseMapper.insert(advisoryInfo); return advisoryInfo.getId(); - }else{ + } else { UpdateWrapper uw = new UpdateWrapper<>(); - uw.eq("open_id",advisoryInfoDto.getOpenId()); + uw.eq("open_id", advisoryInfoDto.getOpenId()); AdvisoryInfo upData = new AdvisoryInfo(); upData.setName(advisoryInfoDto.getName());//咨询人姓名 upData.setIdCard(advisoryInfoDto.getIdCard());//身份证号 @@ -112,9 +112,9 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); - uw.eq("open_id",openId); - baseMapper.update(advisoryInfo,uw); + uw.eq("open_id", openId); + baseMapper.update(advisoryInfo, uw); + } + + @Override + public void upJs(String guardianOpenId, Boolean izJs) { + UpdateWrapper uw = new UpdateWrapper<>(); + uw.eq("open_id", guardianOpenId); + AdvisoryInfo upData = new AdvisoryInfo(); + if (izJs) { + upData.setIzJs("Y");//给予家属身份 + }else{ + upData.setIzJs("N");//取消家属身份 + } + baseMapper.update(upData, uw); } /** @@ -159,7 +172,7 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.orderByDesc("plat_id"); qw.last("limit 1"); @@ -180,29 +193,29 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("open_id",openId); + queryWrapper.eq("open_id", openId); AdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(queryWrapper); - if(nuBizAdvisoryInfo==null) { + if (nuBizAdvisoryInfo == null) { return null; } - if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getAdvisoryType())){ - String dictText = commonApi.translateDict("advisory_type",nuBizAdvisoryInfo.getAdvisoryType()); + if (StringUtils.isNotBlank(nuBizAdvisoryInfo.getAdvisoryType())) { + String dictText = commonApi.translateDict("advisory_type", nuBizAdvisoryInfo.getAdvisoryType()); nuBizAdvisoryInfo.setAdvisoryTypeName(dictText); } - if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getSex())){ - String dictText = commonApi.translateDict("sex",nuBizAdvisoryInfo.getSex()); + if (StringUtils.isNotBlank(nuBizAdvisoryInfo.getSex())) { + String dictText = commonApi.translateDict("sex", nuBizAdvisoryInfo.getSex()); nuBizAdvisoryInfo.setSexName(dictText); } - if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getSysOrgCode())){ - String dictText = commonApi.translateDictFromTable("sys_depart","depart_name","id",nuBizAdvisoryInfo.getSysOrgCode()); + if (StringUtils.isNotBlank(nuBizAdvisoryInfo.getSysOrgCode())) { + String dictText = commonApi.translateDictFromTable("sys_depart", "depart_name", "id", nuBizAdvisoryInfo.getSysOrgCode()); nuBizAdvisoryInfo.setSysOrgCodeName(dictText); } - if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getStatus())){ - String dictText = commonApi.translateDict("advisory_approval",nuBizAdvisoryInfo.getStatus()); + if (StringUtils.isNotBlank(nuBizAdvisoryInfo.getStatus())) { + String dictText = commonApi.translateDict("advisory_approval", nuBizAdvisoryInfo.getStatus()); nuBizAdvisoryInfo.setStatusName(dictText); } NuBizAdvisoryInfoEntity result = new NuBizAdvisoryInfoEntity(); - BeanUtils.copyProperties(nuBizAdvisoryInfo,result); + BeanUtils.copyProperties(nuBizAdvisoryInfo, result); return result; } @@ -223,7 +236,7 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index a691d16..58bdd16 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -48,7 +48,7 @@ ON adinfo.open_id = eo.open_id AND eo.org_code = #{orgCode} - AND eo.iz_history = '1' + AND eo.iz_history = 'N' WHERE adinfo.open_id = #{openId} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java index f3571c6..92821f4 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java @@ -36,9 +36,9 @@ public class EmployeesOrgServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); EmployeesOrg udto = new EmployeesOrg(); - udto.setIzHistory("0"); + udto.setIzHistory("Y"); baseMapper.update(udto, uw); EmployeesOrg employeesOrg = new EmployeesOrg(); @@ -46,8 +46,8 @@ public class EmployeesOrgServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.in("org_code", orgCodes.split(",")); qw.eq("open_id", openId); - qw.eq("iz_history", "1"); + qw.eq("iz_history", "N"); List list = baseMapper.selectList(qw); List result = BeanUtil.copyToList(list, EmployeesOrgApiEntity.class); return result; @@ -69,7 +69,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("employees_id", employeeId); qw.eq("org_code", orgCode); - qw.eq("iz_history", "1"); + qw.eq("iz_history", "N"); EmployeesOrg employeesOrg = baseMapper.selectOne(qw); if (employeesOrg != null) { if ("1".equals(employeesOrg.getStatus())) { @@ -87,7 +87,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); uw.eq("apply_type", "0"); EmployeesOrg udto = new EmployeesOrg(); udto.setStatus(dto.getStatus()); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index e2e939f..573a4da 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -66,7 +66,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("employees_id", dto.getId()); - qw.eq("iz_history", "1"); + qw.eq("iz_history", "N"); qw.eq("org_code", dto.getOrgCode()); EmployeesOrg oldData = employeesOrgService.getOne(qw); @@ -83,7 +83,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); employeesOrgService.update(employeesOrg, uw); //审批通过，判断是否需要通知业务系统初始化登录账户。需要初始化则直接通知；不需要初始化则需要从已存在的业务系统中获取账号信息，并将账号信息通知给此审批的业务系统 @@ -81,11 +81,11 @@ public class EmployeesMQListener { //需要初始化，直接通知审批业务系统进行初始化 SysUserMQDto sysUserMQDto = new SysUserMQDto(); sysUserMQDto.setEmployeeId(dto.getEmployeeId()); - sysUserMQDto.setIzInit("1"); + sysUserMQDto.setIzInit("Y"); sysUserMQDto.setIzInitPassword("1"); NuEmployeesAdvisoryInfo employeesAd = employeesAdvisoryInfoService.getById(dto.getEmployeeId()); - if (employeesAd.getIzInit().equals("1")) { + if (employeesAd.getIzInit().equals("Y")) { //不需要更新其他业务平台密码 sysUserMQDto.setIzInitPassword("0"); } else { @@ -97,8 +97,8 @@ public class EmployeesMQListener { } else { UpdateWrapper uwOrg = new UpdateWrapper<>(); uwOrg.eq("employees_id", dto.getEmployeeId()); - uwOrg.eq("iz_freeze", "0");//未冻结 - uwOrg.eq("iz_history", "1");//非历史 + uwOrg.eq("iz_freeze", "N");//未冻结 + uwOrg.eq("iz_history", "N");//非历史 uwOrg.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过 uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构 EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg); @@ -130,7 +130,7 @@ public class EmployeesMQListener { public void handleEmpLastLogin(SysUserMQDto dto) { NuEmployeesAdvisoryInfo employeesAd = new NuEmployeesAdvisoryInfo(); employeesAd.setId(dto.getEmployeeId()); - employeesAd.setIzInit("0"); + employeesAd.setIzInit("N"); employeesAd.setLastLoginOrg(dto.getOrgCode()); employeesAd.setLastLoginTime(new Date()); employeesAdvisoryInfoService.updateById(employeesAd); @@ -148,7 +148,7 @@ public class EmployeesMQListener { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("iz_freeze", "0");//未冻结 - uw.eq("iz_history", "1");//非历史 + uw.eq("iz_history", "N");//非历史 uw.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过 List list = employeesOrgService.list(uw); if (list.size() > 0) { @@ -168,7 +168,7 @@ public class EmployeesMQListener { exchange = @Exchange(name = "hldy.employees", type = ExchangeTypes.DIRECT), key = "hldy.employeesorg.sysuser.info"), errorHandler = "employeesMQErrorHandler") public void handleSysuserInfo(SysUserMQDto dto) { - dto.setIzInit("0"); + dto.setIzInit("N"); dto.setIzInitPassword("0");//需要更新其他业务平台密码 rabbitMQUtil.sendToExchange("hldy.employees", dto.getTargetOrgCode() + ".employees.initsysuser", dto); } @@ -203,7 +203,7 @@ public class EmployeesMQListener { UpdateWrapper uwOrg = new UpdateWrapper<>(); uwOrg.eq("employees_id", dto.getEmployeeId()); uwOrg.eq("iz_freeze", "0");//未冻结 - uwOrg.eq("iz_history", "1");//非历史 + uwOrg.eq("iz_history", "N");//非历史 uwOrg.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过 uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构 EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg); @@ -238,7 +238,7 @@ public class EmployeesMQListener { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); employeesOrgService.update(employeesOrg, uw); } @@ -257,7 +257,7 @@ public class EmployeesMQListener { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); employeesOrgService.update(employeesOrg, uw); } @@ -276,7 +276,7 @@ public class EmployeesMQListener { qw.eq("employees_id", dto.getEmployeeId()); qw.eq("org_code", dto.getOrgCode()); qw.eq("status", "1"); - qw.eq("iz_history", "1"); + qw.eq("iz_history", "N"); qw.eq("apply_type", "1"); EmployeesOrg one = employeesOrgService.getOne(qw); if (one != null) { @@ -290,7 +290,7 @@ public class EmployeesMQListener { uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); EmployeesOrg udto = new EmployeesOrg(); - udto.setIzHistory("0"); + udto.setIzHistory("Y"); employeesOrgService.update(udto, uw); //向员工-机构关系表插数据 @@ -299,10 +299,10 @@ public class EmployeesMQListener { employeesOrg.setEmployeesId(dto.getEmployeeId()); employeesOrg.setOrgCode(dto.getOrgCode()); employeesOrg.setStatus("1"); - employeesOrg.setIzOnline("1"); - employeesOrg.setIzFreeze("0"); + employeesOrg.setIzOnline("N"); + employeesOrg.setIzFreeze("N"); employeesOrg.setApplyType("0"); - employeesOrg.setIzHistory("1"); + employeesOrg.setIzHistory("N"); employeesOrgService.save(employeesOrg); //增加机构邀请员工的消息通知 @@ -346,7 +346,7 @@ public class EmployeesMQListener { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); // uw.eq("org_code", dto.getOrgCode()); -// uw.eq("iz_history", "1"); +// uw.eq("iz_history", "N"); EmployeesOrg eo = new EmployeesOrg(); eo.setModifyStatus("2"); employeesOrgService.update(eo, uw); @@ -354,7 +354,7 @@ public class EmployeesMQListener { uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); eo = new EmployeesOrg(); eo.setStatus("2"); employeesOrgService.update(eo, uw); @@ -398,7 +398,7 @@ public class EmployeesMQListener { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); // uw.eq("org_code", dto.getOrgCode()); -// uw.eq("iz_history", "1"); +// uw.eq("iz_history", "N"); EmployeesOrg eo = new EmployeesOrg(); eo.setModifyStatus("3"); employeesOrgService.update(eo, uw); @@ -406,7 +406,7 @@ public class EmployeesMQListener { uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); + uw.eq("iz_history", "N"); eo = new EmployeesOrg(); eo.setStatus("3"); eo.setAuditContent(dto.getAuditContent()); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index f6bdd30..ba4e8d7 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -330,6 +330,9 @@ public class ElderApi { BeanUtils.copyProperties(mqdto, elderInfoEn); elderInfoApi.addElder(elderInfoEn); + //调整用户咨询表是否是家属标识 + advisoryInfoApi.upJs(elderInfoEn.getGuardianOpenId(), true); + return Result.ok(id); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index 5e6bf19..a85fa7f 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -1,7 +1,5 @@ package com.nu.modules.wechat.orgapplyinfo.api; -import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi; -import com.nu.entity.EmployeesAdvisoryInfoEntity; import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi; import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity; import com.nu.utils.NuRedisUtils; @@ -20,9 +18,6 @@ public class OrgApplyInfoApi { @Autowired private IOrgApplyInfoApi orgApplyInfoApi; - @Autowired - private IEmployessAdvisioryInfoApi employessAdvisioryInfoApi; - /** * 新增/编辑机构加盟申请信息 * @@ -42,16 +37,6 @@ public class OrgApplyInfoApi { return Result.ok("重复提交"); } System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------" + orgApplyInfoApiEntity.getTel()); - if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getTel())) { - EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity = new EmployeesAdvisoryInfoEntity(); - employeesAdvisoryInfoEntity.setTel(orgApplyInfoApiEntity.getTel()); - employeesAdvisoryInfoEntity.setAdvisoryType("3"); - employeesAdvisoryInfoEntity.setIzJg("1"); - System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity1------------" + employeesAdvisoryInfoEntity.getTel()); - System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity2------------" + employeesAdvisoryInfoEntity.getAdvisoryType()); - System.out.println("-----------新增/编辑机构加盟申请信息--------employeesAdvisoryInfoEntity3------------" + employeesAdvisoryInfoEntity.getIzJg()); - employessAdvisioryInfoApi.updateByTel(employeesAdvisoryInfoEntity); - } if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId())) { orgApplyInfoApi.updateById(orgApplyInfoApiEntity); return Result.ok("保存成功！"); diff --git a/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java index 4357d6b..c1e3e4d 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java @@ -31,7 +31,7 @@ public class BodyTagMQDto implements Serializable { */ private String status; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ private String izEnabled; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java index 1ccb2fe..213e8f2 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java @@ -36,7 +36,7 @@ public class CategoryMQDto implements Serializable { */ private String status; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ private String izEnabled; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java index 3f7aa6b..012db0e 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java @@ -73,7 +73,7 @@ public class DirectiveAsyncMQDto implements Serializable { */ private String status; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ private String izEnabled; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java index f9b5732..a87619b 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java @@ -51,7 +51,7 @@ public class DirectiveTypeMQDto implements Serializable { */ private String status; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ private String izEnabled; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagTypeMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagTypeMQDto.java index a14ff5e..39d90d2 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagTypeMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagTypeMQDto.java @@ -18,7 +18,7 @@ public class ElderTagTypeMQDto implements Serializable { private String id; /**标签类型名称*/ private String typeName; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ private String izEnabled; /**是否删除 0未删除 1删除*/ private String delFlag; diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java index 025e67c..04219cf 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java @@ -31,7 +31,7 @@ public class EmotionTagMQDto implements Serializable { */ private String status; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ private String izEnabled; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java index ee8f4dc..7109c5c 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java @@ -22,7 +22,7 @@ public class InstructionTagMQDto implements Serializable { private Integer sort; /**状态 0已授权 1未授权*/ private String status; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ private String izEnabled; /**是否删除 0未删除 1删除*/ private String delFlag; diff --git a/nursing-unit-common/src/main/java/com/nu/dto/SysConfigMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/SysConfigMQDto.java index f1e6ca4..6489f80 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/SysConfigMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/SysConfigMQDto.java @@ -34,7 +34,7 @@ public class SysConfigMQDto implements Serializable { private String configValue; /**备注*/ private String descr; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ private String izEnabled; /**是否删除 0未删除 1删除*/ private String delFlag; diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/entity/ElderTagTypeRe.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/entity/ElderTagTypeRe.java index da8a3bc..a377760 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/entity/ElderTagTypeRe.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/entity/ElderTagTypeRe.java @@ -40,10 +40,10 @@ public class ElderTagTypeRe implements Serializable { @Excel(name = "标签类型名称", width = 15) @ApiModelProperty(value = "标签类型名称") private String typeName; - /**是否启用 0启用 1未启用*/ - @Excel(name = "是否启用 0启用 1未启用", width = 15, dicCode = "iz_enabled") + /**是否启用 Y启用 N未启用*/ + @Excel(name = "是否启用 Y启用 N未启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @ApiModelProperty(value = "是否启用 Y启用 N未启用") private String izEnabled; /**是否删除 0未删除 1删除*/ @Excel(name = "是否删除 0未删除 1删除", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java index 20b90ca..064f1ca 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java @@ -40,10 +40,10 @@ public class ConfigMaterialCategory implements Serializable { @Excel(name = "物料类别名称", width = 15) @ApiModelProperty(value = "物料类别名称") private java.lang.String categoryName; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @ApiModelProperty(value = "是否启用 Y启用 N未启用") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ @Excel(name = "是否删除 0未删除 1删除", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java index 98e9ded..c09f186 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java @@ -118,9 +118,9 @@ public class ConfigMaterialInfo implements Serializable { /**物料标识*/ @ApiModelProperty(value = "物料标识") private java.lang.String materialIdent; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @ApiModelProperty(value = "是否启用 Y启用 N未启用") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ @ApiModelProperty(value = "是否删除 0未删除 1删除") diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java index efa2ad5..42fae6d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java @@ -52,10 +52,10 @@ public class ConfigMaterialMedication implements Serializable { @Excel(name = "名称", width = 15) @ApiModelProperty(value = "名称") private java.lang.String medicationName; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @ApiModelProperty(value = "是否启用 Y启用 N未启用") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ @ApiModelProperty(value = "是否删除 0未删除 1删除") diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java index 5eb211c..95769a9 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java @@ -47,10 +47,10 @@ public class ConfigMaterialType implements Serializable { @Excel(name = "物料类型", width = 15) @ApiModelProperty(value = "物料类型") private java.lang.String typeName; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @ApiModelProperty(value = "是否启用 Y启用 N未启用") private java.lang.String izEnabled; /**是否删除 0未删除 1删除*/ @ApiModelProperty(value = "是否删除 0未删除 1删除") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java index 2477ede..8d026dd 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java @@ -150,9 +150,9 @@ public class DirectiveBkItem implements Serializable { @ApiModelProperty(value = "服务时长（分钟）") private java.lang.String serviceDuration; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ - @ApiModelProperty(value = "是否启用 0启用 1未启用") + @ApiModelProperty(value = "是否启用 Y启用 N未启用") private java.lang.String izEnabled; /** * 是否删除 0未删除 1删除 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java index 5a553a9..c8d14de 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java @@ -48,7 +48,7 @@ public class DirectivePackage implements Serializable { @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private java.lang.Integer sort; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") @ApiModelProperty(value = "是否启用") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java index e58f00a..794ae71 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java @@ -47,7 +47,7 @@ public class DirectiveBodyTag implements Serializable { @ApiModelProperty(value = "状态 0已授权 1未授权") @Dict(dicCode = "status") private java.lang.String status; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") @ApiModelProperty(value = "是否启用") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java index 94b33e2..f50e442 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java @@ -47,7 +47,7 @@ public class DirectiveEmotionTag implements Serializable { @ApiModelProperty(value = "状态 0已授权 1未授权") @Dict(dicCode = "status") private java.lang.String status; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") @ApiModelProperty(value = "是否启用") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java index c9fb52b..b0bf95c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java @@ -51,7 +51,7 @@ public class InstructionTag implements Serializable { @ApiModelProperty(value = "状态 0已授权 1未授权") @Dict(dicCode = "status") private java.lang.String status; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java index 1a49725..5a98db3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java @@ -52,7 +52,7 @@ public class ConfigServiceCategory implements Serializable { @ApiModelProperty(value = "状态 0已授权 1未授权") @Dict(dicCode = "status") private java.lang.String status; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index cd163e7..13959c2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -129,7 +129,7 @@ public class ConfigServiceDirective implements Serializable { @Dict(dicCode = "directive_status") private java.lang.String status; /** - * 是否启用 0启用 1未启用 + * 是否启用 Y启用 N未启用 */ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java index 724cbda..910367f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java @@ -45,7 +45,7 @@ public class ServiceTag implements Serializable { @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") private Integer sort; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") @Dict(dicCode = "iz_enabled") @ApiModelProperty(value = "是否启用") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java index 1fe2253..c4c4bc0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java @@ -57,7 +57,7 @@ public class ConfigServiceType implements Serializable { @ApiModelProperty(value = "状态 0已授权 1未授权") @Dict(dicCode = "status") private java.lang.String status; - /**是否启用 0启用 1未启用*/ + /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index 4ca0330..f773988 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -786,7 +786,7 @@ public class SysDepartController { config.setConfigKey("directive_main_org_code"); config.setConfigValue(orgCode); config.setDescr("服务指令主指令库机构编码"); - config.setIzEnabled("0"); + config.setIzEnabled("Y"); config.setDelFlag("0"); sysConfigApi.asyncApi(config); @@ -805,7 +805,7 @@ public class SysDepartController { config.setConfigKey("elder_tag_main_org_code"); config.setConfigValue(orgCode); config.setDescr("长者标签标准指令库机构编码"); - config.setIzEnabled("0"); + config.setIzEnabled("Y"); config.setDelFlag("0"); sysConfigApi.asyncApi(config); diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 5d5504c..6ad5cb9 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -1360,13 +1360,13 @@ public class SysDepartServiceImpl extends ServiceImpl uqw1 = new QueryWrapper<>(); uqw1.ne("org_code",orgCode); - sysDepart.setIzDirectiveMain("1"); + sysDepart.setIzDirectiveMain("N"); baseMapper.update(sysDepart,uqw1); //将当前机构变更为指令库 QueryWrapper uqw2 = new QueryWrapper<>(); uqw2.eq("org_code",orgCode); - sysDepart.setIzDirectiveMain("0"); + sysDepart.setIzDirectiveMain("Y"); baseMapper.update(sysDepart,uqw2); } @@ -1377,13 +1377,13 @@ public class SysDepartServiceImpl extends ServiceImpl uqw1 = new QueryWrapper<>(); uqw1.ne("org_code",orgCode); - sysDepart.setIzElderTagMain("1"); + sysDepart.setIzElderTagMain("N"); baseMapper.update(sysDepart,uqw1); //将当前机构变更为指令库 QueryWrapper uqw2 = new QueryWrapper<>(); uqw2.eq("org_code",orgCode); - sysDepart.setIzElderTagMain("0"); + sysDepart.setIzElderTagMain("Y"); baseMapper.update(sysDepart,uqw2); }