From 7d8c0ed7cabf227d4236f957ed8fa8f83f8e28d3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 28 Mar 2022 16:53:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A0=B8=E9=85=B8=E3=80=91=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/IcNatController.java | 3 ++- .../main/java/com/epmet/service/impl/IcNatServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index 5384a76dbb..0f6f799dd4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -88,7 +88,8 @@ public class IcNatController { **/ @NoRepeatSubmit @PostMapping("edit") - public Result edit(@RequestBody AddIcNatFormDTO formDTO) { + public Result edit(@LoginUser TokenDto tokenDto, @RequestBody AddIcNatFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); icNucleinService.edit(formDTO); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 40e1c49d5c..f367748156 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -65,6 +65,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp SendNoticeFormDTO dto = new SendNoticeFormDTO(); List userList = new ArrayList<>(); userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class)); + dto.setCustomerId(formDTO.getCustomerId()); dto.setUserList(userList); dto.setChannel(formDTO.getChannel()); dto.setOrigin("2"); @@ -141,6 +142,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp * @Description 【核酸】核酸检测信息修改 **/ @Override + @Transactional(rollbackFor = Exception.class) public void edit(AddIcNatFormDTO formDTO) { //1.更新核酸记录表数据 IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); @@ -161,6 +163,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp SendNoticeFormDTO dto = new SendNoticeFormDTO(); List userList = new ArrayList<>(); userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class)); + dto.setCustomerId(formDTO.getCustomerId()); dto.setUserList(userList); dto.setChannel(formDTO.getChannel()); dto.setOrigin("2"); @@ -175,6 +178,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp * @Description 【核酸】核酸检测信息删除/取消同步 **/ @Override + @Transactional(rollbackFor = Exception.class) public void del(MyNatListFormDTO formDTO) { //1.物理删除业务数据 if (baseDao.delById(formDTO.getIcNatId()) < NumConstant.ONE) { @@ -188,6 +192,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp * @Description 【核酸】核酸检测信息同步 **/ @Override + @Transactional(rollbackFor = Exception.class) public void synchro(MyNatListFormDTO formDTO) { //1.获取工作人员缓存数据 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());