Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -214,6 +214,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      * @param noticeDto 安装告知
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
+    @Transactional
     public JgInstallationNoticeDto updateInstallationNotice(String submitType, JgInstallationNoticeDto noticeDto, String op) {
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
@@ -729,6 +730,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
 
+    @Transactional
     public void cancel(JgInstallationNoticeDto noticeDto) {
         JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -243,6 +243,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @param noticeDto 移装告知
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
+    @Transactional
     public JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
@@ -623,6 +624,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
 
+    @Transactional
     public void cancel(JgTransferNoticeDto noticeDto) {
         JgTransferNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(jgInstallationNotice.getInstanceId());