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/JgChangeRegistrationReformServiceImpl.java

@@ -453,6 +453,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
             detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
         }
+        detail.remove("submit");
+        detail.remove("instanceId");
         return detail;
     }
 

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/JgMaintainNoticeServiceImpl.java

@@ -198,6 +198,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
                 notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
                 notice.setInstanceId(workflowResultDto.getInstanceId());
+                notice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgMaintainNoticeMapper.updateById(notice);
                 // 如果为保存并提交，则创建代办
                 buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);