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

@@ -196,7 +196,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgRelationEquip.setEquId(map.get("equipId").toString());
 //            List<String> applicationFormCode = iCreateCodeServicevice.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
 //            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
-            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+//            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
             if (!ObjectUtils.isEmpty(listResponseModel)) {
                 jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
             }
@@ -306,6 +307,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } else {
             // 流程结束
             jgUseRegistration.setStatus(taskCode);
+            jgUseRegistration.setNextExecuteUserIds("");
             if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
                 // 生成使用登记证编号
                 jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
@@ -320,6 +322,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             params.put("flowStatusLabel", jgUseRegistration.getStatus());
             params.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+            params.put("model", jgUseRegistration);
             commonServiceImpl.updateTaskModel(params);
         }
         this.getBaseMapper().updateById(jgUseRegistration);