From 6db5496fa4fcfccf57cde6dc7069bcdddba4153f Mon Sep 17 00:00:00 2001 From: chen <1216142052@qq.com> Date: Fri, 9 Sep 2022 18:03:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2022-09-09=201.1.3=20=E6=AC=BE=E5=BC=8F?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/zystylemodule/ZyStyleModuleList.vue | 206 ++++++++++++++ .../modules/ZyStyleModuleForm.vue | 123 ++++++++ .../ZyStyleModuleModal.Style#Drawer.vue | 84 ++++++ .../modules/ZyStyleModuleModal.vue | 60 ++++ .../controller/ZyStyleModuleController.java | 269 ++++++++++++++++++ .../zystylemodule/entity/NewStyleModule.java | 54 ++++ .../zystylemodule/entity/ZyStyleModule.java | 58 ++++ .../mapper/ZyStyleModuleMapper.java | 18 ++ .../mapper/xml/ZyStyleModuleMapper.xml | 5 + .../service/INewZyStyleModuleService.java | 8 + .../service/IZyStyleModuleService.java | 19 ++ .../impl/NewZyStyleModuleServiceImpl.java | 62 ++++ .../impl/ZyStyleModuleServiceImpl.java | 20 ++ 13 files changed, 986 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue create mode 100644 ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue create mode 100644 ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue create mode 100644 ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue new file mode 100644 index 00000000..4315394b --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vue @@ -0,0 +1,206 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue new file mode 100644 index 00000000..db0f7917 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleForm.vue @@ -0,0 +1,123 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue new file mode 100644 index 00000000..2b8c0405 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue new file mode 100644 index 00000000..2495da71 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylemodule/modules/ZyStyleModuleModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file 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 new file mode 100644 index 00000000..4e116232 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java @@ -0,0 +1,269 @@ +package org.jeecg.modules.zystylemodule.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +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.IZyClothsTypeService; +import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; +import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; +import org.jeecg.modules.zystylemodule.entity.NewStyleModule; +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; +import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService; +import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 款式模块表 + * @Author: jeecg-boot + * @Date: 2022-09-08 + * @Version: V1.0 + */ +@Api(tags="款式模块表") +@RestController +@RequestMapping("/zystylemodule/zyStyleModule") +@Slf4j +public class ZyStyleModuleController extends JeecgController { + @Autowired + private IZyStyleModuleService zyStyleModuleService; + @Autowired + private IZyClothsModularService zyClothsModularService; + @Autowired + private IZyClothsStyleService zyClothsStyleService; + @Autowired + private IZyClothsTypeService zyClothsTypeService; + + /** + * 分页列表查询 + * + * @param zyStyleModule2 + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "款式模块表-分页列表查询") + @ApiOperation(value="款式模块表-分页列表查询", notes="款式模块表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyStyleModule zyStyleModule2, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + List listNewStyleModules = new ArrayList<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(zyStyleModule2.getStyleId()!=null || zyStyleModule2.getModularId()!=null || zyStyleModule2.getTypeId()!=null){ + if(zyStyleModule2.getStyleId()!=null){ + queryWrapper.eq("style_id",zyStyleModule2.getStyleId()); + } + if(zyStyleModule2.getModularId()!=null){ + queryWrapper.eq("modular_id",zyStyleModule2.getModularId()); + } + if(zyStyleModule2.getTypeId()!=null){ + queryWrapper.eq("type_id",zyStyleModule2.getTypeId()); + } + } + List list = zyStyleModuleService.list(queryWrapper); + for (ZyStyleModule zyStyleModule : list){ + NewStyleModule newSeMo = new NewStyleModule(); + //编辑回显 + newSeMo.setId(zyStyleModule.getId()); + newSeMo.setTypeId(zyStyleModule.getTypeId()); + newSeMo.setStyleId(zyStyleModule.getStyleId()); + newSeMo.setModularId(zyStyleModule.getModularId()); + //款式编号和名称 + String styleId = zyStyleModule.getStyleId(); + ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); + newSeMo.setStyleNums(styleById.getNums()); + newSeMo.setStyleNames(styleById.getStyleNames()); + //模块编号和名称 + String modularId = zyStyleModule.getModularId(); + ZyClothsModular modularById = zyClothsModularService.getById(modularId); + newSeMo.setModularNums(modularById.getNums()); + newSeMo.setModularName(modularById.getModularName()); + //服装类型 + String typeId = zyStyleModule.getTypeId(); + ZyClothsType typeById = zyClothsTypeService.getById(typeId); + newSeMo.setTypeName(typeById.getTypeName()); + listNewStyleModules.add(newSeMo); + } + Page page = new Page(); + int size = listNewStyleModules.size(); + if (pageSize > size && size!=0) { + pageSize = size; + } + // 求出最大页数，防止currentPage越界 + int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; + if (pageNo > maxPage) { + pageNo = maxPage; + } + // 当前页第一条数据的下标 + int curIdx = pageNo > 1 ? (pageNo - 1) * pageSize : 0; + List pageList = new ArrayList(); + // 将当前页的数据放进pageList + for (int i = 0; i < pageSize && curIdx + i < size; i++) { + pageList.add(listNewStyleModules.get(curIdx + i)); + } + page.setCurrent(pageNo).setSize(pageSize).setTotal(listNewStyleModules.size()).setRecords(pageList); + return Result.OK(page); + } + /** + * 分页列表查询 + * + * @param zyStyleModule + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "款式模块表-分页列表查询") + @ApiOperation(value="款式模块表-分页列表查询", notes="款式模块表-分页列表查询") + @GetMapping(value = "/list1") + public Result> queryPageList1(ZyStyleModule zyStyleModule, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModule, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + + IPage pageList = zyStyleModuleService.page(page, queryWrapper); + System.out.println(zyStyleModule); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyStyleModule + * @return + */ + @AutoLog(value = "款式模块表-添加") + @ApiOperation(value="款式模块表-添加", notes="款式模块表-添加") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyStyleModule zyStyleModule) { + zyStyleModuleService.save(zyStyleModule); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyStyleModule + * @return + */ + @AutoLog(value = "款式模块表-编辑") + @ApiOperation(value="款式模块表-编辑", notes="款式模块表-编辑") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZyStyleModule zyStyleModule) { + zyStyleModuleService.updateById(zyStyleModule); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "款式模块表-通过id删除") + @ApiOperation(value="款式模块表-通过id删除", notes="款式模块表-通过id删除") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyStyleModuleService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "款式模块表-批量删除") + @ApiOperation(value="款式模块表-批量删除", notes="款式模块表-批量删除") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyStyleModuleService.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) { + ZyStyleModule zyStyleModule = zyStyleModuleService.getById(id); + if(zyStyleModule==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyStyleModule); + } + + /** + * 导出excel + * + * @param request + * @param zyStyleModule + */ + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyStyleModule zyStyleModule) { + return super.exportXls(request, zyStyleModule, ZyStyleModule.class, "款式模块表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("zy_style_module:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyStyleModule.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java new file mode 100644 index 00000000..00a5da4e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/NewStyleModule.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.zystylemodule.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +public class NewStyleModule { + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**类型id*/ + @Excel(name = "类型id", width = 15, dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name") + @Dict(dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name") + @ApiModelProperty(value = "类型id") + private String typeId; + /**款式id*/ + @Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names") + @Dict(dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names") + @ApiModelProperty(value = "款式id") + private String styleId; + /**模块id*/ + @Excel(name = "模块id", width = 15, dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name") + @Dict(dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name") + @ApiModelProperty(value = "模块id") + private String modularId; + + /**类型名称*/ + @Excel(name = "服装类型名称", width = 15) + @ApiModelProperty(value = "服装类型名称") + private java.lang.String typeName; + + /**编号*/ + @Excel(name = "款式编号", width = 15) + @ApiModelProperty(value = "款式编号") + private String styleNums; + /**名称*/ + @Excel(name = "款式名称", width = 15) + @ApiModelProperty(value = "款式名称") + private String styleNames; + + /**编号*/ + @Excel(name = "模块编号", width = 15) + @ApiModelProperty(value = "模块编号") + private java.lang.String modularNums; + /**模块名称*/ + @Excel(name = "模块名称", width = 15) + @ApiModelProperty(value = "模块名称") + private java.lang.String modularName; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java new file mode 100644 index 00000000..bfcddb78 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/entity/ZyStyleModule.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.zystylemodule.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 款式模块表 + * @Author: jeecg-boot + * @Date: 2022-09-08 + * @Version: V1.0 + */ +@Data +@TableName("zy_style_module") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_style_module对象", description="款式模块表") +public class ZyStyleModule implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**类型id*/ + @Excel(name = "类型id", width = 15, dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name") + @Dict(dictTable = "zy_cloths_type", dicText = "id", dicCode = "type_name") + @ApiModelProperty(value = "类型id") + private String typeId; + /**款式id*/ + @Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names") + @Dict(dictTable = "zy_cloths_style", dicText = "id", dicCode = "style_names") + @ApiModelProperty(value = "款式id") + private String styleId; + /**模块id*/ + @Excel(name = "模块id", width = 15, dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name") + @Dict(dictTable = "zy_cloths_modular ", dicText = "id", dicCode = "modular_name") + @ApiModelProperty(value = "模块id") + private String modularId; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java new file mode 100644 index 00000000..a08233c1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.zystylemodule.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; + +/** + * @Description: 款式模块表 + * @Author: jeecg-boot + * @Date: 2022-09-08 + * @Version: V1.0 + */ +public interface ZyStyleModuleMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml new file mode 100644 index 00000000..e69055c2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java new file mode 100644 index 00000000..5995e4ed --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/INewZyStyleModuleService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.zystylemodule.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zystylemodule.entity.NewStyleModule; +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; + +public interface INewZyStyleModuleService extends IService { +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java new file mode 100644 index 00000000..94425386 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.zystylemodule.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zystylemodule.entity.NewStyleModule; +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; + +import java.util.List; + +/** + * @Description: 款式模块表 + * @Author: jeecg-boot + * @Date: 2022-09-08 + * @Version: V1.0 + */ +public interface IZyStyleModuleService extends IService { + + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java new file mode 100644 index 00000000..35302685 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/NewZyStyleModuleServiceImpl.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.zystylemodule.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.zystylemodule.entity.NewStyleModule; +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; +import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper; +import org.jeecg.modules.zystylemodule.service.INewZyStyleModuleService; +import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Map; +import java.util.function.Function; +@Service +public class NewZyStyleModuleServiceImpl implements INewZyStyleModuleService { + @Override + public boolean saveBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean updateBatchById(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdate(NewStyleModule entity) { + return false; + } + + @Override + public NewStyleModule getOne(Wrapper queryWrapper, boolean throwEx) { + return null; + } + + @Override + public Map getMap(Wrapper queryWrapper) { + return null; + } + + @Override + public V getObj(Wrapper queryWrapper, Function mapper) { + return null; + } + + @Override + public BaseMapper getBaseMapper() { + return null; + } + + @Override + public Class getEntityClass() { + return null; + } +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java new file mode 100644 index 00000000..a0173d1e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.zystylemodule.service.impl; + + +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; +import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper; +import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 款式模块表 + * @Author: jeecg-boot + * @Date: 2022-09-08 + * @Version: V1.0 + */ +@Service +public class ZyStyleModuleServiceImpl extends ServiceImpl implements IZyStyleModuleService { + +} From 3027467b3b5a5f5be0f2daac2aa223f127e010d3 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Tue, 13 Sep 2022 17:29:06 +0800 Subject: [PATCH 2/3] 20220913-syy --- .../src/components/procedure/basicAction.vue | 102 +++++++++++------- .../procedure/processAccessories.vue | 58 +++++++--- .../components/procedure/processFabric.vue | 59 ++++++---- .../ZyProcessAccessoriesFormDetail.vue | 20 +++- .../modules/ZyProcessFabricFormDetail.vue | 22 +++- .../modules/ZyClothActionFormDetail.vue | 5 +- .../views/process/modules/ZyProcessDetail.vue | 37 ++++--- 7 files changed, 210 insertions(+), 93 deletions(-) diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue index 9eefdb9f..90a5db78 100644 --- a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue +++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue @@ -1,53 +1,60 @@ \ No newline at end of file From c52ff55ffd81ba50e4b0e33ccaa64c22f3a95e38 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Wed, 14 Sep 2022 10:53:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20220914-syy-=E8=BE=85=E6=96=99=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/procedure/processFabric.vue | 82 +++++++++------- .../erp/accessories/ZyAccessoriesList.vue | 11 ++- .../modules/ZyAccessoriesFormDetail.vue | 98 +++++++++++++++++++ 3 files changed, 155 insertions(+), 36 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue index 5f36a1cd..f245970e 100644 --- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue +++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue @@ -1,34 +1,45 @@ + \ No newline at end of file