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

1、员工管理-员工信息-服务指令：实现切换至服务指令选列表时的筛选功能（可根据分类标签、服务类别、服务类型、服务指令名称查询，以及前三级的联动处理） 

2、调整员工管理-员工信息-重置密码的提示语
3、去掉机构加盟后，机构负责人登录后的“尚未归属部门”提示
4、员工管理-员工标签去掉是否启用，增加作废：作废后移除员工已分配的员工标签
5、服务指令和长者标签的收费价格改为基础价格
This commit is contained in:
1378012178@qq.com 2026-03-16 10:44:02 +08:00
parent e3ade3b438
commit e9da735940
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public class DirectiveAsyncMQDto implements Serializable {
*/
private String directiveName;
/**
* 收费价格
* 基础价格
*/
private java.math.BigDecimal tollPrice;
/**

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

@ -68,7 +68,7 @@ public class DirectiveOpeLogInfoMQDto implements Serializable {
*/
private String directiveName;
/**
* 收费价格
* 基础价格
*/
private BigDecimal tollPrice;
/**

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

@ -62,7 +62,7 @@ public class DirectiveSyncLogInfoMQDto implements Serializable {
*/
private String directiveName;
/**
* 收费价格
* 基础价格
*/
private BigDecimal tollPrice;
/**

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java
View File

@ -87,10 +87,10 @@ public class CanAddDirective implements Serializable {
@ApiModelProperty(value = "情绪标签")
private java.lang.String emotionTags;
/**
* 收费价格
* 基础价格
*/
@Excel(name = "收费价格", width = 15)
@ApiModelProperty(value = "收费价格")
@Excel(name = "基础价格", width = 15)
@ApiModelProperty(value = "基础价格")
private java.math.BigDecimal tollPrice;
/**
* 提成价格

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

@ -83,10 +83,10 @@ public class DirectiveBkItem implements Serializable {
@Dict(dicCode = "service_attribute")
private java.lang.String serviceAttribute;
/**
* 收费价格
* 基础价格
*/
@Excel(name = "收费价格(元)", width = 20)
@ApiModelProperty(value = "收费价格")
@Excel(name = "基础价格(元)", width = 20)
@ApiModelProperty(value = "基础价格")
private java.math.BigDecimal tollPrice;
/**
* 提成价格

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java
View File

@ -74,9 +74,9 @@ public class DirectiveOpeLogInfo implements Serializable {
@Excel(name = "服务指令名称", width = 15)
@ApiModelProperty(value = "服务指令名称")
private String directiveName;
/**收费价格*/
@Excel(name = "收费价格", width = 15)
@ApiModelProperty(value = "收费价格")
/**基础价格*/
@Excel(name = "基础价格", width = 15)
@ApiModelProperty(value = "基础价格")
private BigDecimal tollPrice;
/**提成价格*/
@Excel(name = "提成价格", width = 15)

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java
View File

@ -89,10 +89,10 @@ public class DirectiveSyncLogInfo implements Serializable {
@ApiModelProperty(value = "服务指令名称")
private java.lang.String directiveName;
/**
* 收费价格
* 基础价格
*/
@Excel(name = "收费价格", width = 15)
@ApiModelProperty(value = "收费价格")
@Excel(name = "基础价格", width = 15)
@ApiModelProperty(value = "基础价格")
private java.math.BigDecimal tollPrice;
/**
* 提成价格

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

@ -64,10 +64,10 @@ public class ConfigServiceDirective implements Serializable {
@ApiModelProperty(value = "服务指令名称")
private java.lang.String directiveName;
/**
* 收费价格
* 基础价格
*/
@Excel(name = "收费价格", width = 15)
@ApiModelProperty(value = "收费价格")
@Excel(name = "基础价格", width = 15)
@ApiModelProperty(value = "基础价格")
private java.math.BigDecimal tollPrice;
/**
* 提成价格