diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java index 0ddaa37c1..a0777d2d4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -97,10 +97,11 @@ public class Plating extends BaseEntity { private String configNo; /** * [镀种分类]id + * 2026/06/02 镀种分类更换表 BS_PLATING_ASSORTMENT */ @Schema(description = "[镀种分类]id") @JsonSerialize(using = ToStringSerializer.class) - private Long bcId; + private Long platingAssortmentId; /** * 镀种 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java index 054867d1b..a9a9cdb69 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -39,6 +39,7 @@ import org.springblade.desk.basic.excel.PlatingSmallExcel; import org.springblade.desk.basic.pojo.entity.*; import org.springblade.desk.basic.pojo.vo.PlatingVO; import org.springblade.desk.basic.service.IBasicClazzService; +import org.springblade.desk.basic.service.IPlatingAssortmentService; import org.springblade.desk.basic.service.IPlatingService; import org.springblade.desk.basic.service.IPlatingSmallService; import org.springblade.desk.basic.util.ExcelExtUtil; @@ -68,12 +69,15 @@ public class PlatingController extends BladeController { @Resource private IPlatingService service; - @Resource - private IBasicClazzService basicClazzService; +// @Resource +// private IBasicClazzService basicClazzService; @Resource private IPlatingSmallService platingSmallservice; + @Resource + private IPlatingAssortmentService platingAssortmentService; + /** * [镀种] 详情 */ @@ -112,19 +116,19 @@ public class PlatingController extends BladeController { IPage pagesVO = PlatingWrapper.build().pageVO(pages); //bcId //镀种ID , 镀种名称 - Set bcIds = pagesVO.getRecords().stream().map(PlatingVO::getBcId).collect(Collectors.toSet()); - if (CollUtil.isEmpty(bcIds)){ + Set platingAssortmentId = pagesVO.getRecords().stream().map(PlatingVO::getPlatingAssortmentId).collect(Collectors.toSet()); + if (CollUtil.isEmpty(platingAssortmentId)){ return R.data(pagesVO); } - Map bcIdAndName = basicClazzService - .listByIds(bcIds) + Map bcIdAndName = platingAssortmentService + .listByIds(platingAssortmentId) .stream() - .collect(Collectors.toMap(BasicClazz::getId, BasicClazz::getName)); + .collect(Collectors.toMap(PlatingAssortment::getId, PlatingAssortment::getName)); //basicClazzService pagesVO.getRecords() .stream() .peek( s -> { - s.setBcName(bcIdAndName.getOrDefault(s.getBcId(), "-1")); + s.setBcName(bcIdAndName.getOrDefault(s.getPlatingAssortmentId(), "-1")); service.setVOValue(s); }) .collect(Collectors.toList()); @@ -317,11 +321,11 @@ public class PlatingController extends BladeController { list.forEach(noticeExcel -> { Plating notice = BeanUtil.copy(noticeExcel, Plating.class); - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("name",noticeExcel.getBcName()); - List clazzes = basicClazzService.list(queryWrapper); + List clazzes = platingAssortmentService.list(queryWrapper); if(null != clazzes && clazzes.size() > 0){ - notice.setBcId(clazzes.get(0).getId()); + notice.setPlatingAssortmentId(clazzes.get(0).getId()); } QueryWrapper queryWrapperSmall = new QueryWrapper<>();