diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index 654afc7a..11ee55ba 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,8 +12,8 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; // YU-优化 -//require('@jeecg/antd-online-mini') -//require('@jeecg/antd-online-mini/dist/OnlineForm.css') +require('@jeecg/antd-online-mini') +require('@jeecg/antd-online-mini/dist/OnlineForm.css') import Antd, { version } from 'ant-design-vue' console.log('ant-design-vue version:', version) diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue new file mode 100644 index 00000000..2b0fc7e1 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsMcList.vue @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue new file mode 100644 index 00000000..2ecb136e --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsMccList.vue @@ -0,0 +1,225 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue index c1ab138f..873fd47d 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue @@ -13,23 +13,31 @@
新增 导出 - + 导入 - + - 删除 + + + 删除 + - 批量操作 + 批量操作 + +
- 已选择 {{ selectedRowKeys.length }}项 + 已选择 {{ selectedRowKeys.length }}项 清空
@@ -52,7 +60,8 @@ + + 管理 + 编辑 - + 详情 - + 删除 - +
+ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue index 8d38564a..89a5c01d 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue @@ -76,6 +76,10 @@ + + 管理 + + 编辑 @@ -105,6 +109,7 @@ + @@ -115,16 +120,19 @@ import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' import ZyClothsModularModal from './modules/ZyClothsModularModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' +import ZyClothsMcList from "@views/process/ZyClothsMcList"; export default { name: 'ZyClothsModularList', mixins: [JeecgListMixin, mixinDevice], components: { + ZyClothsMcList, ZyClothsModularModal }, data() { return { description: '制衣模块 zy_cloths_modular管理页面', + // 表头 columns: [ { @@ -147,11 +155,11 @@ export default { align: "center", dataIndex: 'modularName' }, - { - title: '制衣模块类型', - align: "center", - dataIndex: 'modularType_dictText' - }, + // { + // title: '模块部件名称', + // align: "center", + // dataIndex: 'modularType_dictText' + // }, { title: '描述', align: "center", @@ -178,6 +186,13 @@ export default { align: "center", dataIndex: 'createTime' }, + { + title: '模块部件', + dataIndex: 'action2', + align:"center", + // fixed:"right", + scopedSlots: { customRender: 'action2' } + }, { title: '操作', dataIndex: 'action', @@ -208,6 +223,12 @@ export default { }, }, methods: { + viewVid(record){ + this.$refs.ZyClothsMcList.showModal(); + this.$refs.ZyClothsMcList.edit(record); + console.log("zyclothsMclist"+record.ids); + this.$refs.ZyClothsMcList.disableSubmit = false; + }, initDictConfig() { }, getSuperFieldList() { diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue new file mode 100644 index 00000000..4afd02e1 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcForm.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue new file mode 100644 index 00000000..aabf8ad0 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue new file mode 100644 index 00000000..eb03a429 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMcModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue new file mode 100644 index 00000000..a0c9e449 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccForm.vue @@ -0,0 +1,122 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue new file mode 100644 index 00000000..096fc83b --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue new file mode 100644 index 00000000..526aef63 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsMccModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue index 26b4ee13..63952834 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue @@ -13,22 +13,22 @@ - - - - - + + + + + - + diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue index fe736fe0..67c3b4ba 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java new file mode 100644 index 00000000..9740ee69 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMcController.java @@ -0,0 +1,155 @@ +package org.jeecg.modules.demo.base.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; +import org.jeecg.modules.demo.base.service.IZyClothsMcService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +@Api(tags="制衣模块和模块部件中间表") +@RestController +@RequestMapping("/zyClothsMc/zyClothsMc") +@Slf4j +public class ZyClothsMcController extends JeecgController { + @Autowired + private IZyClothsMcService zyClothsMcService; + + /** + * 分页列表查询 + * + * @param zyClothsMc + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-分页列表查询") + @ApiOperation(value="制衣模块和模块部件中间表-分页列表查询", notes="制衣模块和模块部件中间表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyClothsMc zyClothsMc, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsMc, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyClothsMcService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyClothsMc + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-添加") + @ApiOperation(value="制衣模块和模块部件中间表-添加", notes="制衣模块和模块部件中间表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyClothsMc zyClothsMc) { + zyClothsMcService.save(zyClothsMc); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyClothsMc + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-编辑") + @ApiOperation(value="制衣模块和模块部件中间表-编辑", notes="制衣模块和模块部件中间表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyClothsMc zyClothsMc) { + zyClothsMcService.updateById(zyClothsMc); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-通过id删除") + @ApiOperation(value="制衣模块和模块部件中间表-通过id删除", notes="制衣模块和模块部件中间表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyClothsMcService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "制衣模块和模块部件中间表-批量删除") + @ApiOperation(value="制衣模块和模块部件中间表-批量删除", notes="制衣模块和模块部件中间表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyClothsMcService.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) { + ZyClothsMc zyClothsMc = zyClothsMcService.getById(id); + if(zyClothsMc==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyClothsMc); + } + + /** + * 导出excel + * + * @param request + * @param zyClothsMc + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyClothsMc zyClothsMc) { + return super.exportXls(request, zyClothsMc, ZyClothsMc.class, "制衣模块和模块部件中间表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyClothsMc.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java new file mode 100644 index 00000000..537206f1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsMccController.java @@ -0,0 +1,155 @@ +package org.jeecg.modules.demo.base.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; +import org.jeecg.modules.demo.base.service.IZyClothsMccService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +@Api(tags="制衣模块部件和模块的中间表") +@RestController +@RequestMapping("/zyClothsMcc/zyClothsMcc") +@Slf4j +public class ZyClothsMccController extends JeecgController { + @Autowired + private IZyClothsMccService zyClothsMccService; + + /** + * 分页列表查询 + * + * @param zyClothsMcc + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-分页列表查询") + @ApiOperation(value="制衣模块部件和模块的中间表-分页列表查询", notes="制衣模块部件和模块的中间表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyClothsMcc zyClothsMcc, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsMcc, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyClothsMccService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyClothsMcc + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-添加") + @ApiOperation(value="制衣模块部件和模块的中间表-添加", notes="制衣模块部件和模块的中间表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyClothsMcc zyClothsMcc) { + zyClothsMccService.save(zyClothsMcc); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyClothsMcc + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-编辑") + @ApiOperation(value="制衣模块部件和模块的中间表-编辑", notes="制衣模块部件和模块的中间表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyClothsMcc zyClothsMcc) { + zyClothsMccService.updateById(zyClothsMcc); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-通过id删除") + @ApiOperation(value="制衣模块部件和模块的中间表-通过id删除", notes="制衣模块部件和模块的中间表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyClothsMccService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "制衣模块部件和模块的中间表-批量删除") + @ApiOperation(value="制衣模块部件和模块的中间表-批量删除", notes="制衣模块部件和模块的中间表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyClothsMccService.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) { + ZyClothsMcc zyClothsMcc = zyClothsMccService.getById(id); + if(zyClothsMcc==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyClothsMcc); + } + + /** + * 导出excel + * + * @param request + * @param zyClothsMcc + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyClothsMcc zyClothsMcc) { + return super.exportXls(request, zyClothsMcc, ZyClothsMcc.class, "制衣模块部件和模块的中间表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyClothsMcc.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java new file mode 100644 index 00000000..9bbf6cf5 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMc.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.base.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-11-14 + * @Version: V1.0 + */ +@Data +@TableName("zy_cloths_mc") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_cloths_mc对象", description="制衣模块和模块部件中间表") +public class ZyClothsMc implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**模块id*/ + @Excel(name = "模块id", width = 15) + @ApiModelProperty(value = "模块id") + @Dict(dictTable = "zy_cloths_modular",dicText = "modular_name" ,dicCode = "id") + private String modularId; + /**模块部件id*/ + @Excel(name = "模块部件id", width = 15) + @ApiModelProperty(value = "模块部件id") + @Dict(dicCode = "zyModularType") + private String mccid; +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java new file mode 100644 index 00000000..4435c2bd --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsMcc.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.base.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-11-14 + * @Version: V1.0 + */ +@Data +@TableName("zy_cloths_mcc") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_cloths_mcc对象", description="制衣模块部件和模块的中间表") +public class ZyClothsMcc implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /**模块部件id*/ + @Excel(name = "模块部件id", width = 15) + @ApiModelProperty(value = "模块部件id") + @Dict(dicCode = "zyModularType") + private String mcid; + /**部件id*/ + @Excel(name = "部件id", width = 15) + @ApiModelProperty(value = "部件id") + @Dict(dictTable = "zy_cloths_component",dicText = "parts_name",dicCode = "id") + private String componendId; +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java new file mode 100644 index 00000000..05e9236e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMcMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; + +/** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface ZyClothsMcMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java new file mode 100644 index 00000000..54332f29 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsMccMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; + +/** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface ZyClothsMccMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml new file mode 100644 index 00000000..a05402b1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMcMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml new file mode 100644 index 00000000..3afbe857 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsMccMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java new file mode 100644 index 00000000..e9a6291d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMcService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.base.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; + +/** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface IZyClothsMcService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java new file mode 100644 index 00000000..c1ea3ab0 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyClothsMccService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.demo.base.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; + +; + +/** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +public interface IZyClothsMccService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java new file mode 100644 index 00000000..b53b88aa --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMcServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.demo.base.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.demo.base.entity.ZyClothsMc; +import org.jeecg.modules.demo.base.mapper.ZyClothsMcMapper; +import org.jeecg.modules.demo.base.service.IZyClothsMcService; +import org.springframework.stereotype.Service; + +/** + * @Description: 制衣模块和模块部件中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +@Service +public class ZyClothsMcServiceImpl extends ServiceImpl implements IZyClothsMcService { + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java new file mode 100644 index 00000000..278611ce --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsMccServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.base.service.impl; + +import org.jeecg.modules.demo.base.entity.ZyClothsMcc; +import org.jeecg.modules.demo.base.mapper.ZyClothsMccMapper; +import org.jeecg.modules.demo.base.service.IZyClothsMccService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 制衣模块部件和模块的中间表 + * @Author: jeecg-boot + * @Date: 2022-11-14 + * @Version: V1.0 + */ +@Service +public class ZyClothsMccServiceImpl extends ServiceImpl implements IZyClothsMccService { + +}