|
|
@ -56,9 +56,9 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IZyClothsStyleService zyClothsStyleService; |
|
|
|
private IZyClothsStyleService zyClothsStyleService; |
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
@Autowired |
|
|
|
private ZyStyleFabricMapper zyStyleFabricMapper; |
|
|
|
private ZyStyleFabricMapper zyStyleFabricMapper; |
|
|
|
@Resource |
|
|
|
@Autowired |
|
|
|
private ZyStyleModuleMapper zyStyleModuleMapper; |
|
|
|
private ZyStyleModuleMapper zyStyleModuleMapper; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -74,15 +74,16 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
@ApiOperation(value = "款式模块表-分页列表查询", notes = "款式模块表-分页列表查询") |
|
|
|
@ApiOperation(value = "款式模块表-分页列表查询", notes = "款式模块表-分页列表查询") |
|
|
|
@GetMapping(value = "/list") |
|
|
|
@GetMapping(value = "/list") |
|
|
|
public Result<?> queryPageList(ZyStyleModule zyStyleModule2, |
|
|
|
public Result<?> queryPageList(ZyStyleModule zyStyleModule2, |
|
|
|
@RequestParam(name = "id" )String id,String modularId, |
|
|
|
@RequestParam(name = "id", required = false) String id, |
|
|
|
|
|
|
|
@RequestParam(name = "modularId", required = false) String modularId, |
|
|
|
@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) { |
|
|
|
//System.err.println("ZyStyleModule 款式模块表 传来的 " + id);
|
|
|
|
//System.err.println("ZyStyleModule 款式模块表 传来的 " + id);
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.eq(StringUtils.hasText(id),"style_id", id); |
|
|
|
queryWrapper.eq(StringUtils.hasText(id), "style_id", id); |
|
|
|
queryWrapper.eq(StringUtils.hasText(modularId),"modular_id", modularId); |
|
|
|
queryWrapper.eq(StringUtils.hasText(modularId), "modular_id", modularId); |
|
|
|
Page<ZyStyleModule> page = new Page<>(pageNo, pageSize); |
|
|
|
Page<ZyStyleModule> page = new Page<>(pageNo, pageSize); |
|
|
|
IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper); |
|
|
|
IPage<ZyStyleModule> pageList = zyStyleModuleService.page(page, queryWrapper); |
|
|
|
|
|
|
|
|
|
|
@ -149,7 +150,7 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
@ApiOperation(value = "款式模块表-详情", notes = "款式模块表-详情") |
|
|
|
@ApiOperation(value = "款式模块表-详情", notes = "款式模块表-详情") |
|
|
|
@GetMapping(value = "/detail") |
|
|
|
@GetMapping(value = "/detail") |
|
|
|
public Result<?> detail(@RequestParam(name = "id", required = true) String id) { |
|
|
|
public Result<?> detail(@RequestParam(name = "id", required = true) String id) { |
|
|
|
System.out.println("款式模块表 /detail controller层接受到的id: : "+id); |
|
|
|
System.out.println("款式模块表 /detail controller层接受到的id: : " + id); |
|
|
|
ZyStyleModuleDetailVO detailVO = zyStyleModuleService.queryDetail(id); |
|
|
|
ZyStyleModuleDetailVO detailVO = zyStyleModuleService.queryDetail(id); |
|
|
|
return Result.OK(detailVO); |
|
|
|
return Result.OK(detailVO); |
|
|
|
} |
|
|
|
} |
|
|
|