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-12 09:59:51 +08:00
parent c8dd22a559
commit ca21f3a756
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java
View File

@ -33,14 +33,15 @@ public class DirectiveOrderEntity implements Serializable {
private String orderType; private String orderType;
/**执行类型 1单人 2协助 3转单*/ /**执行类型 1单人 2协助 3转单*/
private String optType; private String optType;
private String optTypeName;
/**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/ /**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/
private String service_allowed_timeout; private String serviceAllowedTimeout;
/**是否超时 Y超时 N未超时*/ /**是否超时 Y超时 N未超时*/
private String iz_timeout; private String izTimeout;
/**实际执行人id（多个）； 主要执行人+协助人*/ /**实际执行人id（多个）； 主要执行人+协助人*/
private String opt_ids; private String optIds;
/**实际执行人名称（多个）； 主要执行人+协助人*/ /**实际执行人名称（多个）； 主要执行人+协助人*/
private String opt_names; private String optNames;
/**数据池主表ID，nu_biz_nu_directive_data_pool.id*/ /**数据池主表ID，nu_biz_nu_directive_data_pool.id*/
private String poolId; private String poolId;
/**服务指令计划ID,nu_biz_nu_customer_care_server.id;即时指令计划ID,nu_biz_nu_customer_care_server_instant.id*/ /**服务指令计划ID,nu_biz_nu_customer_care_server.id;即时指令计划ID,nu_biz_nu_customer_care_server_instant.id*/

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java
View File

@ -146,13 +146,13 @@ public class DirectiveOrder implements Serializable {
/**执行类型 1单人 2协助 3转单*/ /**执行类型 1单人 2协助 3转单*/
private String optType; private String optType;
/**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/ /**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/
private String service_allowed_timeout; private String serviceAllowedTimeout;
/**是否超时 Y超时 N未超时*/ /**是否超时 Y超时 N未超时*/
private String iz_timeout; private String izTimeout;
/**实际执行人id（多个）； 主要执行人+协助人*/ /**实际执行人id（多个）； 主要执行人+协助人*/
private String opt_ids; private String optIds;
/**实际执行人名称（多个）； 主要执行人+协助人*/ /**实际执行人名称（多个）； 主要执行人+协助人*/
private String opt_names; private String optNames;
/**接单上限*/ /**接单上限*/
@TableField(exist = false) @TableField(exist = false)

11
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
View File

@ -53,6 +53,10 @@
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/> <result column="del_flag" property="delFlag"/>
<result column="remarks" property="remarks"/> <result column="remarks" property="remarks"/>
<result column="service_allowed_timeout" property="serviceAllowedTimeout"/>
<result column="iz_timeout" property="izTimeout"/>
<result column="opt_ids" property="optIds"/>
<result column="opt_names" property="optNames"/>
<collection property="subList" ofType="com.nu.entity.DirectiveOrderSubEntity"> <collection property="subList" ofType="com.nu.entity.DirectiveOrderSubEntity">
<id column="sub_id" property="id"/> <id column="sub_id" property="id"/>
<result column="sub_order_type" property="orderType"/> <result column="sub_order_type" property="orderType"/>
@ -312,6 +316,11 @@
o.update_time, o.update_time,
o.del_flag, o.del_flag,
o.remarks, o.remarks,
o.service_allowed_timeout,
o.iz_timeout,
o.opt_ids,
o.opt_names,
mainStatus.item_text as optTypeName,
s.id as sub_id, s.id as sub_id,
s.order_type as sub_order_type, s.order_type as sub_order_type,
s.main_id as sub_main_id, s.main_id as sub_main_id,
@ -365,6 +374,8 @@
s.manually_mp4_path as sub_manually_mp4_path s.manually_mp4_path as sub_manually_mp4_path
FROM nu_biz_nu_directive_order o FROM nu_biz_nu_directive_order o
LEFT JOIN nu_biz_nu_directive_order_sub s ON o.id = s.main_id LEFT JOIN nu_biz_nu_directive_order_sub s ON o.id = s.main_id
LEFT JOIN sys_dict dict ON dict.dict_code = 'directive_order_opt_type'
LEFT JOIN sys_dict_item mainStatus ON mainStatus.dict_id = dict.id AND mainStatus.item_value = o.opt_type
WHERE o.order_type = '1' WHERE o.order_type = '1'
</sql> </sql>