diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderBizLogEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderBizLogEntity.java new file mode 100644 index 00000000..d863cde0 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderBizLogEntity.java @@ -0,0 +1,34 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 服务指令工单业务操作日志表 + * @Author: jeecg-boot + * @Date: 2026-01-13 + * @Version: V1.0 + */ +@Data +public class DirectiveOrderBizLogEntity implements Serializable { + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + private String id; + /**业务类型编码*/ + private String bizTypeCode; + /**业务类型*/ + private String bizType; + /**业务主表单号*/ + private String bizNo; + /**操作类型*/ + private String optType; + /**操作员工ID*/ + private String optEmpId; + /**操作员工*/ + private String optEmpName; + /**操作时间*/ + private Date optTime; +} 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 7fa4980f..7ca6df4c 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 @@ -54,4 +54,6 @@ public interface IDirectiveOrderApi { void transferOrder(DirectiveOrderSubEntity dto); void assistOrder(DirectiveOrderSubEntity dto); + + Map addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderBizLog.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderBizLog.java new file mode 100644 index 00000000..a13d0b33 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderBizLog.java @@ -0,0 +1,61 @@ +package com.nu.modules.biz.order.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 服务指令工单业务操作日志表 + * @Author: caolei + * @Date: 2026-1-13 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_nu_directive_order_biz_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_nu_directive_order_biz_log对象", description="服务指令工单业务操作日志表") +public class DirectiveOrderBizLog implements Serializable { + private static final long serialVersionUID = 1L; + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + private String id; + /**业务类型编码*/ + private String bizTypeCode; + /**业务类型*/ + private String bizType; + /**业务主表单号*/ + private String bizNo; + /**操作类型*/ + private String optType; + /**操作员工ID*/ + private String optEmpId; + /**操作员工*/ + private String optEmpName; + /**操作时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date optTime; + /**创建人*/ + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**是否删除 0未删除 1删除*/ + private String delFlag; +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderBizLogMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderBizLogMapper.java new file mode 100644 index 00000000..90a528c1 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderBizLogMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.order.entity.DirectiveOrderBizLog; + +/** + * @Description: 服务指令工单业务操作日志表 + * @Author: caolei + * @Date: 2026-1-13 + * @Version: V1.0 + */ +public interface DirectiveOrderBizLogMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderBizLogMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderBizLogMapper.xml new file mode 100644 index 00000000..15573464 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderBizLogMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 c96977b0..12c0e042 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 @@ -16,4 +16,5 @@ import java.util.Map; public interface IDirectiveOrderService extends IService { Result generateOrdersBatch(); Map generateOrdersInstant(DirectiveOrder directiveOrder); + String getEmployeeName(String employeeId); } 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 913da819..1377ffe8 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 @@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.entity.CareDirectiveEntity; +import com.nu.entity.DirectiveOrderBizLogEntity; import com.nu.entity.DirectiveOrderEntity; import com.nu.entity.DirectiveOrderSubEntity; import com.nu.modules.biz.order.entity.DirectiveOrder; +import com.nu.modules.biz.order.entity.DirectiveOrderBizLog; import com.nu.modules.biz.order.entity.DirectiveOrderSub; +import com.nu.modules.biz.order.mapper.DirectiveOrderBizLogMapper; import com.nu.modules.biz.order.mapper.DirectiveOrderMapper; import com.nu.modules.biz.order.mapper.DirectiveOrderSubMapper; import com.nu.modules.biz.order.service.IDirectiveOrderService; @@ -42,6 +45,8 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl queryList(DirectiveOrderSubEntity dto) { @@ -260,7 +265,6 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity) { + DirectiveOrderBizLog directiveOrderBizLog = new DirectiveOrderBizLog(); + BeanUtils.copyProperties(directiveOrderBizLogEntity, directiveOrderBizLog); + String optEmpName = directiveOrderService.getEmployeeName(directiveOrderBizLogEntity.getOptEmpId()); + directiveOrderBizLog.setOptEmpName(optEmpName); + directiveOrderBizLogMapper.insert(directiveOrderBizLog); + Map map = new HashMap<>(); + map.put("success", true); + map.put("message", "操作成功"); + return map; + } } 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 24fc139d..4870cf44 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 @@ -893,7 +893,8 @@ public class DirectiveOrderServiceImpl extends ServiceImpl