qiangxuan 6 mesi fa
parent
commit
1a07f8ff97

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

@@ -178,7 +178,7 @@ public class BilletBasicInfoController extends JeecgController<BilletBasicInfo,
 	public Result<?> queryBilletLengthList(@RequestParam(name="ccmNo") Integer ccmNo, @RequestParam(name="heatNo") String heatNo) {
 		List<Integer> billetLengthList = billetBasicInfoService.queryBilletLengthList(ccmNo, heatNo);
 		if (billetLengthList.size() == 0){
-			return Result.error("当前浇铸炉号不存在!");
+			return Result.OK("当前浇铸炉号不存在!");
 		}
 		return Result.OK(billetLengthList);
 	}

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

@@ -53,12 +53,13 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
     @Override
     public List<Integer> queryBilletLengthList(Integer ccmNo, String heatNo) {
         LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BilletBasicInfo::getCcmNo, ccmNo).eq(BilletBasicInfo::getHeatNo, heatNo).groupBy(BilletBasicInfo::getLength);
+        queryWrapper.eq(BilletBasicInfo::getCcmNo, ccmNo).eq(BilletBasicInfo::getHeatNo, heatNo);
         List<BilletBasicInfo> billetBasicInfoList = baseMapper.selectList(queryWrapper);
         if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
             return new ArrayList<>();
         }
-        List<Integer> billetLengthList = billetBasicInfoList.stream().map(BilletBasicInfo::getLength).collect(Collectors.toList());
+        List<Integer> billetLengthList = billetBasicInfoList.stream().map(BilletBasicInfo::getLength).collect(Collectors.toSet())
+                .stream().collect(Collectors.toList());
         return billetLengthList;
     }