diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue index 92f4745a..f7f7eda2 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue @@ -162,7 +162,11 @@ export default { return parseInt(index) + 1; } }, - + { + title: '服装类型名称', + align: "center", + dataIndex: 'typeName' + }, { title: '款式名称', align: "center", diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue index f83e69ca..5641d45d 100644 --- a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue @@ -17,8 +17,8 @@ - - + @@ -162,6 +162,11 @@ export default { return parseInt(index) + 1; } }, + { + title: '服装类型名称', + align: "center", + dataIndex: 'typeName' + }, { title: '款式名称', align: "center", diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue index 3a2e675d..ba4d4cb9 100644 --- a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue @@ -4,19 +4,38 @@
+ + + + + + + + + + + + + + + 查询 + 重置 + +
-
-
+ +
- 已选择 {{ selectedRowKeys.length }}项 + 已选择 {{ selectedRowKeys.length }}项 清空
@@ -39,7 +58,8 @@ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue b/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue index bf49cae3..af0b00a9 100644 --- a/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue +++ b/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue @@ -145,6 +145,11 @@ export default { return parseInt(index) + 1; } }, + { + title: '服装类型', + align: "center", + dataIndex: 'typeName' + }, { title: '款式编号', align: "center", diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue index b702ae1d..a06dedad 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyProcessList.vue @@ -3,7 +3,26 @@
- + + + + + + + + + + + + + + + + + 查询 + 重置 + +
diff --git a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue index a7ec8596..e15fcf85 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodular/modules/ZyStyleModularModal.vue @@ -27,7 +27,7 @@ processId:'' }, title:'', - width:800, + width:900, visible: false, disableSubmit: false, url: { diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue index d30e3c5d..cfab3d98 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue @@ -18,8 +18,8 @@ - - + diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue index 5ad4f6a7..a1b95596 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyClothsModularList.vue @@ -4,12 +4,12 @@
- + - + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java index 4a5537d0..5de0ca22 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -22,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -52,7 +54,11 @@ public class ZyStyleAccessoriesController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyStyleAccessories, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = zyStyleAccessoriesService.page(page, queryWrapper); + List listRecords = pageList.getRecords(); + for (ZyStyleAccessories zy : listRecords) { + String typeName = zyStyleFabricMapper.getTypeName(zy.getStyleId()); + zy.setTypeName(typeName); + } return Result.OK(pageList); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java index 227d0b5e..7024457f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -55,7 +56,7 @@ public class ZyStyleAccessories implements Serializable { @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; /**款式id*/ - @Excel(name = "款式id", width = 15) + @Excel(name = "服装款式id", width = 15) @ApiModelProperty(value = "款式id") @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") private java.lang.String styleId; @@ -64,4 +65,10 @@ public class ZyStyleAccessories implements Serializable { @ApiModelProperty(value = "面料id") @Dict(dictTable = "zy_accessories", dicText = "contents", dicCode = "id") private java.lang.String accessoriesId; + + /**服装类型名称*/ + @Excel(name = "服装类型名称", width = 15) + @ApiModelProperty(value = "服装类型名称") + @TableField(exist = false) + private java.lang.String typeName; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java index 687fb44e..9a409660 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java @@ -60,16 +60,16 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl numsList = zyClothsStyleMapper.selectNumsList(); - System.out.println(numsList); - System.out.println(numsList.size()); +// System.out.println(numsList); +// System.out.println(numsList.size()); List list = new ArrayList<>(); for (String nums : numsList) { @@ -86,8 +86,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl { - @Autowired - private IZyStyleFabricService zyStyleFabricService; - @Autowired - private INewZyStyleFabricService NewZyStyleFabricService; - @Autowired - private IZyClothsStyleService zyClothsStyleService; - @Autowired - private IZyFabricService zyFabricService; - - /** - * 分页列表查询 - * - * @param zyStyleFabric - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "款式面料表-分页列表查询") - @ApiOperation(value="款式面料表-分页列表查询", notes="款式面料表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ZyStyleFabric zyStyleFabric,String id, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - if(id!=null){ - queryWrapper.eq("style_id",id); - } - if(zyStyleFabric.getStyleId()!=null || zyStyleFabric.getFabricId()!=null ){ - if(zyStyleFabric.getStyleId()!=null){ - queryWrapper.eq("style_id",zyStyleFabric.getStyleId()); - } - if(zyStyleFabric.getFabricId()!=null){ - queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId()); - } - - } - List list = zyStyleFabricService.list(queryWrapper); - List newZyStyleFabrics = new ArrayList<>(); - for (ZyStyleFabric zyStyleF : list){ - System.out.println("****"+zyStyleF); - NewZyStyleFabric newZySF = new NewZyStyleFabric(); - //编辑回显 - newZySF.setId(zyStyleF.getId()); - newZySF.setFabricId(zyStyleF.getFabricId()); - newZySF.setStyleId(zyStyleF.getStyleId()); - //款式编号和名称 - String styleId = zyStyleF.getStyleId(); - ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); - newZySF.setStyleNums(styleById.getNums()); - newZySF.setStyleNames(styleById.getStyleNames()); - //模块编号和名称 - String fabricId = zyStyleF.getFabricId(); - - ZyFabric fabricById = zyFabricService.getById(fabricId); - - newZySF.setFabricNumber(fabricById.getFabricNumber()); - newZySF.setFabricName(fabricById.getName()); - newZySF.setCreateTime(zyStyleF.getCreateTime()); - newZyStyleFabrics.add(newZySF); - } - IPage pageList = new Page<>(pageNo, pageSize, list.size()); - pageList.setRecords(newZyStyleFabrics); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param zyStyleFabric - * @return - */ - @AutoLog(value = "款式面料表-添加") - @ApiOperation(value="款式面料表-添加", notes="款式面料表-添加") - //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add") - @PostMapping(value = "/add") - public Result add(@RequestBody ZyStyleFabric zyStyleFabric) { - String[] split = zyStyleFabric.getFabricId().split(","); - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.eq("style_id",zyStyleFabric.getStyleId()); - for (String s : split) { - zyStyleFabric.setFabricId(s); - zyStyleFabric.setId(null); - queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId()); - int a=zyStyleFabricService.count(queryWrapper); - if(a>=1) - return Result.error("存在以添加过的数据！！！"); - zyStyleFabricService.save(zyStyleFabric); - } - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param zyStyleFabric - * @return - */ - @AutoLog(value = "款式面料表-编辑") - @ApiOperation(value="款式面料表-编辑", notes="款式面料表-编辑") - //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ZyStyleFabric zyStyleFabric) { - zyStyleFabricService.updateById(zyStyleFabric); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "款式面料表-通过id删除") - @ApiOperation(value="款式面料表-通过id删除", notes="款式面料表-通过id删除") - //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - zyStyleFabricService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "款式面料表-批量删除") - @ApiOperation(value="款式面料表-批量删除", notes="款式面料表-批量删除") - //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.zyStyleFabricService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@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); - } + @Autowired + private IZyStyleFabricService zyStyleFabricService; + @Autowired + private INewZyStyleFabricService NewZyStyleFabricService; + @Autowired + private IZyClothsStyleService zyClothsStyleService; + @Autowired + private IZyFabricService zyFabricService; + + @Resource + private ZyStyleFabricMapper zyStyleFabricMapper; + + /** + * 分页列表查询 + * + * @param zyStyleFabric + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "款式面料表-分页列表查询") + @ApiOperation(value = "款式面料表-分页列表查询", notes = "款式面料表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ZyStyleFabric zyStyleFabric, String id, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (id != null) { + queryWrapper.eq("style_id", id); + } + if (zyStyleFabric.getStyleId() != null || zyStyleFabric.getFabricId() != null) { + if (zyStyleFabric.getStyleId() != null) { + queryWrapper.eq("style_id", zyStyleFabric.getStyleId()); + } + if (zyStyleFabric.getFabricId() != null) { + queryWrapper.eq("fabric_id", zyStyleFabric.getFabricId()); + } + + } + List list = zyStyleFabricService.list(queryWrapper); + List newZyStyleFabrics = new ArrayList<>(); + for (ZyStyleFabric zyStyleF : list) { + System.out.println("****" + zyStyleF); + NewZyStyleFabric newZySF = new NewZyStyleFabric(); + //编辑回显 + newZySF.setId(zyStyleF.getId()); + newZySF.setFabricId(zyStyleF.getFabricId()); + newZySF.setStyleId(zyStyleF.getStyleId()); + + //拿到服装类型名称 + String typeName = zyStyleFabricMapper.getTypeName(newZySF.getStyleId()); + newZySF.setTypeName(typeName); + + //款式编号和名称 + String styleId = zyStyleF.getStyleId(); + ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); + newZySF.setStyleNums(styleById.getNums()); + newZySF.setStyleNames(styleById.getStyleNames()); + //模块编号和名称 + String fabricId = zyStyleF.getFabricId(); + + ZyFabric fabricById = zyFabricService.getById(fabricId); + + newZySF.setFabricNumber(fabricById.getFabricNumber()); + newZySF.setFabricName(fabricById.getName()); + newZySF.setCreateTime(zyStyleF.getCreateTime()); + newZyStyleFabrics.add(newZySF); + } + IPage pageList = new Page<>(pageNo, pageSize, list.size()); + pageList.setRecords(newZyStyleFabrics); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyStyleFabric + * @return + */ + @AutoLog(value = "款式面料表-添加") + @ApiOperation(value = "款式面料表-添加", notes = "款式面料表-添加") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyStyleFabric zyStyleFabric) { + String[] split = zyStyleFabric.getFabricId().split(","); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("style_id", zyStyleFabric.getStyleId()); + for (String s : split) { + zyStyleFabric.setFabricId(s); + zyStyleFabric.setId(null); + queryWrapper.eq("fabric_id", zyStyleFabric.getFabricId()); + int a = zyStyleFabricService.count(queryWrapper); + if (a >= 1) + return Result.error("存在以添加过的数据！！！"); + zyStyleFabricService.save(zyStyleFabric); + } + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyStyleFabric + * @return + */ + @AutoLog(value = "款式面料表-编辑") + @ApiOperation(value = "款式面料表-编辑", notes = "款式面料表-编辑") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ZyStyleFabric zyStyleFabric) { + zyStyleFabricService.updateById(zyStyleFabric); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "款式面料表-通过id删除") + @ApiOperation(value = "款式面料表-通过id删除", notes = "款式面料表-通过id删除") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + zyStyleFabricService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "款式面料表-批量删除") + @ApiOperation(value = "款式面料表-批量删除", notes = "款式面料表-批量删除") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.zyStyleFabricService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@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 - * - * @param request - * @param zyStyleFabric - */ + * 导出excel + * + * @param request + * @param zyStyleFabric + */ //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ZyStyleFabric zyStyleFabric) { @@ -208,12 +219,12 @@ public class ZyStyleFabricController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java index 760c051f..8dcb8798 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java @@ -1,6 +1,7 @@ package org.jeecg.modules.zystylefabric.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -15,6 +16,11 @@ public class NewZyStyleFabric { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; + + /**服装类型 名称*/ + @ApiModelProperty(value = "服装类型 名称") + private java.lang.String typeName; + /**款式id*/ @Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") @ApiModelProperty(value = "款式id") @@ -24,8 +30,8 @@ public class NewZyStyleFabric { @ApiModelProperty(value = "面料id") private java.lang.String fabricId; /**名称*/ - @Excel(name = "名称", width = 15) - @ApiModelProperty(value = "名称") + @Excel(name = "面料 名称", width = 15) + @ApiModelProperty(value = "面料 名称") private java.lang.String fabricName; /**材料编号*/ @Excel(name = "材料编号", width = 15) @@ -36,8 +42,8 @@ public class NewZyStyleFabric { @ApiModelProperty(value = "编号") private String styleNums; /**名称*/ - @Excel(name = "名称", width = 15) - @ApiModelProperty(value = "名称") + @Excel(name = "服装款式 名称", width = 15) + @ApiModelProperty(value = "服装款式 名称") private String styleNames; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java index 9811c939..cc287219 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; /** @@ -14,4 +15,10 @@ import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; */ public interface ZyStyleFabricMapper extends BaseMapper { + + /** + * @param styleId zyClothsStyle 中的id 款式id + */ + @Select("select type_name from zy_cloths_style where id = #{styleId}") + String getTypeName(String styleId); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java index bf0b764a..38af7301 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; -import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java index b671298b..47430f8e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java @@ -22,6 +22,7 @@ import org.jeecg.modules.demo.base.service.IZyClothsTypeService; import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper; import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; +import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; import org.jeecg.modules.zystylemodule.entity.NewStyleModule; import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; @@ -50,8 +51,9 @@ public class ZyStyleModuleController extends JeecgController