更改镀种分类表

liweidong
liweidong-hj 2 days ago
parent 6a88730232
commit 3e1fc842b0
  1. 3
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java
  2. 26
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java

@ -97,10 +97,11 @@ public class Plating extends BaseEntity {
private String configNo; private String configNo;
/** /**
* [镀种分类]id * [镀种分类]id
* 2026/06/02 镀种分类更换表 BS_PLATING_ASSORTMENT
*/ */
@Schema(description = "[镀种分类]id") @Schema(description = "[镀种分类]id")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long bcId; private Long platingAssortmentId;
/** /**
* 镀种 * 镀种
*/ */

@ -39,6 +39,7 @@ import org.springblade.desk.basic.excel.PlatingSmallExcel;
import org.springblade.desk.basic.pojo.entity.*; import org.springblade.desk.basic.pojo.entity.*;
import org.springblade.desk.basic.pojo.vo.PlatingVO; import org.springblade.desk.basic.pojo.vo.PlatingVO;
import org.springblade.desk.basic.service.IBasicClazzService; 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.IPlatingService;
import org.springblade.desk.basic.service.IPlatingSmallService; import org.springblade.desk.basic.service.IPlatingSmallService;
import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.ExcelExtUtil;
@ -68,12 +69,15 @@ public class PlatingController extends BladeController {
@Resource @Resource
private IPlatingService service; private IPlatingService service;
@Resource // @Resource
private IBasicClazzService basicClazzService; // private IBasicClazzService basicClazzService;
@Resource @Resource
private IPlatingSmallService platingSmallservice; private IPlatingSmallService platingSmallservice;
@Resource
private IPlatingAssortmentService platingAssortmentService;
/** /**
* [镀种] 详情 * [镀种] 详情
*/ */
@ -112,19 +116,19 @@ public class PlatingController extends BladeController {
IPage<PlatingVO> pagesVO = PlatingWrapper.build().pageVO(pages); IPage<PlatingVO> pagesVO = PlatingWrapper.build().pageVO(pages);
//bcId //bcId
//镀种ID , 镀种名称 //镀种ID , 镀种名称
Set<Long> bcIds = pagesVO.getRecords().stream().map(PlatingVO::getBcId).collect(Collectors.toSet()); Set<Long> platingAssortmentId = pagesVO.getRecords().stream().map(PlatingVO::getPlatingAssortmentId).collect(Collectors.toSet());
if (CollUtil.isEmpty(bcIds)){ if (CollUtil.isEmpty(platingAssortmentId)){
return R.data(pagesVO); return R.data(pagesVO);
} }
Map<Long, String> bcIdAndName = basicClazzService Map<Long, String> bcIdAndName = platingAssortmentService
.listByIds(bcIds) .listByIds(platingAssortmentId)
.stream() .stream()
.collect(Collectors.toMap(BasicClazz::getId, BasicClazz::getName)); .collect(Collectors.toMap(PlatingAssortment::getId, PlatingAssortment::getName));
//basicClazzService //basicClazzService
pagesVO.getRecords() pagesVO.getRecords()
.stream() .stream()
.peek( s -> { .peek( s -> {
s.setBcName(bcIdAndName.getOrDefault(s.getBcId(), "-1")); s.setBcName(bcIdAndName.getOrDefault(s.getPlatingAssortmentId(), "-1"));
service.setVOValue(s); service.setVOValue(s);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -317,11 +321,11 @@ public class PlatingController extends BladeController {
list.forEach(noticeExcel -> { list.forEach(noticeExcel -> {
Plating notice = BeanUtil.copy(noticeExcel, Plating.class); Plating notice = BeanUtil.copy(noticeExcel, Plating.class);
QueryWrapper<BasicClazz> queryWrapper = new QueryWrapper<>(); QueryWrapper<PlatingAssortment> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",noticeExcel.getBcName()); queryWrapper.eq("name",noticeExcel.getBcName());
List<BasicClazz> clazzes = basicClazzService.list(queryWrapper); List<PlatingAssortment> clazzes = platingAssortmentService.list(queryWrapper);
if(null != clazzes && clazzes.size() > 0){ if(null != clazzes && clazzes.size() > 0){
notice.setBcId(clazzes.get(0).getId()); notice.setPlatingAssortmentId(clazzes.get(0).getId());
} }
QueryWrapper<PlatingSmall> queryWrapperSmall = new QueryWrapper<>(); QueryWrapper<PlatingSmall> queryWrapperSmall = new QueryWrapper<>();

Loading…
Cancel
Save