From 65aaa935f680895c8e2b6e1d7dd37c4e749ee4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 9 Jan 2026 10:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=8D=B3=E6=97=B6=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 --- .../directiveorder/api/ServiceOrderApi.java | 17 ++- .../com/nu/entity/DirectiveOrderEntity.java | 2 + .../api/IDirectiveOrderApi.java | 1 + .../modules/order/api/IDirectiveOrderApi.java | 2 + .../biz/order/entity/DirectiveOrder.java | 7 ++ .../order/mapper/DirectiveOrderMapper.java | 1 + .../order/mapper/xml/DirectiveOrderMapper.xml | 116 ++++++++++-------- .../order/service/IDirectiveOrderService.java | 4 + .../impl/DirectiveOrderPadServiceImpl.java | 17 ++- .../impl/DirectiveOrderServiceImpl.java | 45 +++++++ 10 files changed, 152 insertions(+), 60 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java index 6dc43adb..77dc3461 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java @@ -56,7 +56,7 @@ public class ServiceOrderApi { @AutoLog(value = "服务指令工单-开始服务",clientType="app", operateType = 2) @PostMapping(value = "/startOrder") public Result startOrder(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map pddMap = directiveOrderApi.startOrder(directiveOrderSubEntity); + Map result = directiveOrderApi.startOrder(directiveOrderSubEntity); return Result.OK("操作成功！"); } @@ -64,7 +64,7 @@ public class ServiceOrderApi { @AutoLog(value = "服务指令工单-结束服务",clientType="app", operateType = 2) @PostMapping(value = "/endOrder") public Result endOrder(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map pddMap = directiveOrderApi.endOrder(directiveOrderSubEntity); + Map result = directiveOrderApi.endOrder(directiveOrderSubEntity); return Result.OK("操作成功！"); } @@ -73,7 +73,7 @@ public class ServiceOrderApi { @AutoLog(value = "服务指令工单-上传mp4",clientType="app", operateType = 2) @PostMapping(value = "/editSubMp4") public Result editSubMp4(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map pddMap = directiveOrderApi.editSubMp4(directiveOrderSubEntity); + Map result = directiveOrderApi.editSubMp4(directiveOrderSubEntity); return Result.OK("操作成功！"); } @@ -81,7 +81,7 @@ public class ServiceOrderApi { @AutoLog(value = "服务指令工单-上传照片",clientType="app", operateType = 2) @PostMapping(value = "/editSubPicPath") public Result editSubPicPath(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map pddMap = directiveOrderApi.editSubPicPath(directiveOrderSubEntity); + Map result = directiveOrderApi.editSubPicPath(directiveOrderSubEntity); return Result.OK("操作成功！"); } @@ -98,4 +98,13 @@ public class ServiceOrderApi { IPage pageList = directiveOrderApi.queryWorkOrderList(pageNo, pageSize, directiveOrderEntity,req); return Result.OK(pageList); } + + @ApiOperation(value="服务指令工单-生成即时指令工单", notes="服务指令工单-生成即时指令工单") + @AutoLog(value = "服务指令工单-生成即时指令工单",clientType="app", operateType = 2) + @PostMapping(value = "/generateInstant") + public Result generateInstant(@RequestBody DirectiveOrderEntity directiveOrderEntity) { + Map result = directiveOrderApi.generateOrdersInstant(directiveOrderEntity); + return Result.OK("操作成功！"); + } + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 51361231..e3eac31b 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -127,6 +127,8 @@ public class DirectiveOrderEntity implements Serializable { private String remarks; /**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/ private String workType; + /**发起模式 1主动触发，工单派给发起人自己 2被动触发，中控发起，派单规则发送给员工*/ + private String triggerMode; /** * 子表信息 */ diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/directiveorder/api/IDirectiveOrderApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/directiveorder/api/IDirectiveOrderApi.java index 039f2c29..dbabcd0d 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/directiveorder/api/IDirectiveOrderApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/directiveorder/api/IDirectiveOrderApi.java @@ -4,6 +4,7 @@ import com.nu.entity.DirectiveOrderSubEntity; import java.util.List; +// 作废 public interface IDirectiveOrderApi { } diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java index 1ca8d264..1f5650fd 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java @@ -49,4 +49,6 @@ public interface IDirectiveOrderApi { List queryCurrent(CareDirectiveEntity dto); + Map generateOrdersInstant(DirectiveOrderEntity directiveOrderEntity); + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java index e8d574ed..7d9481d5 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java @@ -185,4 +185,11 @@ public class DirectiveOrder implements Serializable { //空闲状态提高3级 指定护理员提高2级 @TableField(exist = false) private Integer level; + + /**发起模式 1主动触发，工单派给发起人自己 2被动触发，中控发起，派单规则发送给员工*/ + @TableField(exist = false) + private String triggerMode; + + @TableField(exist = false) + private String tableName;//表名字 } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java index 2d5a5d95..c651c589 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java @@ -37,4 +37,5 @@ public interface DirectiveOrderMapper extends BaseMapper { List queryCurrent(@Param("dto") CareDirectiveEntity dto); + DirectiveOrder getDirectiveById(DirectiveOrder orders); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml index 43681718..05775e92 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml @@ -109,73 +109,74 @@ + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderService.java index 20e946dd..c96977b0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/IDirectiveOrderService.java @@ -2,8 +2,11 @@ package com.nu.modules.biz.order.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.biz.order.entity.DirectiveOrder; +import org.apache.ibatis.annotations.Param; import org.jeecg.common.api.vo.Result; +import java.util.Map; + /** * @Description: 服务指令工单主表 * @Author: caolei @@ -12,4 +15,5 @@ import org.jeecg.common.api.vo.Result; */ public interface IDirectiveOrderService extends IService { Result generateOrdersBatch(); + Map generateOrdersInstant(DirectiveOrder directiveOrder); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java index b9bdb2d6..fa8568c0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java @@ -13,6 +13,7 @@ import com.nu.modules.biz.order.entity.DirectiveOrder; import com.nu.modules.biz.order.entity.DirectiveOrderSub; import com.nu.modules.biz.order.mapper.DirectiveOrderMapper; import com.nu.modules.biz.order.mapper.DirectiveOrderSubMapper; +import com.nu.modules.biz.order.service.IDirectiveOrderService; import com.nu.modules.order.api.IDirectiveOrderApi; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -36,7 +37,7 @@ import java.util.*; public class DirectiveOrderPadServiceImpl extends ServiceImpl implements IDirectiveOrderApi { @Autowired - private DirectiveOrderMapper directiveOrderMapper; + private IDirectiveOrderService directiveOrderService; @Autowired private DirectiveOrderSubMapper directiveOrderSubMapper; @@ -53,7 +54,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl generateOrdersInstant(DirectiveOrderEntity directiveOrderEntity){ + DirectiveOrder directiveOrder = new DirectiveOrder(); + BeanUtils.copyProperties(directiveOrderEntity,directiveOrder); + return directiveOrderService.generateOrdersInstant(directiveOrder); + } + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java index db3382f0..9a014df0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java @@ -13,8 +13,10 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub; import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService; import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -579,4 +581,47 @@ public class DirectiveOrderServiceImpl extends ServiceImpl generateOrdersInstant(DirectiveOrder directiveOrder){ + Map map = new HashMap<>(); + map.put("success",true); + map.put("message","操作成功"); + + String orderType = directiveOrder.getOrderType(); + if(orderType.equals("1")){ + //护理即时 + directiveOrder.setTableName("nu_biz_nu_care_directive_plan_instant"); + } + if(orderType.equals("2")){ + //医疗即时 + directiveOrder.setTableName("nu_biz_nu_medical_directive_plan_instant"); + } + if(orderType.equals("3")){ + //仓库即时 + directiveOrder.setTableName("nu_biz_nu_invoicing_directive_plan_instant"); + } + if(orderType.equals("4")){ + //后勤即时 + directiveOrder.setTableName("nu_biz_nu_logistics_directive_plan_instant"); + } + DirectiveOrder directiveInfo = baseMapper.getDirectiveById(directiveOrder); + + if(directiveOrder.getTriggerMode().equals("1")){ + //直接派单给发起人 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String employeeId = sysUser.getEmployessId(); + }else{ + //按规则派单 + getSendOrderRule(); + + } + return map; + } + + }