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

解决服务指令表去除周期类型字段引发的报错

This commit is contained in:
1378012178@qq.com 2026-01-21 14:55:38 +08:00
parent c6e553467d
commit 68321d3f03
15 changed files with 24 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,10 @@ public class DirectiveAsyncMQDto implements Serializable {
* 服务时长（分钟）
*/
private String serviceDuration;
/**
* 超时时长（分钟）
*/
private String timeoutDuration;
/**
* 指令状态
*/

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

@ -42,8 +42,6 @@ public class DirectiveOpeLogInfoMQDto implements Serializable {
private BigDecimal tollPrice;
/**提成价格*/
private BigDecimal comPrice;
/**指令类型 1日常护理 2周期护理 3即时护理*/
private String cycleType;
/**服务说明*/
private String serviceContent;
/**服务时长（分钟）*/

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

@ -34,8 +34,6 @@ public class DirectiveOpeLogMainMQDto implements Serializable {
private String typeName;
/**服务指令名称*/
private String directiveName;
/**指令类型名称*/
private String cycleTypeName;
private List<DirectiveOpeLogInfoMQDto> opeInfoList;
}

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

@ -87,6 +87,10 @@ public class DirectiveSyncLogInfoMQDto implements Serializable {
* 服务时长（分钟）
*/
private String serviceDuration;
/**
* 超时时长（分钟）
*/
private String timeoutDuration;
/**
* 所属部门
*/

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

@ -76,10 +76,6 @@ public class BizConfigServiceDirective implements Serializable {
@Excel(name = "收费频次 1按次收费 2按天收费", width = 15)
@ApiModelProperty(value = "收费频次 1按次收费 2按天收费")
private String chargingFrequency;
/**指令类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理")
private String cycleType;
/**指令类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理")

3
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml
View File

@ -16,8 +16,6 @@
csd.iz_reimbursement,
csd.iz_preferential,
csd.charging_frequency,
csd.cycle_type as cycleType,
dict.item_text AS cycleTypeName,
csd.service_content,
csd.service_duration,
csd.iz_enabled,
@ -36,7 +34,6 @@
FROM nu_config_service_directive csd
LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id
LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on csd.cycle_type = dict.item_value
) a
${ew.customSqlSegment}
</select>

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
View File

@ -123,14 +123,12 @@
select a.package_id,a.cycle_type,a.cycle_value,b.*,
c.category_name AS category_name,
d.type_name AS type_name,
e.instruction_name AS instruction_name,
f.item_text AS cycle_type_name
e.instruction_name AS instruction_name
from nu_config_package_directive a
left join nu_config_service_directive b on a.directive_id = b.id
left join nu_config_service_category c on b.category_id = c.id
left join nu_config_service_type d on b.type_id = d.id
left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type
<where>
<if test="params.packageId != null and params.packageId != ''">
AND a.package_id = #{params.packageId}

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml
View File

@ -9,14 +9,12 @@
select a.package_id,a.cycle_type,a.cycle_value,b.*,
c.category_name AS category_name,
d.type_name AS type_name,
e.instruction_name AS instruction_name,
f.item_text AS cycle_type_name
e.instruction_name AS instruction_name
from nu_config_package_directive a
left join nu_config_service_directive b on a.directive_id = b.id
left join nu_config_service_category c on b.category_id = c.id
left join nu_config_service_type d on b.type_id = d.id
left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type
<where>
<if test="params.packageId != null and params.packageId != ''">
AND a.package_id = #{params.packageId}

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml
View File

@ -115,7 +115,6 @@
csd.iz_reimbursement,
csd.iz_preferential,
csd.charging_frequency,
csd.cycle_type,
csd.service_content,
csd.service_duration,
csd.iz_enabled AS directive_iz_enabled,

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

@ -125,6 +125,12 @@ public class DirectiveSyncLogInfo implements Serializable {
@Excel(name = "服务时长（分钟）", width = 15)
@ApiModelProperty(value = "服务时长（分钟）")
private java.lang.String serviceDuration;
/**
* 超时时长（分钟）
*/
@Excel(name = "超时时长（分钟）", width = 15)
@ApiModelProperty(value = "超时时长（分钟）")
private java.lang.String timeoutDuration;
/**
* 所属部门
*/

15
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
View File

@ -90,7 +90,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("cycleType", QueryRuleEnum.IN);
customeRuleMap.put("izEnabled", QueryRuleEnum.EQ);
QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap);
queryWrapper.select("id");
@ -151,7 +150,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap);
queryWrapper.select("id");
@ -230,7 +228,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
qw.eq("category_id", configServiceDirective.getCategoryId());
qw.eq("type_id", configServiceDirective.getTypeId());
qw.eq("directive_name", configServiceDirective.getDirectiveName());
qw.eq("cycle_type", configServiceDirective.getCycleType());
ConfigServiceDirective one = configServiceDirectiveService.getOne(qw);
if (one != null) {
return Result.error("服务指令已存在！");
@ -252,8 +249,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
// canAddDirective.getInstructionTag().equals(configServiceDirective.getInstructionName()) &&
// canAddDirective.getCategory().equals(configServiceDirective.getCategoryName()) &&
// canAddDirective.getType().equals(configServiceDirective.getTypeName()) &&
// canAddDirective.getDirectiveName().equals(configServiceDirective.getDirectiveName()) &&
// canAddDirective.getCycleType().equals(configServiceDirective.getCycleTypeName())
// canAddDirective.getDirectiveName().equals(configServiceDirective.getDirectiveName())
// ) {
// needSetId = false;
// configServiceDirective.setId(canAddDirective.getDirectiveId());
@ -305,7 +301,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
mainMQDto.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称
mainMQDto.setTypeName(configServiceDirective.getTypeName());//服务类型名称
mainMQDto.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
mainMQDto.setCycleTypeName(configServiceDirective.getCycleTypeName());//指令类型名称
List<DirectiveOpeLogInfoMQDto> infoList = Lists.newArrayList();
DirectiveOpeLogInfoMQDto info = new DirectiveOpeLogInfoMQDto();
@ -320,7 +315,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setCycleType(configServiceDirective.getCycleType());//指令类型
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
info.setTimeoutDuration(configServiceDirective.getTimeoutDuration());//超时时长
@ -436,7 +430,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
mainMQDto.setCategoryName(configServiceDirective.getCategoryName());//服务类别名称
mainMQDto.setTypeName(configServiceDirective.getTypeName());//服务类型名称
mainMQDto.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
mainMQDto.setCycleTypeName(configServiceDirective.getCycleTypeName());//指令类型名称
List<DirectiveOpeLogInfoMQDto> infoList = Lists.newArrayList();
//修改前
@ -453,9 +446,9 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(his.getDirectiveName());//服务指令名称
info.setTollPrice(his.getTollPrice());//收费价格
info.setComPrice(his.getComPrice());//提成价格
info.setCycleType(his.getCycleType());//指令类型
info.setServiceContent(his.getServiceContent());//服务说明
info.setServiceDuration(his.getServiceDuration());//服务时长
info.setTimeoutDuration(his.getTimeoutDuration());//超时时长
info.setSysOrgCode(his.getSysOrgCode());//所属部门
info.setMp3File(his.getMp3File());//语音文件
info.setMp4File(his.getMp4File());//视频文件
@ -481,9 +474,9 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setCycleType(configServiceDirective.getCycleType());//指令类型
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
info.setTimeoutDuration(configServiceDirective.getTimeoutDuration());//超时时长
info.setSysOrgCode(his.getSysOrgCode());//所属部门
info.setMp3File(configServiceDirective.getMp3File());//语音文件
info.setMp4File(configServiceDirective.getMp4File());//视频文件
@ -506,9 +499,9 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
|| !Objects.equals(his.getDirectiveName(), configServiceDirective.getDirectiveName())
|| !Objects.equals(his.getTollPrice(), configServiceDirective.getTollPrice())
|| !Objects.equals(his.getComPrice(), configServiceDirective.getComPrice())
|| !Objects.equals(his.getCycleType(), configServiceDirective.getCycleType())
|| !Objects.equals(his.getServiceContent(), configServiceDirective.getServiceContent())
|| !Objects.equals(his.getServiceDuration(), configServiceDirective.getServiceDuration())
|| !Objects.equals(his.getTimeoutDuration(), configServiceDirective.getTimeoutDuration())
|| !Objects.equals(his.getMp3File(), configServiceDirective.getMp3File())
|| !Objects.equals(his.getMp4File(), configServiceDirective.getMp4File())
|| !Objects.equals(his.getPreviewFile(), configServiceDirective.getPreviewFile())

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

@ -96,13 +96,6 @@ public class ConfigServiceDirective implements Serializable {
@ApiModelProperty(value = "收费频次")
@Dict(dicCode = "billing_frequency")
private java.lang.String chargingFrequency;
/**
* 指令类型 1日常护理 2周期护理 3即时护理
*/
@Excel(name = "指令类型", width = 15)
@ApiModelProperty(value = "指令类型")
@Dict(dicCode = "period_type")
private java.lang.String cycleType;
/**
* 排序
*/
@ -302,9 +295,6 @@ public class ConfigServiceDirective implements Serializable {
//服务类型中文名称
@TableField(exist = false)
private String typeName;
//指令类型中文名称
@TableField(exist = false)
private String cycleTypeName;
//媒体资源存储路径名
@TableField(exist = false)
private String mediaFileSavePath;

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

@ -65,7 +65,6 @@
c.iz_reimbursement,
c.iz_preferential,
c.charging_frequency,
c.cycle_type,
c.sort,
c.service_content,
c.service_duration,
@ -195,8 +194,7 @@
type_id,
directive_name,
sort,
iz_enabled,
cycle_type
iz_enabled
FROM nu_config_service_directive
WHERE del_flag = '0'
ORDER BY sort ASC
@ -249,16 +247,12 @@
i.instruction_name as instructionName,
c.category_name as categoryName,
t.type_name as typeName,
m.directive_name,
dic.dit as cycleTypeName
m.directive_name
from nu_config_service_directive m
left join nu_config_service_instruction_tag i on m.instruction_tag_id = i.id
left join nu_config_service_category c on m.category_id = c.id
left join nu_config_service_type t on m.type_id = t.id
left join (select di.item_value as diva, di.item_text as dit
from sys_dict d
left join sys_dict_item di on d.id = di.dict_id where d.dict_code = 'period_type') dic
on m.cycle_type = dic.diva
<where>
m.iz_enabled = '0'
<if test="existIds != null and existIds.length > 0">
@ -276,16 +270,11 @@
m.*,
i.instruction_name as instructionName,
c.category_name as categoryName,
t.type_name as typeName,
dic.dit as cycleTypeName
t.type_name as typeName
from nu_config_service_directive m
left join nu_config_service_instruction_tag i on m.instruction_tag_id = i.id
left join nu_config_service_category c on m.category_id = c.id
left join nu_config_service_type t on m.type_id = t.id
left join (select di.item_value as diva, di.item_text as dit
from sys_dict d
left join sys_dict_item di on d.id = di.dict_id where d.dict_code = 'period_type') dic
on m.cycle_type = dic.diva
where m.id = #{id}
</select>
</mapper>

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

@ -624,6 +624,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
info.setCycleType(item.getCycleType());//指令类型
info.setServiceContent(item.getServiceContent());//服务说明
info.setServiceDuration(item.getServiceDuration());//服务时长
info.setTimeoutDuration(item.getTimeoutDuration());//超时时长
info.setSysOrgCode(item.getSysOrgCode());//所属部门
info.setMp3File(item.getMp3File());//语音文件
info.setMp4File(item.getMp4File());//视频文件

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml
View File

@ -95,7 +95,6 @@
csd.iz_reimbursement,
csd.iz_preferential,
csd.charging_frequency,
csd.cycle_type,
csd.service_content,
csd.service_duration,
csd.iz_enabled AS directive_iz_enabled,