|
|
|
@ -3,8 +3,10 @@ package org.jeecg.modules.zystylefabric.controller; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
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 org.jeecg.common.api.vo.Result; |
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -19,6 +21,7 @@ import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; |
|
|
|
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; |
|
|
|
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; |
|
|
|
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; |
|
|
|
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; |
|
|
|
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; |
|
|
|
import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; |
|
|
|
|
|
|
|
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; |
|
|
|
import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; |
|
|
|
import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; |
|
|
|
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; |
|
|
|
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; |
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
@ -29,178 +32,186 @@ import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog; |
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @Description: 款式面料表 |
|
|
|
* @Description: 款式面料表 |
|
|
|
* @Author: jeecg-boot |
|
|
|
* @Author: jeecg-boot |
|
|
|
* @Date: 2022-09-15 |
|
|
|
* @Date: 2022-09-15 |
|
|
|
* @Version: V1.0 |
|
|
|
* @Version: V1.0 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Api(tags="款式面料表") |
|
|
|
@Api(tags = "款式面料表") |
|
|
|
@RestController |
|
|
|
@RestController |
|
|
|
@RequestMapping("/zystylefabric/zyStyleFabric") |
|
|
|
@RequestMapping("/zystylefabric/zyStyleFabric") |
|
|
|
@Slf4j |
|
|
|
@Slf4j |
|
|
|
public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyStyleFabricService> { |
|
|
|
public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyStyleFabricService> { |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IZyStyleFabricService zyStyleFabricService; |
|
|
|
private IZyStyleFabricService zyStyleFabricService; |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private INewZyStyleFabricService NewZyStyleFabricService; |
|
|
|
private INewZyStyleFabricService NewZyStyleFabricService; |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IZyClothsStyleService zyClothsStyleService; |
|
|
|
private IZyClothsStyleService zyClothsStyleService; |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IZyFabricService zyFabricService; |
|
|
|
private IZyFabricService zyFabricService; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@Resource |
|
|
|
* 分页列表查询 |
|
|
|
private ZyStyleFabricMapper zyStyleFabricMapper; |
|
|
|
* |
|
|
|
|
|
|
|
* @param zyStyleFabric |
|
|
|
/** |
|
|
|
* @param pageNo |
|
|
|
* 分页列表查询 |
|
|
|
* @param pageSize |
|
|
|
* |
|
|
|
* @param req |
|
|
|
* @param zyStyleFabric |
|
|
|
* @return |
|
|
|
* @param pageNo |
|
|
|
*/ |
|
|
|
* @param pageSize |
|
|
|
//@AutoLog(value = "款式面料表-分页列表查询")
|
|
|
|
* @param req |
|
|
|
@ApiOperation(value="款式面料表-分页列表查询", notes="款式面料表-分页列表查询") |
|
|
|
* @return |
|
|
|
@GetMapping(value = "/list") |
|
|
|
*/ |
|
|
|
public Result<IPage<NewZyStyleFabric>> queryPageList(ZyStyleFabric zyStyleFabric,String id, |
|
|
|
//@AutoLog(value = "款式面料表-分页列表查询")
|
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
|
|
|
@ApiOperation(value = "款式面料表-分页列表查询", notes = "款式面料表-分页列表查询") |
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
|
|
|
@GetMapping(value = "/list") |
|
|
|
HttpServletRequest req) { |
|
|
|
public Result<IPage<NewZyStyleFabric>> queryPageList(ZyStyleFabric zyStyleFabric, String id, |
|
|
|
QueryWrapper<ZyStyleFabric> queryWrapper = new QueryWrapper<>(); |
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
if(id!=null){ |
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
queryWrapper.eq("style_id",id); |
|
|
|
HttpServletRequest req) { |
|
|
|
} |
|
|
|
QueryWrapper<ZyStyleFabric> queryWrapper = new QueryWrapper<>(); |
|
|
|
if(zyStyleFabric.getStyleId()!=null || zyStyleFabric.getFabricId()!=null ){ |
|
|
|
if (id != null) { |
|
|
|
if(zyStyleFabric.getStyleId()!=null){ |
|
|
|
queryWrapper.eq("style_id", id); |
|
|
|
queryWrapper.eq("style_id",zyStyleFabric.getStyleId()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (zyStyleFabric.getStyleId() != null || zyStyleFabric.getFabricId() != null) { |
|
|
|
if(zyStyleFabric.getFabricId()!=null){ |
|
|
|
if (zyStyleFabric.getStyleId() != null) { |
|
|
|
queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId()); |
|
|
|
queryWrapper.eq("style_id", zyStyleFabric.getStyleId()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (zyStyleFabric.getFabricId() != null) { |
|
|
|
} |
|
|
|
queryWrapper.eq("fabric_id", zyStyleFabric.getFabricId()); |
|
|
|
List<ZyStyleFabric> list = zyStyleFabricService.list(queryWrapper); |
|
|
|
} |
|
|
|
List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>(); |
|
|
|
|
|
|
|
for (ZyStyleFabric zyStyleF : list){ |
|
|
|
} |
|
|
|
System.out.println("****"+zyStyleF); |
|
|
|
List<ZyStyleFabric> list = zyStyleFabricService.list(queryWrapper); |
|
|
|
NewZyStyleFabric newZySF = new NewZyStyleFabric(); |
|
|
|
List<NewZyStyleFabric> newZyStyleFabrics = new ArrayList<>(); |
|
|
|
//编辑回显
|
|
|
|
for (ZyStyleFabric zyStyleF : list) { |
|
|
|
newZySF.setId(zyStyleF.getId()); |
|
|
|
System.out.println("****" + zyStyleF); |
|
|
|
newZySF.setFabricId(zyStyleF.getFabricId()); |
|
|
|
NewZyStyleFabric newZySF = new NewZyStyleFabric(); |
|
|
|
newZySF.setStyleId(zyStyleF.getStyleId()); |
|
|
|
//编辑回显
|
|
|
|
//款式编号和名称
|
|
|
|
newZySF.setId(zyStyleF.getId()); |
|
|
|
String styleId = zyStyleF.getStyleId(); |
|
|
|
newZySF.setFabricId(zyStyleF.getFabricId()); |
|
|
|
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); |
|
|
|
newZySF.setStyleId(zyStyleF.getStyleId()); |
|
|
|
newZySF.setStyleNums(styleById.getNums()); |
|
|
|
|
|
|
|
newZySF.setStyleNames(styleById.getStyleNames()); |
|
|
|
//拿到服装类型名称
|
|
|
|
//模块编号和名称
|
|
|
|
String typeName = zyStyleFabricMapper.getTypeName(newZySF.getStyleId()); |
|
|
|
String fabricId = zyStyleF.getFabricId(); |
|
|
|
newZySF.setTypeName(typeName); |
|
|
|
|
|
|
|
|
|
|
|
ZyFabric fabricById = zyFabricService.getById(fabricId); |
|
|
|
//款式编号和名称
|
|
|
|
|
|
|
|
String styleId = zyStyleF.getStyleId(); |
|
|
|
newZySF.setFabricNumber(fabricById.getFabricNumber()); |
|
|
|
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); |
|
|
|
newZySF.setFabricName(fabricById.getName()); |
|
|
|
newZySF.setStyleNums(styleById.getNums()); |
|
|
|
newZySF.setCreateTime(zyStyleF.getCreateTime()); |
|
|
|
newZySF.setStyleNames(styleById.getStyleNames()); |
|
|
|
newZyStyleFabrics.add(newZySF); |
|
|
|
//模块编号和名称
|
|
|
|
} |
|
|
|
String fabricId = zyStyleF.getFabricId(); |
|
|
|
IPage<NewZyStyleFabric> pageList = new Page<>(pageNo, pageSize, list.size()); |
|
|
|
|
|
|
|
pageList.setRecords(newZyStyleFabrics); |
|
|
|
ZyFabric fabricById = zyFabricService.getById(fabricId); |
|
|
|
return Result.OK(pageList); |
|
|
|
|
|
|
|
} |
|
|
|
newZySF.setFabricNumber(fabricById.getFabricNumber()); |
|
|
|
|
|
|
|
newZySF.setFabricName(fabricById.getName()); |
|
|
|
/** |
|
|
|
newZySF.setCreateTime(zyStyleF.getCreateTime()); |
|
|
|
* 添加 |
|
|
|
newZyStyleFabrics.add(newZySF); |
|
|
|
* |
|
|
|
} |
|
|
|
* @param zyStyleFabric |
|
|
|
IPage<NewZyStyleFabric> pageList = new Page<>(pageNo, pageSize, list.size()); |
|
|
|
* @return |
|
|
|
pageList.setRecords(newZyStyleFabrics); |
|
|
|
*/ |
|
|
|
return Result.OK(pageList); |
|
|
|
@AutoLog(value = "款式面料表-添加") |
|
|
|
} |
|
|
|
@ApiOperation(value="款式面料表-添加", notes="款式面料表-添加") |
|
|
|
|
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add")
|
|
|
|
/** |
|
|
|
@PostMapping(value = "/add") |
|
|
|
* 添加 |
|
|
|
public Result<Object> add(@RequestBody ZyStyleFabric zyStyleFabric) { |
|
|
|
* |
|
|
|
String[] split = zyStyleFabric.getFabricId().split(","); |
|
|
|
* @param zyStyleFabric |
|
|
|
QueryWrapper queryWrapper=new QueryWrapper(); |
|
|
|
* @return |
|
|
|
queryWrapper.eq("style_id",zyStyleFabric.getStyleId()); |
|
|
|
*/ |
|
|
|
for (String s : split) { |
|
|
|
@AutoLog(value = "款式面料表-添加") |
|
|
|
zyStyleFabric.setFabricId(s); |
|
|
|
@ApiOperation(value = "款式面料表-添加", notes = "款式面料表-添加") |
|
|
|
zyStyleFabric.setId(null); |
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add")
|
|
|
|
queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId()); |
|
|
|
@PostMapping(value = "/add") |
|
|
|
int a=zyStyleFabricService.count(queryWrapper); |
|
|
|
public Result<Object> add(@RequestBody ZyStyleFabric zyStyleFabric) { |
|
|
|
if(a>=1) |
|
|
|
String[] split = zyStyleFabric.getFabricId().split(","); |
|
|
|
return Result.error("存在以添加过的数据！！！"); |
|
|
|
QueryWrapper queryWrapper = new QueryWrapper(); |
|
|
|
zyStyleFabricService.save(zyStyleFabric); |
|
|
|
queryWrapper.eq("style_id", zyStyleFabric.getStyleId()); |
|
|
|
} |
|
|
|
for (String s : split) { |
|
|
|
return Result.OK("添加成功！"); |
|
|
|
zyStyleFabric.setFabricId(s); |
|
|
|
} |
|
|
|
zyStyleFabric.setId(null); |
|
|
|
|
|
|
|
queryWrapper.eq("fabric_id", zyStyleFabric.getFabricId()); |
|
|
|
/** |
|
|
|
int a = zyStyleFabricService.count(queryWrapper); |
|
|
|
* 编辑 |
|
|
|
if (a >= 1) |
|
|
|
* |
|
|
|
return Result.error("存在以添加过的数据！！！"); |
|
|
|
* @param zyStyleFabric |
|
|
|
zyStyleFabricService.save(zyStyleFabric); |
|
|
|
* @return |
|
|
|
} |
|
|
|
*/ |
|
|
|
return Result.OK("添加成功！"); |
|
|
|
@AutoLog(value = "款式面料表-编辑") |
|
|
|
} |
|
|
|
@ApiOperation(value="款式面料表-编辑", notes="款式面料表-编辑") |
|
|
|
|
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:edit")
|
|
|
|
/** |
|
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) |
|
|
|
* 编辑 |
|
|
|
public Result<String> edit(@RequestBody ZyStyleFabric zyStyleFabric) { |
|
|
|
* |
|
|
|
zyStyleFabricService.updateById(zyStyleFabric); |
|
|
|
* @param zyStyleFabric |
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
* @return |
|
|
|
} |
|
|
|
*/ |
|
|
|
|
|
|
|
@AutoLog(value = "款式面料表-编辑") |
|
|
|
/** |
|
|
|
@ApiOperation(value = "款式面料表-编辑", notes = "款式面料表-编辑") |
|
|
|
* 通过id删除 |
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:edit")
|
|
|
|
* |
|
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) |
|
|
|
* @param id |
|
|
|
public Result<String> edit(@RequestBody ZyStyleFabric zyStyleFabric) { |
|
|
|
* @return |
|
|
|
zyStyleFabricService.updateById(zyStyleFabric); |
|
|
|
*/ |
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
@AutoLog(value = "款式面料表-通过id删除") |
|
|
|
} |
|
|
|
@ApiOperation(value="款式面料表-通过id删除", notes="款式面料表-通过id删除") |
|
|
|
|
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:delete")
|
|
|
|
/** |
|
|
|
@DeleteMapping(value = "/delete") |
|
|
|
* 通过id删除 |
|
|
|
public Result<String> delete(@RequestParam(name="id",required=true) String id) { |
|
|
|
* |
|
|
|
zyStyleFabricService.removeById(id); |
|
|
|
* @param id |
|
|
|
return Result.OK("删除成功!"); |
|
|
|
* @return |
|
|
|
} |
|
|
|
*/ |
|
|
|
|
|
|
|
@AutoLog(value = "款式面料表-通过id删除") |
|
|
|
/** |
|
|
|
@ApiOperation(value = "款式面料表-通过id删除", notes = "款式面料表-通过id删除") |
|
|
|
* 批量删除 |
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:delete")
|
|
|
|
* |
|
|
|
@DeleteMapping(value = "/delete") |
|
|
|
* @param ids |
|
|
|
public Result<String> delete(@RequestParam(name = "id", required = true) String id) { |
|
|
|
* @return |
|
|
|
zyStyleFabricService.removeById(id); |
|
|
|
*/ |
|
|
|
return Result.OK("删除成功!"); |
|
|
|
@AutoLog(value = "款式面料表-批量删除") |
|
|
|
} |
|
|
|
@ApiOperation(value="款式面料表-批量删除", notes="款式面料表-批量删除") |
|
|
|
|
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:deleteBatch")
|
|
|
|
/** |
|
|
|
@DeleteMapping(value = "/deleteBatch") |
|
|
|
* 批量删除 |
|
|
|
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
|
|
|
* |
|
|
|
this.zyStyleFabricService.removeByIds(Arrays.asList(ids.split(","))); |
|
|
|
* @param ids |
|
|
|
return Result.OK("批量删除成功!"); |
|
|
|
* @return |
|
|
|
} |
|
|
|
*/ |
|
|
|
|
|
|
|
@AutoLog(value = "款式面料表-批量删除") |
|
|
|
/** |
|
|
|
@ApiOperation(value = "款式面料表-批量删除", notes = "款式面料表-批量删除") |
|
|
|
* 通过id查询 |
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:deleteBatch")
|
|
|
|
* |
|
|
|
@DeleteMapping(value = "/deleteBatch") |
|
|
|
* @param id |
|
|
|
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
|
|
|
* @return |
|
|
|
this.zyStyleFabricService.removeByIds(Arrays.asList(ids.split(","))); |
|
|
|
*/ |
|
|
|
return Result.OK("批量删除成功!"); |
|
|
|
//@AutoLog(value = "款式面料表-通过id查询")
|
|
|
|
} |
|
|
|
@ApiOperation(value="款式面料表-通过id查询", notes="款式面料表-通过id查询") |
|
|
|
|
|
|
|
@GetMapping(value = "/queryById") |
|
|
|
/** |
|
|
|
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { |
|
|
|
* 通过id查询 |
|
|
|
ZyStyleFabric zyStyleFabric = zyStyleFabricService.getById(id); |
|
|
|
* |
|
|
|
if(zyStyleFabric==null) { |
|
|
|
* @param id |
|
|
|
return Result.error("未找到对应数据"); |
|
|
|
* @return |
|
|
|
} |
|
|
|
*/ |
|
|
|
return Result.OK(zyStyleFabric); |
|
|
|
//@AutoLog(value = "款式面料表-通过id查询")
|
|
|
|
} |
|
|
|
@ApiOperation(value = "款式面料表-通过id查询", notes = "款式面料表-通过id查询") |
|
|
|
|
|
|
|
@GetMapping(value = "/queryById") |
|
|
|
|
|
|
|
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { |
|
|
|
|
|
|
|
ZyStyleFabric zyStyleFabric = zyStyleFabricService.getById(id); |
|
|
|
|
|
|
|
if (zyStyleFabric == null) { |
|
|
|
|
|
|
|
return Result.error("未找到对应数据"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return Result.OK(zyStyleFabric); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 导出excel |
|
|
|
* 导出excel |
|
|
|
* |
|
|
|
* |
|
|
|
* @param request |
|
|
|
* @param request |
|
|
|
* @param zyStyleFabric |
|
|
|
* @param zyStyleFabric |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:exportXls")
|
|
|
|
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:exportXls")
|
|
|
|
@RequestMapping(value = "/exportXls") |
|
|
|
@RequestMapping(value = "/exportXls") |
|
|
|
public ModelAndView exportXls(HttpServletRequest request, ZyStyleFabric zyStyleFabric) { |
|
|
|
public ModelAndView exportXls(HttpServletRequest request, ZyStyleFabric zyStyleFabric) { |
|
|
|
@ -208,12 +219,12 @@ public class ZyStyleFabricController extends JeecgController<ZyStyleFabric, IZyS |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 通过excel导入数据 |
|
|
|
* 通过excel导入数据 |
|
|
|
* |
|
|
|
* |
|
|
|
* @param request |
|
|
|
* @param request |
|
|
|
* @param response |
|
|
|
* @param response |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
//@RequiresPermissions("zy_style_fabric:importExcel")
|
|
|
|
//@RequiresPermissions("zy_style_fabric:importExcel")
|
|
|
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
|
|
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
|
|
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
|
|
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
|
|
|
|
