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

服务指令-生成即时指令工单bug调整

This commit is contained in:
曹磊 2026-01-13 09:54:04 +08:00
parent 4190b077b9
commit e4a814cea0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java
View File

@ -177,6 +177,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
orders.setIzFinish("N"); orders.setIzFinish("N");
orders.setOrderType("1"); orders.setOrderType("1");
orders.setOptType("1"); orders.setOptType("1");
orders.setIzTimeout("N");
orders.setOptIds(employee.getEmployeeId()); orders.setOptIds(employee.getEmployeeId());
orders.setOptNames(employee.getEmployeeName()); orders.setOptNames(employee.getEmployeeName());
orders.setServiceAllowedTimeout(allowedTimeout); orders.setServiceAllowedTimeout(allowedTimeout);
@ -190,6 +191,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
ordersSub.setIzStart("N"); ordersSub.setIzStart("N");
ordersSub.setIzFinish("N"); ordersSub.setIzFinish("N");
ordersSub.setOptType("1"); ordersSub.setOptType("1");
ordersSub.setIzTimeout("N");
ordersSub.setOptIds(employee.getEmployeeId()); ordersSub.setOptIds(employee.getEmployeeId());
ordersSub.setOptNames(employee.getEmployeeName()); ordersSub.setOptNames(employee.getEmployeeName());
ordersSub.setServiceAllowedTimeout(allowedTimeout); ordersSub.setServiceAllowedTimeout(allowedTimeout);
@ -215,6 +217,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
orders.setIzFinish("N"); orders.setIzFinish("N");
orders.setOrderType("1"); orders.setOrderType("1");
orders.setOptType("1"); orders.setOptType("1");
orders.setIzTimeout("N");
orders.setOptIds(employee.getEmployeeId()); orders.setOptIds(employee.getEmployeeId());
orders.setOptNames(employee.getEmployeeName()); orders.setOptNames(employee.getEmployeeName());
orders.setServiceAllowedTimeout(allowedTimeout); orders.setServiceAllowedTimeout(allowedTimeout);
@ -228,6 +231,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
ordersSub.setIzStart("N"); ordersSub.setIzStart("N");
ordersSub.setIzFinish("N"); ordersSub.setIzFinish("N");
ordersSub.setOptType("1"); ordersSub.setOptType("1");
ordersSub.setIzTimeout("N");
ordersSub.setOptIds(employee.getEmployeeId()); ordersSub.setOptIds(employee.getEmployeeId());
ordersSub.setOptNames(employee.getEmployeeName()); ordersSub.setOptNames(employee.getEmployeeName());
ordersSub.setServiceAllowedTimeout(allowedTimeout); ordersSub.setServiceAllowedTimeout(allowedTimeout);
@ -714,6 +718,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
packageSubList = ordersSubService.getDirectiveList(orders.getDirectiveId()); packageSubList = ordersSubService.getDirectiveList(orders.getDirectiveId());
String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(",")); String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
if(!directiveOrder.getTriggerMode().equals("1")){ if(!directiveOrder.getTriggerMode().equals("1")){
getSendOrderRule();
DirectiveOrder employee = employeeScreening(directiveIds,orders.getElderId(),null,orders.getStartTime()); DirectiveOrder employee = employeeScreening(directiveIds,orders.getElderId(),null,orders.getStartTime());
employeeId = employee.getEmployeeId(); employeeId = employee.getEmployeeId();
employeeName = employee.getEmployeeName(); employeeName = employee.getEmployeeName();
@ -726,6 +731,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
packageSubList = ordersSubService.getSubDirectiveList(orders.getPackageId()); packageSubList = ordersSubService.getSubDirectiveList(orders.getPackageId());
String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(",")); String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
if(!directiveOrder.getTriggerMode().equals("1")){ if(!directiveOrder.getTriggerMode().equals("1")){
getSendOrderRule();
List<DirectiveOrder> emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量 List<DirectiveOrder> emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量
if(packageSubList!=null){ if(packageSubList!=null){
int size = packageSubList.size(); int size = packageSubList.size();
@ -754,6 +760,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
orders.setEmployeeName(employeeName); orders.setEmployeeName(employeeName);
orders.setIzStart("N"); orders.setIzStart("N");
orders.setIzFinish("N"); orders.setIzFinish("N");
orders.setIzTimeout("N");
orders.setOptIds(employeeId); orders.setOptIds(employeeId);
orders.setOptNames(employeeName); orders.setOptNames(employeeName);
orders.setServiceAllowedTimeout(allowedTimeout); orders.setServiceAllowedTimeout(allowedTimeout);
@ -782,6 +789,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
ordersSub.setIzStart("N"); ordersSub.setIzStart("N");
ordersSub.setIzFinish("N"); ordersSub.setIzFinish("N");
ordersSub.setOptType("1"); ordersSub.setOptType("1");
ordersSub.setIzTimeout("N");
ordersSub.setOptIds(employeeId); ordersSub.setOptIds(employeeId);
ordersSub.setOptNames(employeeName); ordersSub.setOptNames(employeeName);
ordersSub.setServiceAllowedTimeout(allowedTimeout); ordersSub.setServiceAllowedTimeout(allowedTimeout);