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

pad接口-查询仓库类指令工单增加执行类型对应中文汉字

This commit is contained in:
1378012178@qq.com 2025-12-30 15:49:14 +08:00
parent 8d9aac2e47
commit 1ae82034b6
4 changed files with 163 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,5 +193,7 @@ public class InvoicingDirectiveEntity implements Serializable {
private String izEnabled;
/** 是否判断单号为空 */
private String izEmptyNo;
/**执行类型文字*/
private String optTypeName;
}

3
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java
View File

@ -1,6 +1,7 @@
package com.nu.modules.biz.invoicing.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.entity.InvoicingDirectiveEntity;
import com.nu.entity.InvoicingOrdersEntity;
import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders;
import org.apache.ibatis.annotations.Param;
@ -28,4 +29,6 @@ public interface InvoicingOrdersMapper extends BaseMapper<InvoicingOrders> {
InvoicingOrders getFlowOne(InvoicingOrders invoicingOrders);
void cancelOrder(InvoicingOrders invoicingOrders);
InvoicingOrders getOrderOne(InvoicingOrders invoicingOrders);
InvoicingDirectiveEntity selectInfoById(String id);
}

34
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
View File

@ -3,32 +3,28 @@
<mapper namespace="com.nu.modules.biz.invoicing.order.mapper.InvoicingOrdersMapper">
<select id="getNuById" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
select
a.nu_id as nuId,
select a.nu_id as nuId,
a.nu_name as nuName
from nu_base_info a
where a.nu_id = #{nuId}
</select>
<select id="getEmployeeById" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
select
a.id as employeeId,
select a.id as employeeId,
a.name as employeeName
from nu_biz_employees_info a
where a.id = #{employeeId}
</select>
<select id="getElderById" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
select
a.id as elderId,
select a.id as elderId,
a.name as elderName
from nu_biz_elder_info a
where a.id = #{elderId}
</select>
<select id="getOnLineEmployeeById" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
select
a.id as employeeId,
select a.id as employeeId,
a.name as employeeName
from nu_biz_employees_info a
where a.del_flag = '0'
@ -38,16 +34,14 @@
</select>
<select id="getDirectivePrice" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
select
toll_price as tollPrice,
select toll_price as tollPrice,
com_price as comPrice
from nu_config_service_directive
where id = #{directiveId}
</select>
<select id="queryDataPoolList" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
select
a.id as poolId,
select a.id as poolId,
a.biz_id as bizId,
a.nu_id as nuId,
a.nu_name as nuName,
@ -74,7 +68,7 @@
from nu_biz_nu_invoicing_directive_data_pool a
left join nu_biz_elder_info b on a.elder_id = b.id
where a.iz_orders = 'N'
order by a.start_time,orderEmp,a.nu_id
order by a.start_time, orderEmp, a.nu_id
</select>
<select id="getEmpPermissionAndOnline" resultType="com.nu.modules.biz.invoicing.order.entity.InvoicingOrders">
@ -163,7 +157,8 @@
a.pad_path as padPath
from nu_config_service_flow_sub a
inner join nu_config_service_directive b on b.id = a.directive_id
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on b.cycle_type = dict.item_value
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on b.cycle_type =
dict.item_value
<where>
<if test="flowCode != null and flowCode != ''">
AND a.flow_code = #{flowCode}
@ -191,7 +186,8 @@
a.pad_path as padPath
from nu_config_service_flow_sub a
inner join nu_config_service_directive b on b.id = a.directive_id
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on b.cycle_type = dict.item_value
LEFT JOIN (select * from sys_dict_item where dict_id = '1900374791386140674') dict on b.cycle_type =
dict.item_value
<where>
<if test="flowId != null and flowId != ''">
AND a.id = #{flowId}
@ -300,5 +296,13 @@
order by create_time desc
limit 1
</select>
<select id="selectInfoById" resultType="com.nu.entity.InvoicingDirectiveEntity">
select a.*,
mainStatus.item_text AS optTypeName
from nu_biz_nu_invoicing_directive_order a
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 = a.opt_type
</select>
</mapper>

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java
View File

@ -179,7 +179,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
@Override
public InvoicingDirectiveEntity selectInfoById(String id) {
InvoicingDirectiveEntity result = new InvoicingDirectiveEntity();
BeanUtils.copyProperties(baseMapper.selectById(id),result);
BeanUtils.copyProperties(baseMapper.selectInfoById(id),result);
return result;
}