|
|
|
@ -87,12 +87,6 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
HttpServletRequest req) { |
|
|
|
HttpServletRequest req) { |
|
|
|
/*LambdaQueryWrapper<ZyStyleModule> lambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
|
|
|
lambdaQueryWrapper.eq(ZyStyleModule::getStyleId,id); |
|
|
|
|
|
|
|
Page<NewStyleModule> page = new Page<>(pageNo,pageSize); |
|
|
|
|
|
|
|
Page<NewStyleModule> pageList = zyStyleModuleService.page(page, lambdaQueryWrapper); |
|
|
|
|
|
|
|
System.out.println(pageList.getRecords()); |
|
|
|
|
|
|
|
return Result.OK(pageList);*/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<NewStyleModule> listNewStyleModules = new ArrayList<>(); |
|
|
|
List<NewStyleModule> listNewStyleModules = new ArrayList<>(); |
|
|
|
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>(); |
|
|
|
@ -112,7 +106,6 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
List<ZyStyleModule> list = zyStyleModuleService.list(queryWrapper); |
|
|
|
List<ZyStyleModule> list = zyStyleModuleService.list(queryWrapper); |
|
|
|
System.out.println(list); |
|
|
|
|
|
|
|
for (ZyStyleModule zyStyleModule : list) { |
|
|
|
for (ZyStyleModule zyStyleModule : list) { |
|
|
|
NewStyleModule newSeMo = new NewStyleModule(); |
|
|
|
NewStyleModule newSeMo = new NewStyleModule(); |
|
|
|
//编辑回显
|
|
|
|
//编辑回显
|
|
|
|
@ -146,8 +139,7 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
} |
|
|
|
} |
|
|
|
IPage<NewStyleModule> pageList = new Page<>(pageNo, pageSize, listNewStyleModules.size()); |
|
|
|
IPage<NewStyleModule> pageList = new Page<>(pageNo, pageSize, listNewStyleModules.size()); |
|
|
|
pageList.setRecords(listNewStyleModules); |
|
|
|
pageList.setRecords(listNewStyleModules); |
|
|
|
|
|
|
|
//System.out.println(pageList.getRecords());
|
|
|
|
System.out.println(pageList.getRecords()); |
|
|
|
|
|
|
|
return Result.OK(pageList); |
|
|
|
return Result.OK(pageList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -172,7 +164,6 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
Page<ZyStyleModule> page = new Page<ZyStyleModule>(pageNo, pageSize); |
|
|
|
Page<ZyStyleModule> page = new Page<ZyStyleModule>(pageNo, pageSize); |
|
|
|
|
|
|
|
|
|
|
|
IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper); |
|
|
|
IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper); |
|
|
|
//System.out.println(zyStyleModule);
|
|
|
|
|
|
|
|
return Result.OK(pageList); |
|
|
|
return Result.OK(pageList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -187,14 +178,6 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:add")
|
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:add")
|
|
|
|
@PostMapping(value = "/add") |
|
|
|
@PostMapping(value = "/add") |
|
|
|
public Result<String> add(@RequestBody ZyStyleModule zyStyleModule) { |
|
|
|
public Result<String> add(@RequestBody ZyStyleModule zyStyleModule) { |
|
|
|
//根据styleId到原表 zy cloths style直接把名字拿过来，再根据名字到另一个表 zy cloths type 中把id拿过来
|
|
|
|
|
|
|
|
//String styleId = zyStyleModule.getStyleId();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//ZyClothsStyle zyClothsStyle = zyClothsStyleService.getById(styleId);
|
|
|
|
|
|
|
|
//LambdaQueryWrapper<ZyClothsType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
|
|
|
//lambdaQueryWrapper.eq(ZyClothsType::getTypeName,zyClothsStyle.getTypeId());
|
|
|
|
|
|
|
|
//ZyClothsType zyClothsType = zyClothsTypeService.getOne(lambdaQueryWrapper);
|
|
|
|
|
|
|
|
//zyStyleModule.setTypeId(zyClothsType.getId());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
zyStyleModuleService.save(zyStyleModule); |
|
|
|
zyStyleModuleService.save(zyStyleModule); |
|
|
|
return Result.OK("添加成功！"); |
|
|
|
return Result.OK("添加成功！"); |
|
|
|
|
