From 49d84df535b266766c6b86c333dcae013531a452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 12 Dec 2025 14:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E6=B5=81=E7=A8=8B=E6=8C=87=E4=BB=A4=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoicing/api/IInvoicingOrdersApi.java | 2 +- .../order/service/IThOrdersService.java | 2 +- .../service/impl/ThOrdersServiceImpl.java | 62 ++++++++++++++++++- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java index be9ca3e6..f7ae13be 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java @@ -60,7 +60,7 @@ public interface IInvoicingOrdersApi { Result flowQlhtzf(InvoicingOrdersEntity invoicingOrdersEntity); /** - * 单元退货-单元申请 dyth_dysq + * 单元退货-单元申请 dyth_dysq 暂时无用，预留 * @param invoicingOrdersEntity */ Result flowDythDysq(InvoicingOrdersEntity invoicingOrdersEntity); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IThOrdersService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IThOrdersService.java index fea5d0b1..776eb1f7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IThOrdersService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IThOrdersService.java @@ -13,7 +13,7 @@ import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders; public interface IThOrdersService extends IService { /** - * 单元退货-单元申请 + * 单元退货-单元申请 暂时无用，预留 * @param invoicingOrdersEntity */ void flowDythDysq(InvoicingOrdersEntity invoicingOrdersEntity); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java index 016cfdc7..899ba8ab 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/ThOrdersServiceImpl.java @@ -35,7 +35,7 @@ public class ThOrdersServiceImpl extends ServiceImpl flowList = baseMapper.getFlowList(invoicingOrdersEntity); + if(flowList!=null){ + Calendar c = Calendar.getInstance(); + InvoicingOrders flow = flowList.get(0); + if(flow!=null){ + InvoicingOrders employee = empOrdersService.employeeScreening(flow.getDirectiveId(), invoicingOrdersEntity.getCustomerId(), c.getTime()); + insertNextOrder(flow,invoicingOrdersEntity,employee.getEmployeeId(),employee.getEmployeeName(),invoicingOrdersEntity.getInitiatorId(),invoicingOrdersEntity.getInitiatorName(),flow.getFlowCode(),"N"); + } + } + } + + /** + * 增加下一步的工单 + * @param invoicingOrdersEntity + * @param flowSub 下一节点 + * @param invoicingOrdersEntity 业务数据 + * @param employeeId 员工ID + * @param employeeName 员工名称 + * @param bizType 操作指令编码 + */ + private void insertNextOrder(InvoicingOrders flowSub,InvoicingOrdersEntity invoicingOrdersEntity,String employeeId,String employeeName,String initiatorId,String initiatorName,String bizType,String izRollback){ + Calendar c = Calendar.getInstance(); + getNetImages(flowSub); + InvoicingOrders nextEntity = new InvoicingOrders(); + nextEntity.setBizId(invoicingOrdersEntity.getBizId()); + nextEntity.setBizType(bizType); + nextEntity.setNuId(invoicingOrdersEntity.getNuId()); + nextEntity.setNuName(invoicingOrdersEntity.getNuName()); + nextEntity.setCustomerId(invoicingOrdersEntity.getCustomerId()); + nextEntity.setCustomerName(invoicingOrdersEntity.getCustomerName()); + nextEntity.setDirectiveId(flowSub.getDirectiveId()); + nextEntity.setDirectiveName(flowSub.getDirectiveName()); + nextEntity.setCycleTypeId(flowSub.getCycleTypeId()); + nextEntity.setCycleType(flowSub.getCycleType()); + nextEntity.setPreviewFile(flowSub.getPreviewFile()); + nextEntity.setNetPreviewFile(flowSub.getNetPreviewFile()); + nextEntity.setPreviewFileSmall(flowSub.getPreviewFileSmall()); + nextEntity.setNetPreviewFileSmall(flowSub.getNetPreviewFileSmall()); + nextEntity.setMp3File(flowSub.getMp3File()); + nextEntity.setNetMp3File(flowSub.getNetMp3File()); + nextEntity.setMp4File(flowSub.getMp4File()); + nextEntity.setNetMp4File(flowSub.getNetMp4File()); + nextEntity.setServiceDuration(flowSub.getServiceDuration()); + nextEntity.setServiceContent(flowSub.getServiceContent()); + nextEntity.setIzStart("N"); + nextEntity.setIzFinish("N"); + nextEntity.setIzRollback(izRollback); + nextEntity.setCreateBy(invoicingOrdersEntity.getInitiatorId()); + nextEntity.setCreateTime(c.getTime()); + nextEntity.setDelFlag("0"); + nextEntity.setInitiatorId(initiatorId); + nextEntity.setInitiatorName(initiatorName); + nextEntity.setBeginTime(c.getTime()); + c.add(Calendar.MINUTE,Integer.valueOf(flowSub.getServiceDuration())); + nextEntity.setEndTime(c.getTime()); + nextEntity.setEmployeeId(employeeId); + nextEntity.setEmployeeName(employeeName); + baseMapper.insert(nextEntity); + + //ws推送 employeeId } /**