【核酸】核酸检测

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();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -65,6 +65,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             SendNoticeFormDTO dto = new SendNoticeFormDTO();
             List<SendNoticeFormDTO.UserListBean> 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<IcNatDao, IcNatEntity> 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<IcNatDao, IcNatEntity> imp
             SendNoticeFormDTO dto = new SendNoticeFormDTO();
             List<SendNoticeFormDTO.UserListBean> 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<IcNatDao, IcNatEntity> 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<IcNatDao, IcNatEntity> imp
      * @Description 【核酸】核酸检测信息同步
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void synchro(MyNatListFormDTO formDTO) {
         //1.获取工作人员缓存数据
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());