yangjun
/
nursing_unit_java
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:53:37 +08:00
parent 77f4f1559d
commit 9c53a7db92
44 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,9 +54,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删除*/

2
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java
View File

@ -91,7 +91,7 @@ public class ConfigServiceDirectiveDto implements Serializable {
@Dict(dicCode = "directive_status")
private String status;
/**
* 是否启用 0启用 1未启用
* 是否启用 Y启用 N未启用
*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;

2
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java
View File

@ -29,7 +29,7 @@ public class DirectivePackageDto implements Serializable {
private String description;
/**排序*/
private Integer sort;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除 0未删除 1删除*/

6
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java
View File

@ -48,9 +48,9 @@ public class NuConfigServiceCategory implements Serializable {
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private java.lang.Integer sort;
/**是否启用 0启用 1未启用*/
@Excel(name = "是否启用 0启用 1未启用", width = 15)
@ApiModelProperty(value = "是否启用 0启用 1未启用")
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15)
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)

6
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java
View File

@ -102,9 +102,9 @@ public class NuConfigServiceDirective implements Serializable {
@Excel(name = "服务时长（分钟）", width = 15)
@ApiModelProperty(value = "服务时长（分钟）")
private java.lang.String serviceDuration;
/**是否启用 0启用 1未启用*/
@Excel(name = "是否启用 0启用 1未启用", width = 15)
@ApiModelProperty(value = "是否启用 0启用 1未启用")
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15)
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)

6
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java
View File

@ -49,9 +49,9 @@ public class NuConfigServiceType implements Serializable {
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private java.lang.Integer sort;
/**是否启用 0启用 1未启用*/
@Excel(name = "是否启用 0启用 1未启用", width = 15)
@ApiModelProperty(value = "是否启用 0启用 1未启用")
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15)
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)

2
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java
View File

@ -50,7 +50,7 @@ public class NuInstructionTag implements Serializable {
@ApiModelProperty(value = "状态 0已授权 1未授权")
@Dict(dicCode = "status")
private String status;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用", width = 15)
@ApiModelProperty(value = "是否启用")
@Dict(dicCode = "iz_enabled")

2
nursing-unit-api/src/main/java/com/nu/modules/wechat/pay/api/WeChatPayApi.java
View File

@ -217,7 +217,7 @@ public class WeChatPayApi {
//如果订单支付成功
if ("SUCCESS".equals(decryptObject.getTradeState().name())) {
systemOrderApiEntity.setPaySuccessTime(now);//订单支付成功时间
//余额请在不同的orderType判断处进行个性化处理（方法中binding_nu就是针对护理单元绑定的~），这里再加余额就加重复了o(╥﹏╥)o
//余额请在不同的orderType判断处进行个性化处理（方法中binding_nu就是针对护理单元绑定的~），这里再加余额就加重复了
}
systemOrderApi.updateByOutTradeNo(systemOrderApiEntity);

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

@ -35,7 +35,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

@ -39,7 +39,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

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

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

@ -25,7 +25,7 @@ public class SysConfigMQDto implements Serializable {
private String configValue;
/**备注*/
private String descr;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
private String izEnabled;
/**是否删除 0未删除 1删除*/
private String delFlag;

2
nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java
View File

@ -28,7 +28,7 @@ public class MaterialCategoryEntity implements Serializable {
private String id;
/**物料类别名称*/
private String categoryName;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除 0未删除 1删除*/

2
nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java
View File

@ -71,7 +71,7 @@ public class MaterialInfoEntity implements Serializable {
private String materialImg;
/**物料标识*/
private String materialIdent;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除 0未删除 1删除*/

2
nursing-unit-common/src/main/java/com/nu/entity/MaterialMedicationEntity.java
View File

@ -34,7 +34,7 @@ public class MaterialMedicationEntity implements Serializable {
private String typeId;
/**名称*/
private String medicationName;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除 0未删除 1删除*/

2
nursing-unit-common/src/main/java/com/nu/entity/MaterialTypeEntity.java
View File

@ -31,7 +31,7 @@ public class MaterialTypeEntity implements Serializable {
private String categoryId;
/**物料类型*/
private String typeName;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Dict(dicCode = "iz_enabled")
private String izEnabled;
/**是否删除 0未删除 1删除*/

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

@ -42,10 +42,10 @@ public class ElderTagType implements Serializable {
@Excel(name = "标签类型名称", width = 15)
@ApiModelProperty(value = "标签类型名称")
private java.lang.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 java.lang.String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)

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)

8
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java
View File

@ -134,7 +134,7 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
employeesInfo.setId(employeesApply.getEmployeeId());
employeesInfo.setSysOrgCode(deptInfo.getString("code"));
employeesInfo.setEntryTime(entryTime);
employeesInfo.setIzInvited(employeesApply.getApplyType());
employeesInfo.setIzInvited("0".equals(employeesApply.getApplyType()) ? "Y" : "N");
employeesInfoService.save(employeesInfo);
}
}
@ -250,7 +250,7 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
//先查下员工在机构负责人停留界面期间是否进行了申请
QueryWrapper<EmployeesApply> qw = new QueryWrapper<>();
qw.eq("employee_id", employeesApply.getEmployeeId());
qw.eq("iz_history", "1");
qw.eq("iz_history", "N");
qw.eq("status", "1");
qw.eq("apply_type", "1");
EmployeesApply one = employeesApplyService.getOne(qw);
@ -263,7 +263,7 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
//将旧的申请信息都置为历史状态
EmployeesApply updto = new EmployeesApply();
updto.setIzHistory("0");
updto.setIzHistory("Y");
UpdateWrapper<EmployeesApply> uw = new UpdateWrapper<>();
uw.eq("employee_id", employeesApply.getEmployeeId());
employeesApplyService.update(updto, uw);
@ -273,7 +273,7 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
employeesApply.setEmployeeId(employeesApply.getEmployeeId());
employeesApply.setStatus("1");
employeesApply.setDelFlag("0");
employeesApply.setIzHistory("1");
employeesApply.setIzHistory("N");
employeesApply.setApplyType("0");
employeesApplyService.save(employeesApply);

2
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
View File

@ -3,6 +3,6 @@
<mapper namespace="com.nu.modules.employeesapply.mapper.EmployeesApplyMapper">
<delete id="cleanErrorInvided">
delete from nu_biz_employees_apply where employee_id = #{employeeId} and iz_history = '1' and apply_type = '1'
delete from nu_biz_employees_apply where employee_id = #{employeeId} and iz_history = 'N' and apply_type = '1'
</delete>
</mapper>

4
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/service/impl/EmployeesApplyServiceImpl.java
View File

@ -67,7 +67,7 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
List<EmployeesApply> list = baseMapper.selectList(qw);
if (list != null && list.size() > 0) {
EmployeesApply employeesApply = list.get(0);
employeesApply.setIzHistory("1");
employeesApply.setIzHistory("N");
baseMapper.updateById(employeesApply);
}
}
@ -78,7 +78,7 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
QueryWrapper<EmployeesApply> sourceQW = new QueryWrapper<>();
sourceQW.eq("employee_id", employeesApply.getEmployeeId());
sourceQW.eq("status", "1"); // 审核中
sourceQW.eq("iz_history", "1"); // 当前数据（非历史）
sourceQW.eq("iz_history", "N"); // 当前数据（非历史）
sourceQW.eq("apply_type", "2"); // 信息变更申请
sourceQW.orderByDesc("create_time");
List<EmployeesApply> sourceList = baseMapper.selectList(sourceQW);

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

@ -6,7 +6,7 @@
select org_code
from nu_biz_employees_org
where open_id = (select open_id from nu_employees_advisory_info where tel = #{tel})
and iz_history = '1'
and iz_history = 'N'
and (((apply_type = '0' or apply_type = '1') and status = '2') or apply_type = '2')
and org_code != #{orgCode}
order by create_time desc

2
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java
View File

@ -77,7 +77,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
.collect(Collectors.toList());
QueryWrapper<EmployeesApply> qw2 = new QueryWrapper<EmployeesApply>();
qw2.eq("iz_history", "1");
qw2.eq("iz_history", "N");
qw2.eq("status", "1");
List<EmployeesApply> list2 = employeesApplyService.list(qw2);
List<String> ids2 = list2.stream()

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

@ -73,7 +73,7 @@ public class EmployeesMQListener {
public void handleEmployeeApply(EmployeesApplyMQDto dto) {
//将历史申请变更为历史状态
EmployeesApply hisdto = new EmployeesApply();
hisdto.setIzHistory("0");
hisdto.setIzHistory("Y");
UpdateWrapper<EmployeesApply> uw = new UpdateWrapper<>();
uw.eq("employee_id", dto.getEmployeeId());
employeesApplyService.update(hisdto, uw);
@ -85,7 +85,7 @@ public class EmployeesMQListener {
employeesApply.setOpenId(dto.getOpenId());
employeesApply.setStatus("1");
employeesApply.setDelFlag("0");
employeesApply.setIzHistory("1");
employeesApply.setIzHistory("N");
employeesApply.setApplyType("1");
//资源文件拉完图片统一存储，不然页面有路径没资源可显示
@ -352,7 +352,7 @@ public class EmployeesMQListener {
public void handleEmpInfoUp(EmployeesApplyMQDto dto) {
//将历史申请变更为历史状态
EmployeesApply hisdto = new EmployeesApply();
hisdto.setIzHistory("0");
hisdto.setIzHistory("Y");
UpdateWrapper<EmployeesApply> uw = new UpdateWrapper<>();
uw.eq("employee_id", dto.getEmployeeId());
employeesApplyService.update(hisdto, uw);
@ -364,7 +364,7 @@ public class EmployeesMQListener {
employeesApply.setOpenId(dto.getOpenId());
employeesApply.setStatus("1");
employeesApply.setDelFlag("0");
employeesApply.setIzHistory("1");
employeesApply.setIzHistory("N");
employeesApply.setApplyType("2");
employeesApply.setModifyStatus("1");
@ -650,7 +650,7 @@ public class EmployeesMQListener {
public void handleInvidedConfirm(EmployeesApplyMQDto dto) {
UpdateWrapper<EmployeesApply> uw = new UpdateWrapper<>();
uw.eq("employee_id", dto.getEmployeeId());
uw.eq("iz_history", "1");//当前数据
uw.eq("iz_history", "N");//当前数据
uw.eq("apply_type", "0");//被邀请的
EmployeesApply employeesApply = new EmployeesApply();
employeesApply.setStatus(dto.getStatus());
@ -664,7 +664,7 @@ public class EmployeesMQListener {
if (one == null) {
QueryWrapper<EmployeesApply> qw1 = new QueryWrapper<>();
qw1.eq("employee_id", dto.getEmployeeId());
qw1.eq("iz_history", "1");//当前数据
qw1.eq("iz_history", "N");//当前数据
qw1.eq("apply_type", "0");//被邀请的
EmployeesApply one1 = employeesApplyService.getOne(qw1);
BizEmployeesInfo employeesInfo = new BizEmployeesInfo();
@ -672,7 +672,7 @@ public class EmployeesMQListener {
employeesInfo.setId(dto.getEmployeeId());
employeesInfo.setSysOrgCode(dto.getOrgCode());
employeesInfo.setEntryTime(dto.getOpeTime());
employeesInfo.setIzInvited("0");
employeesInfo.setIzInvited("Y");
//资源文件拉完图片统一存储，不然页面有路径没资源可显示
String idCardPositive = employeesInfo.getIdCardPositive();
@ -982,7 +982,7 @@ public class EmployeesMQListener {
}
//条件二 如果不满足条件一则继续判断是否主动申请员工 - 更新数据、拉取全部资源
QueryWrapper<EmployeesApply> qw = new QueryWrapper<>();
qw.eq("iz_history", "1");
qw.eq("iz_history", "N");
qw.eq("employee_id", dto.getEmployeeId());
EmployeesApply empApply = employeesApplyService.getOne(qw);
String appId = empApply.getId();
@ -1383,7 +1383,7 @@ public class EmployeesMQListener {
String employeeId = dto.getEmployeeId();
//需要初始化
if(izInit.equals("1")){
if(izInit.equals("Y")){
QueryWrapper<BizEmployeesInfo> qw = new QueryWrapper<>();
qw.eq("id", employeeId);

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

@ -50,10 +50,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

@ -45,10 +45,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-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java
View File

@ -102,8 +102,8 @@ public class ConfigSuppliersInfo implements Serializable {
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**是否启用 0启用 1未启用*/
/**是否启用 Y启用 N未启用*/
@Dict(dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用 0启用 1未启用")
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
}

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

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

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
View File

@ -102,6 +102,9 @@
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item.id}
</foreach>
<if test="directive.izEnabled != null and directive.izEnabled != ''">
and c.iz_enabled = #{directive.izEnabled}
</if>
</where>
ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc
</select>
@ -199,7 +202,7 @@
<!-- 查询被使用的一、二、三级分类（包含已删除，只要存在未删指令引用） -->
<select id="getUsedInstructionTags" resultType="com.nu.modules.instructiontag.entity.InstructionTag">
SELECT id, instruction_name, sort, iz_enabled,icon
SELECT id, instruction_name, sort, iz_enabled, icon
FROM nu_config_service_instruction_tag
WHERE del_flag = '0'
ORDER BY sort ASC

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -91,6 +91,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
if (list_.getRecords() == null || list_.getRecords().isEmpty()) {
return list_.getRecords();
}
configServiceDirective.setIzEnabled("Y");
List<ConfigServiceDirective> list = baseMapper.pageList(configServiceDirective, list_.getRecords());
//处理服务标签字段
if (list != null && !list.isEmpty()) {

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

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

@ -129,7 +129,7 @@ public class LoginController {
userInfo(sysUser, result, request);
//修改员工在线状态
sysUserService.modifyEmpOnline(sysUser,"0");
sysUserService.modifyEmpOnline(sysUser,"Y");
// step.5 登录成功删除验证码
redisUtil.del(realKey);