|
|
|
@ -4,12 +4,10 @@ import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import javax.annotation.Resource; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import io.swagger.annotations.Example; |
|
|
|
|
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
|
|
|
|
|
|
|
|
@ -19,17 +17,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
|
|
|
|
import org.jeecg.modules.demo.base.entity.ZyClothsModular; |
|
|
|
import org.jeecg.modules.demo.base.entity.ZyClothsModular; |
|
|
|
import org.jeecg.modules.demo.base.entity.ZyClothsType; |
|
|
|
|
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsModularService; |
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsModularService; |
|
|
|
import org.jeecg.modules.demo.base.service.IZyClothsTypeService; |
|
|
|
|
|
|
|
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; |
|
|
|
|
|
|
|
import org.jeecg.modules.zyclothsstyle.entity.vo.AllClothStyle; |
|
|
|
|
|
|
|
import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper; |
|
|
|
|
|
|
|
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; |
|
|
|
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; |
|
|
|
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; |
|
|
|
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; |
|
|
|
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; |
|
|
|
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; |
|
|
|
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; |
|
|
|
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; |
|
|
|
import org.jeecg.modules.zystylemodule.entity.ZyStyleModuleDetailVO; |
|
|
|
import org.jeecg.modules.zystylemodule.entity.ZyStyleModuleDetailVo; |
|
|
|
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper; |
|
|
|
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper; |
|
|
|
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; |
|
|
|
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; |
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
@ -85,7 +78,6 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
@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<>(); |
|
|
|
//从服装款式进去款式模块时 根据style_id进行筛选 所以一般都会有id即style_id
|
|
|
|
//从服装款式进去款式模块时 根据style_id进行筛选 所以一般都会有id即style_id
|
|
|
|
queryWrapper.eq(StringUtils.hasText(id), "style_id", id); |
|
|
|
queryWrapper.eq(StringUtils.hasText(id), "style_id", id); |
|
|
|
@ -106,8 +98,8 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
zyStyleModules.addAll(zyStyleModulesList); |
|
|
|
zyStyleModules.addAll(zyStyleModulesList); |
|
|
|
} |
|
|
|
} |
|
|
|
//将新查出来的集合在根据styleid 筛选一下
|
|
|
|
//将新查出来的集合在根据styleid 筛选一下
|
|
|
|
zyStyleModules = zyStyleModules.stream().filter(ZyStyleModule -> ZyStyleModule.getStyleId().equals(id)).collect(Collectors.toList()); |
|
|
|
List<ZyStyleModule> collect = zyStyleModules.stream().filter(ZyStyleModule -> ZyStyleModule.getStyleId().equals(id)).collect(Collectors.toList()); |
|
|
|
pageList.setRecords(zyStyleModules); |
|
|
|
pageList.setRecords(collect); |
|
|
|
} |
|
|
|
} |
|
|
|
//List<ZyStyleModule> zyStyleModules = zyStyleModuleMapper.getListByStyleId(id);
|
|
|
|
//List<ZyStyleModule> zyStyleModules = zyStyleModuleMapper.getListByStyleId(id);
|
|
|
|
//改变list中的实体类 类型
|
|
|
|
//改变list中的实体类 类型
|
|
|
|
@ -178,8 +170,8 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS |
|
|
|
@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); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
|
