update1

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/controller/BilletBasicInfoController.java

@@ -12,6 +12,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
 import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
+import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -168,10 +169,7 @@ public class BilletBasicInfoController extends JeecgController<BilletBasicInfo,
 	@ApiOperation(value="钢坯类型名称信息-通过铸机号", notes="钢坯类型名称信息-通过铸机号")
 	@GetMapping(value = "/queryBilletNameList")
 	public Result<?> queryBilletNameList(@RequestParam(name="castMachine") String castMachine) {
-		List<String> billetNameList = billetBasicInfoService.queryBilletNameList(castMachine);
-		if (billetNameList.size() == 0){
-			return Result.error("钢坯类型名称信息不存在！");
-		}
+		List<BilletHotsendTypeConfig> billetNameList = billetBasicInfoService.queryBilletNameList(castMachine);
 		return Result.OK(billetNameList);
 	}
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/IBilletBasicInfoService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.actualControl.billetActual.billetActual.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
 import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
+import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
 
 import java.util.List;
 
@@ -20,5 +21,5 @@ public interface IBilletBasicInfoService extends IService<BilletBasicInfo> {
 
     List<Integer> queryBilletLengthList(Integer ccmNo, String heatNo);
 
-    List<String> queryBilletNameList(String castMachine);
+    List<BilletHotsendTypeConfig> queryBilletNameList(String castMachine);
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/impl/BilletBasicInfoServiceImpl.java

@@ -63,9 +63,9 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
     }
 
     @Override
-    public List<String> queryBilletNameList(String castMachine) {
+    public List<BilletHotsendTypeConfig> queryBilletNameList(String castMachine) {
         LambdaQueryWrapper<BilletHotsendTypeConfig> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BilletHotsendTypeConfig::getCastMachine, castMachine);
-        return billetHotsendTypeConfigService.list(queryWrapper).stream().map(BilletHotsendTypeConfig::getTypeName).collect(Collectors.toList());
+        return billetHotsendTypeConfigService.list(queryWrapper);
     }
 }