From c73447ed195bdb0562ad51a512b826e881a4bf21 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 20 Mar 2026 10:43:22 +0800 Subject: [PATCH] =?UTF-8?q?pad=E6=9C=8D=E5=8A=A1=E7=BC=96=E6=8E=92?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=88=A0=E6=94=B9=E6=97=B6=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=9A=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90id=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=BA=BA=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/plan/care/entity/DirectivePlanLog.java | 3 +++ .../care/service/IDirectivePlanLogService.java | 5 +++-- .../service/impl/CareDirectivePlanServiceImpl.java | 14 ++++++++++---- .../service/impl/DirectivePlanLogServiceImpl.java | 11 +++++++---- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/DirectivePlanLog.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/DirectivePlanLog.java index 9fcd25d8..57259e3e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/DirectivePlanLog.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/DirectivePlanLog.java @@ -95,4 +95,7 @@ public class DirectivePlanLog implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "数据变更时间") private java.util.Date changeTime; + /**数据变更人*/ + @ApiModelProperty(value = "数据变更人") + private java.lang.String changeBy; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/IDirectivePlanLogService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/IDirectivePlanLogService.java index e5ff023a..8e711f59 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/IDirectivePlanLogService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/IDirectivePlanLogService.java @@ -3,16 +3,17 @@ package com.nu.modules.biz.plan.care.service; import com.nu.modules.biz.plan.care.entity.CareDirectivePlan; import com.nu.modules.biz.plan.care.entity.DirectivePlanLog; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.system.vo.LoginUser; import java.util.List; /** * @Description: 服务编排变更日志 * @Author: jeecg-boot - * @Date: 2026-03-20 + * @Date: 2026-03-20 * @Version: V1.0 */ public interface IDirectivePlanLogService extends IService { - void batchInsert(List list); + void batchInsert(LoginUser sysUser, List list); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java index ee914c62..23e7ca4f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java @@ -7,6 +7,8 @@ import com.nu.modules.biz.plan.care.service.IDirectivePlanLogService; import com.nu.modules.config.directivepackage.service.IDirectivePackageService; import com.nu.modules.config.directivepackage.service.impl.DirectivePackageServiceImpl; import org.apache.commons.compress.utils.Lists; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.BeanUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.modules.biz.plan.care.entity.ElderTagPlan; @@ -138,7 +140,8 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl list = baseMapper.selectList(qw); if (!CollectionUtils.isEmpty(list)) { - directivePlanLogService.batchInsert(list); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + directivePlanLogService.batchInsert(sysUser, list); } return careDirectiveEntity; @@ -165,7 +168,8 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl list = baseMapper.selectList(qw); if (!CollectionUtils.isEmpty(list)) { - directivePlanLogService.batchInsert(list); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + directivePlanLogService.batchInsert(sysUser, list); } } @@ -184,7 +188,8 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl list = baseMapper.selectList(qw); if (!CollectionUtils.isEmpty(list)) { - directivePlanLogService.batchInsert(list); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + directivePlanLogService.batchInsert(sysUser, list); } } @@ -215,7 +220,8 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl list = baseMapper.selectList(qw); if (!CollectionUtils.isEmpty(list)) { - directivePlanLogService.batchInsert(list); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + directivePlanLogService.batchInsert(sysUser, list); } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/DirectivePlanLogServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/DirectivePlanLogServiceImpl.java index bb71ff1c..d575a3a0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/DirectivePlanLogServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/DirectivePlanLogServiceImpl.java @@ -5,6 +5,7 @@ import com.nu.modules.biz.plan.care.entity.CareDirectivePlan; import com.nu.modules.biz.plan.care.entity.DirectivePlanLog; import com.nu.modules.biz.plan.care.mapper.DirectivePlanLogMapper; import com.nu.modules.biz.plan.care.service.IDirectivePlanLogService; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -16,7 +17,7 @@ import java.util.List; /** * @Description: 服务编排变更日志 * @Author: jeecg-boot - * @Date: 2026-03-20 + * @Date: 2026-03-20 * @Version: V1.0 */ @Service @@ -24,11 +25,13 @@ public class DirectivePlanLogServiceImpl extends ServiceImpl list) { + public void batchInsert(LoginUser sysUser, List list) { List saveList = BeanUtil.copyToList(list, DirectivePlanLog.class); Date changeTime = new Date(); - saveList.forEach(item ->{ - item.setChangeTime(changeTime); + saveList.forEach(item -> { + item.setId(null); + item.setChangeTime(changeTime);//变更时间 + item.setChangeBy(sysUser.getRealname());//变更人 }); saveBatch(saveList); }