更新

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

@@ -28,7 +28,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -48,6 +47,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,8 +78,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @Autowired
     private JgTransferNoticeMapper jgTransferNoticeMapper;
     @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
     @Autowired
     OtherInfoMapper tzsJgOtherInfoMapper;
@@ -390,8 +388,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
-        if (CollectionUtils.isEmpty(applyNoList)) {
+        ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
+        if (CollectionUtils.isEmpty(responseModel.getResult())) {
             return;
         }
 
@@ -463,7 +461,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             JgTransferNotice dto = new JgTransferNotice();
             BeanUtils.copyProperties(model, dto);
             int i = deviceList.indexOf(obj);
-            String applyNo = applyNoList.get(i);
+            String applyNo = responseModel.getResult().get(i);
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());