yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

员工相关01转YN

This commit is contained in:
1378012178@qq.com 2025-11-19 13:52:32 +08:00
parent 5037cd1d2d
commit b3d0c0465c
36 changed files with 125 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/api/IAdvisoryInfoApi.java
View File

@ -20,4 +20,6 @@ public interface IAdvisoryInfoApi {
String addGuardian(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo);
void changeClientType(String openId, String type);
void upJs(String guardianOpenId, Boolean izJs);
}

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/SysConfigEntity.java
View File

@ -45,7 +45,7 @@ public class SysConfigEntity implements Serializable {
*/
private String descr;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
private String izEnabled;
/**

63
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/impl/AdvisoryInfoServiceImpl.java
View File

@ -72,14 +72,14 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl<AdvisoryInfoMapper, Adv
nuBizAdvisoryInfo.setToken(token);
}
NuBizAdvisoryInfoEntity result = new NuBizAdvisoryInfoEntity();
BeanUtils.copyProperties(nuBizAdvisoryInfo,result);
BeanUtils.copyProperties(nuBizAdvisoryInfo, result);
return result;
}
@Override
public void editNuBizAdvisoryInfo(NuBizAdvisoryInfoEntity advisoryInfoDto) {
UpdateWrapper<AdvisoryInfo> 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<AdvisoryInfoMapper, Adv
upData.setTel(advisoryInfoDto.getTel());//电话号
upData.setHomeAddress(advisoryInfoDto.getHomeAddress());//家庭住址
upData.setWorkUnit(advisoryInfoDto.getWorkUnit());//工作单位
baseMapper.update(upData,uw);
baseMapper.update(upData, uw);
}
@Override
public String addGuardian(NuBizAdvisoryInfoEntity advisoryInfoDto) {
QueryWrapper<AdvisoryInfo> 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<AdvisoryInfo> 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<AdvisoryInfoMapper, Adv
upData.setHomeAddress(advisoryInfoDto.getHomeAddress());//家庭住址
upData.setWorkUnit(advisoryInfoDto.getWorkUnit());//工作单位
upData.setStatus("2");//无审核 - 即审核直接通过
upData.setIzJs("1");//给予家属身份
upData.setIzJs("Y");//给予家属身份
upData.setAdvisoryType("1");//切换默认登录端为长者端
baseMapper.update(upData,uw);
baseMapper.update(upData, uw);
return null;
}
}
@ -125,8 +125,21 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl<AdvisoryInfoMapper, Adv
advisoryInfo.setAdvisoryType(type);
UpdateWrapper<AdvisoryInfo> 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<AdvisoryInfo> 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<AdvisoryInfoMapper, Adv
@Override
public void handlePlatId(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) {
AdvisoryInfo advisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(nuBizAdvisoryInfo,advisoryInfo);
BeanUtils.copyProperties(nuBizAdvisoryInfo, advisoryInfo);
QueryWrapper<AdvisoryInfo> qw = new QueryWrapper<>();
qw.orderByDesc("plat_id");
qw.last("limit 1");
@ -180,29 +193,29 @@ public class AdvisoryInfoServiceImpl extends ServiceImpl<AdvisoryInfoMapper, Adv
@Override
public NuBizAdvisoryInfoEntity queryByOpenId(String openId) {
QueryWrapper<AdvisoryInfo> 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<AdvisoryInfoMapper, Adv
@Override
public void saveData(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) {
AdvisoryInfo advisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(nuBizAdvisoryInfo,advisoryInfo);
BeanUtils.copyProperties(nuBizAdvisoryInfo, advisoryInfo);
baseMapper.insert(advisoryInfo);
}

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml
View File

@ -12,7 +12,7 @@
ON a.org_code = b.org_code
WHERE a.employees_id = #{employeesId}
AND a.iz_freeze = '0'
AND a.iz_history = '1'
AND a.iz_history = 'N'
AND (a.status = '2' or a.apply_type = '2')
</select>

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml
View File

@ -48,7 +48,7 @@
ON adinfo.open_id = eo.open_id
<if test="orgCode != null and orgCode != ''">
AND eo.org_code = #{orgCode}
AND eo.iz_history = '1'
AND eo.iz_history = 'N'
</if>
WHERE adinfo.open_id = #{openId}
</select>

14
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java
View File

@ -36,9 +36,9 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
UpdateWrapper<EmployeesOrg> 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<EmployeesOrgMapper, Emp
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("1");
baseMapper.insert(employeesOrg);
return employeesOrg.getId();
@ -58,7 +58,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
QueryWrapper<EmployeesOrg> 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<EmployeesOrg> list = baseMapper.selectList(qw);
List<EmployeesOrgApiEntity> result = BeanUtil.copyToList(list, EmployeesOrgApiEntity.class);
return result;
@ -69,7 +69,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
QueryWrapper<EmployeesOrg> 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<EmployeesOrgMapper, Emp
UpdateWrapper<EmployeesOrg> 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());

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -66,7 +66,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
public int updateById(EmployeesAdvisoryInfoEntity dto) {
QueryWrapper<EmployeesOrg> 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<NuEmployeesA
// uw.eq("iz_history","1");
uw.eq("org_code", dto.getOrgCode());
employeesOrg = new EmployeesOrg();
employeesOrg.setIzHistory("0");
employeesOrg.setIzHistory("Y");
employeesOrgService.update(employeesOrg, uw);
//插入数据
@ -91,7 +91,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
BeanUtils.copyProperties(dto, emAdd);
emAdd.setId(null);
emAdd.setEmployeesId(dto.getId());
emAdd.setIzHistory("1");
emAdd.setIzHistory("N");
emAdd.setModifyStatus("1");
emAdd.setStatus("1");
emAdd.setApplyType("2");

11
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
View File

@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.dto.OrgApplyInfoMQDto;
import com.nu.entity.EmployeesAdvisoryInfoEntity;
import com.nu.entity.NuWxNoticeEntity;
import com.nu.entity.WxNoticeEntity;
import com.nu.enums.WxClientType;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi;
import com.nu.modules.orgapplyinfo.entity.OrgAllInfo;
import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity;
@ -52,6 +54,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
@Autowired
private IWxNoticeApi wxNoticeApi;
@Autowired
private IEmployessAdvisioryInfoApi employessAdvisioryInfoApi;
@Override
public OrgApplyInfoApiEntity insert(OrgApplyInfoApiEntity orgApplyInfoApiEntity) {
OrgApplyInfo orgApplyInfo = new OrgApplyInfo();
@ -266,6 +271,12 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
//将机构的构建状态置为“加盟合同”
orgApplyInfo.setBuildStatus("3");
//修改此用户信息咨询表iz_jg标识为Y（是机构）
EmployeesAdvisoryInfoEntity edEntity = new EmployeesAdvisoryInfoEntity();
edEntity.setOpenId(orgApplyInfo.getOpenId());
edEntity.setIzJg("Y");
employessAdvisioryInfoApi.updateByOpenId(edEntity);
//发送小程序、微信通知
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
nuWxNotice.setOpenId(orgApplyInfo.getOpenId());

4
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/sysconfig/entity/SysConfig.java
View File

@ -52,9 +52,9 @@ public class SysConfig implements Serializable {
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String descr;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用", width = 15)
@ApiModelProperty(value = "是否启用 0启用 1未启用")
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
@Dict(dicCode = "iz_enabled")
private java.lang.String izEnabled;
/**是否删除 0未删除 1删除*/

42
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
View File

@ -65,7 +65,7 @@ public class EmployeesMQListener {
//修改员工注册表的入驻状态
NuEmployeesAdvisoryInfo employeesAd = new NuEmployeesAdvisoryInfo();
employeesAd.setId(dto.getEmployeeId());
employeesAd.setIzEntry("0");
employeesAd.setIzEntry("Y");
employeesAdvisoryInfoService.updateById(employeesAd);
}
employeesAdvisoryInfoService.sendYgrz(dto);
@ -73,7 +73,7 @@ public class EmployeesMQListener {
UpdateWrapper<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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<EmployeesOrg> 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());

3
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -330,6 +330,9 @@ public class ElderApi {
BeanUtils.copyProperties(mqdto, elderInfoEn);
elderInfoApi.addElder(elderInfoEn);
//调整用户咨询表是否是家属标识
advisoryInfoApi.upJs(elderInfoEn.getGuardianOpenId(), true);
return Result.ok(id);
}

15
nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java
View File

@ -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("保存成功！");

2
nursing-unit-common/src/main/java/com/nu/dto/BodyTagMQDto.java
View File

@ -31,7 +31,7 @@ public class BodyTagMQDto implements Serializable {
*/
private String status;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
private String izEnabled;
/**

2
nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java
View File

@ -36,7 +36,7 @@ public class CategoryMQDto implements Serializable {
*/
private String status;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
private String izEnabled;
/**

2
nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
View File

@ -73,7 +73,7 @@ public class DirectiveAsyncMQDto implements Serializable {
*/
private String status;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
private String izEnabled;
/**

2
nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java
View File

@ -51,7 +51,7 @@ public class DirectiveTypeMQDto implements Serializable {
*/
private String status;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
private String izEnabled;
/**

2
nursing-unit-common/src/main/java/com/nu/dto/ElderTagTypeMQDto.java
View File

@ -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;

2
nursing-unit-common/src/main/java/com/nu/dto/EmotionTagMQDto.java
View File

@ -31,7 +31,7 @@ public class EmotionTagMQDto implements Serializable {
*/
private String status;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
private String izEnabled;
/**

2
nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java
View File

@ -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;

2
nursing-unit-common/src/main/java/com/nu/dto/SysConfigMQDto.java
View File

@ -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;

6
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagtypere/entity/ElderTagTypeRe.java
View File

@ -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)

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java
View File

@ -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)

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java
View File

@ -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删除")

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java
View File

@ -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删除")

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java
View File

@ -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删除")

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java
View File

@ -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删除

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
View File

@ -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 = "是否启用")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java
View File

@ -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 = "是否启用")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java
View File

@ -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 = "是否启用")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java
View File

@ -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")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java
View File

@ -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")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
View File

@ -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 = "是否启用")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java
View File

@ -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 = "是否启用")

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java
View File

@ -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")

4
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
View File

@ -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);

8
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
View File

@ -1360,13 +1360,13 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
//将非当前机构变更为非指令库
QueryWrapper<SysDepart> uqw1 = new QueryWrapper<>();
uqw1.ne("org_code",orgCode);
sysDepart.setIzDirectiveMain("1");
sysDepart.setIzDirectiveMain("N");
baseMapper.update(sysDepart,uqw1);
//将当前机构变更为指令库
QueryWrapper<SysDepart> 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<SysDepartMapper, SysDepart
//将非当前机构变更为非指令库
QueryWrapper<SysDepart> uqw1 = new QueryWrapper<>();
uqw1.ne("org_code",orgCode);
sysDepart.setIzElderTagMain("1");
sysDepart.setIzElderTagMain("N");
baseMapper.update(sysDepart,uqw1);
//将当前机构变更为指令库
QueryWrapper<SysDepart> uqw2 = new QueryWrapper<>();
uqw2.eq("org_code",orgCode);
sysDepart.setIzElderTagMain("0");
sysDepart.setIzElderTagMain("Y");
baseMapper.update(sysDepart,uqw2);
}