@@ -52,7 +60,8 @@
无图片
- ![]()
+ ![]()
无文件
@@ -70,20 +79,26 @@
编辑
-
- 更多
-
- 详情
-
-
-
- 删除
-
-
-
-
+
+ 删除
+
+
+
@@ -95,109 +110,119 @@
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
index 333412ab..550e970f 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
@@ -267,6 +267,12 @@ export default {
align: "center",
dataIndex: 'totalMachine'
},
+ // {
+ // title: '企业名称',
+ // align: "center",
+ // dataIndex: 'enterpriseId_dictText'
+ // },
+
{
title: '创建时间',
align: "center",
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
index 937698f0..d6741e3b 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue
@@ -13,6 +13,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
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 5e2eddf0..26b4ee13 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
@@ -8,16 +8,22 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
index adfc8cf6..999bb146 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
@@ -112,10 +112,15 @@
+
+
+
+
+
-
-
+
@@ -128,11 +133,11 @@
-
-
-
-
+
+
+
+
+
删除
@@ -180,12 +180,21 @@
align:"center",
dataIndex: 'shape_dictText'
},
-
{
title:'企业',
align:"center",
dataIndex: 'enterpriseId_dictText'
},
+ // {
+ // title:'折叠搭配及包装',
+ // align:"center",
+ // dataIndex: 'foldingPackaging_dictText'
+ // },
+ // {
+ // title:'缝纫形式',
+ // align:"center",
+ // dataIndex: 'sewingForm_dictText'
+ // },
{
title:'创建时间',
align:"center",
diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
index 541478d9..1bdbf18f 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
@@ -94,7 +94,7 @@
-
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
index fc5b1800..b6a5890e 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsComponentController.java
@@ -1,195 +1,179 @@
package org.jeecg.modules.demo.base.controller;
-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 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.common.util.oConvertUtils;
import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
-import org.jeecg.modules.demo.base.entity.ZyClothsModular;
-import org.jeecg.modules.demo.base.entity.ZyClothsType;
import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
-
-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.service.IZyClothsModularService;
-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;
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
* @Description: zy_cloths_component
* @Author: jeecg-boot
- * @Date: 2021-11-10
+ * @Date: 2021-11-10
* @Version: V1.0
*/
-@Api(tags="zy_cloths_component")
+@Api(tags = "zy_cloths_component")
@RestController
@RequestMapping("/base/zyClothsComponent")
@Slf4j
public class ZyClothsComponentController extends JeecgController {
- @Autowired
- private IZyClothsComponentService zyClothsComponentService;
- @Autowired
- private IZyClothsModularService zyClothsModularService;
+ @Autowired
+ private IZyClothsComponentService zyClothsComponentService;
+ @Autowired
+ private IZyClothsModularService zyClothsModularService;
- /**
- * 分页列表查询
- *
- * @param zyClothsComponent
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "zy_cloths_component-分页列表查询")
- @ApiOperation(value="zy_cloths_component-分页列表查询", notes="zy_cloths_component-分页列表查询")
- @GetMapping(value = "/list")
- public Result queryPageList(ZyClothsComponent zyClothsComponent,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsComponent, req.getParameterMap());
- Page page = new Page(pageNo, pageSize);
- IPage pageList = zyClothsComponentService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ /**
+ * 分页列表查询
+ *
+ * @param zyClothsComponent
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "zy_cloths_component-分页列表查询")
+ @ApiOperation(value = "zy_cloths_component-分页列表查询", notes = "zy_cloths_component-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result queryPageList(ZyClothsComponent zyClothsComponent,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsComponent, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = zyClothsComponentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- @AutoLog(value = "zy_cloths_component-查询所有")
- @ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有")
- @GetMapping(value = "/findAll")
- public Result findAll() {
- List list = zyClothsComponentService.list();
+// @AutoLog(value = "zy_cloths_component-查询所有")
+// @ApiOperation(value="zy_cloths_component-查询所有", notes="zy_cloths_component-查询所有")
+// @GetMapping(value = "/findAll")
+// public Result findAll() {
+// List list = zyClothsComponentService.list();
+//
+// for(ZyClothsComponent zycl : list){
+// String id = zycl.getModularId();
+// String enterpriseId = zycl.getEnterpriseId();
+// if(id!=null && enterpriseId !=null){
+// ZyClothsModular byId = zyClothsModularService.getById(id);
+// zycl.setModularId(byId.getModularName());
+// }
+// }
+// return Result.OK(list);
+// }
- for(ZyClothsComponent zycl : list){
- String id = zycl.getModularId();
- String enterpriseId = zycl.getEnterpriseId();
- if(id!=null && enterpriseId !=null){
- ZyClothsModular byId = zyClothsModularService.getById(id);
- zycl.setModularId(byId.getModularName());
- }
- }
- return Result.OK(list);
- }
- /**
- * 添加
- *
- * @param zyClothsComponent
- * @return
- */
- @AutoLog(value = "zy_cloths_component-添加")
- @ApiOperation(value="zy_cloths_component-添加", notes="zy_cloths_component-添加")
- @PostMapping(value = "/add")
- public Result add(@RequestBody ZyClothsComponent zyClothsComponent) {
- zyClothsComponentService.save(zyClothsComponent);
- return Result.OK("添加成功！");
- }
+ /**
+ * 添加
+ *
+ * @param zyClothsComponent
+ * @return
+ */
+ @AutoLog(value = "zy_cloths_component-添加")
+ @ApiOperation(value = "zy_cloths_component-添加", notes = "zy_cloths_component-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody ZyClothsComponent zyClothsComponent) {
+ zyClothsComponentService.save(zyClothsComponent);
+ return Result.OK("添加成功！");
+ }
- /**
- * 编辑
- *
- * @param zyClothsComponent
- * @return
- */
- @AutoLog(value = "zy_cloths_component-编辑")
- @ApiOperation(value="zy_cloths_component-编辑", notes="zy_cloths_component-编辑")
- @PutMapping(value = "/edit")
- public Result edit(@RequestBody ZyClothsComponent zyClothsComponent) {
- zyClothsComponentService.updateById(zyClothsComponent);
- return Result.OK("编辑成功!");
- }
+ /**
+ * 编辑
+ *
+ * @param zyClothsComponent
+ * @return
+ */
+ @AutoLog(value = "zy_cloths_component-编辑")
+ @ApiOperation(value = "zy_cloths_component-编辑", notes = "zy_cloths_component-编辑")
+ @PutMapping(value = "/edit")
+ public Result edit(@RequestBody ZyClothsComponent zyClothsComponent) {
+ zyClothsComponentService.updateById(zyClothsComponent);
+ return Result.OK("编辑成功!");
+ }
- /**
- * 通过id删除
- *
- * @param id
- * @return
- */
- @AutoLog(value = "zy_cloths_component-通过id删除")
- @ApiOperation(value="zy_cloths_component-通过id删除", notes="zy_cloths_component-通过id删除")
- @DeleteMapping(value = "/delete")
- public Result delete(@RequestParam(name="id",required=true) String id) {
- zyClothsComponentService.removeById(id);
- return Result.OK("删除成功!");
- }
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "zy_cloths_component-通过id删除")
+ @ApiOperation(value = "zy_cloths_component-通过id删除", notes = "zy_cloths_component-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name = "id", required = true) String id) {
+ zyClothsComponentService.removeById(id);
+ return Result.OK("删除成功!");
+ }
- /**
- * 批量删除
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "zy_cloths_component-批量删除")
- @ApiOperation(value="zy_cloths_component-批量删除", notes="zy_cloths_component-批量删除")
- @DeleteMapping(value = "/deleteBatch")
- public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.zyClothsComponentService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("批量删除成功!");
- }
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "zy_cloths_component-批量删除")
+ @ApiOperation(value = "zy_cloths_component-批量删除", notes = "zy_cloths_component-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.zyClothsComponentService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
- /**
- * 通过id查询
- *
- * @param id
- * @return
- */
- @AutoLog(value = "zy_cloths_component-通过id查询")
- @ApiOperation(value="zy_cloths_component-通过id查询", notes="zy_cloths_component-通过id查询")
- @GetMapping(value = "/queryById")
- public Result queryById(@RequestParam(name="id",required=true) String id) {
- QueryWrapper zyClothsComponentQueryWrapper=new QueryWrapper<>();
- zyClothsComponentQueryWrapper.eq("nums",id);
- ZyClothsComponent zyClothsComponent = zyClothsComponentService.getOne(zyClothsComponentQueryWrapper);
- List zyProcessVoList = zyClothsComponentService.selectList(id);
- if (zyProcessVoList!=null)
- zyClothsComponent.setZyProcessVoList(zyProcessVoList);
- if(zyClothsComponent==null) {
- return Result.error("未找到对应数据");
- }
- return Result.OK(zyClothsComponent);
- }
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "zy_cloths_component-通过id查询")
+ @ApiOperation(value = "zy_cloths_component-通过id查询", notes = "zy_cloths_component-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name = "id", required = true) String id) {
+ QueryWrapper zyClothsComponentQueryWrapper = new QueryWrapper<>();
+ zyClothsComponentQueryWrapper.eq("nums", id);
+ ZyClothsComponent zyClothsComponent = zyClothsComponentService.getOne(zyClothsComponentQueryWrapper);
+ List zyProcessVoList = zyClothsComponentService.selectList(id);
+ if (zyProcessVoList != null)
+ zyClothsComponent.setZyProcessVoList(zyProcessVoList);
+ if (zyClothsComponent == null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(zyClothsComponent);
+ }
/**
- * 导出excel
- *
- * @param request
- * @param zyClothsComponent
- */
+ * 导出excel
+ *
+ * @param request
+ * @param zyClothsComponent
+ */
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ZyClothsComponent zyClothsComponent) {
return super.exportXls(request, zyClothsComponent, ZyClothsComponent.class, "zy_cloths_component");
}
/**
- * 通过excel导入数据
- *
- * @param request
- * @param response
- * @return
- */
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ZyClothsComponent.class);
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
index 7bcec4ab..7448ca16 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsComponent.java
@@ -1,25 +1,22 @@
package org.jeecg.modules.demo.base.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.util.List;
-
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;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
-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.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.demo.base.entity.vo.ZyProcessVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
/**
* @Description: zy_cloths_component
@@ -60,20 +57,34 @@ public class ZyClothsComponent implements Serializable {
@Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id")
@ApiModelProperty(value = "模块")
private java.lang.String modularId;
+
+ /**制衣模块类型*/
+ @Excel(name = "制衣模块类型", width = 15)
+ @ApiModelProperty(value = "制衣模块类型")
+ @Dict(dicCode = "zyModularType")
+ private java.lang.String modularType;
+
+ /**部件类型*/
+ @Excel(name = "部件类型", width = 15)
+ @ApiModelProperty(value = "部件类型")
+ private java.lang.String componentType;
+
/**企业*/
@Excel(name = "企业", width = 15)
@ApiModelProperty(value = "企业")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String enterpriseId;
/**createTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
+
@TableField(exist = false)
private List zyProcessVoList;
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
index 3fbab382..09666f52 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModular.java
@@ -1,21 +1,19 @@
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.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
/**
* @Description: zy_cloths_modular
@@ -43,6 +41,13 @@ public class ZyClothsModular implements Serializable {
@Excel(name = "模块名称", width = 15)
@ApiModelProperty(value = "模块名称")
private java.lang.String modularName;
+
+ /**制衣模块类型*/
+ @Excel(name = "制衣模块类型", width = 15)
+ @ApiModelProperty(value = "制衣模块类型")
+ @Dict(dicCode = "zyModularType")
+ private java.lang.String modularType;
+
/**描述*/
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
@@ -55,19 +60,20 @@ public class ZyClothsModular implements Serializable {
/**企业*/
@Excel(name = "企业", width = 15)
@ApiModelProperty(value = "企业")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String enterpriseId;
/**图片地址*/
@Excel(name = "图片地址", width = 15)
@ApiModelProperty(value = "图片地址")
private java.lang.String pictureUrl;
/**createTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
}
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
index 5fd47f56..dee6db7e 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
@@ -1,21 +1,20 @@
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.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* @Description: 制衣模块部件中间表
@@ -65,6 +64,7 @@ public class ZyClothsModularCompent implements Serializable {
/**制衣模块类型*/
@Excel(name = "制衣模块类型", width = 15)
@ApiModelProperty(value = "制衣模块类型")
+ @Dict(dicCode = "zyModularType")
private String modularType;
/**部件id*/
@Excel(name = "部件id", width = 15)
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
index 61ddf1a5..f9e5caab 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
@@ -1,74 +1,89 @@
package org.jeecg.modules.demo.base.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.util.List;
-
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;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.modules.demo.base.entity.vo.ZyClothActionVo;
-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.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.demo.base.entity.vo.ZyClothActionVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
/**
* @Description: zy_process
* @Author: jeecg-boot
- * @Date: 2021-11-03
+ * @Date: 2021-11-03
* @Version: V1.0
*/
@Data
@TableName("zy_process")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="zy_process对象", description="zy_process")
+@ApiModel(value = "zy_process对象", description = "zy_process")
public class ZyProcess implements Serializable {
private static final long serialVersionUID = 1L;
- /**工序表id*/
- @TableId(type = IdType.ASSIGN_ID)
+ /**
+ * 工序表id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "工序表id")
private java.lang.String id;
- /**工序代码*/
- @Excel(name = "工序代码", width = 15)
+ /**
+ * 工序代码
+ */
+ @Excel(name = "工序代码", width = 15)
@ApiModelProperty(value = "工序代码")
private java.lang.String processCode;
- /**工序名称*/
- @Excel(name = "工序名称", width = 15)
+ /**
+ * 工序名称
+ */
+ @Excel(name = "工序名称", width = 15)
@ApiModelProperty(value = "工序名称")
private java.lang.String processName;
- /**工艺描述*/
- @Excel(name = "工艺描述", width = 15)
+ /**
+ * 工艺描述
+ */
+ @Excel(name = "工艺描述", width = 15)
@ApiModelProperty(value = "工艺描述")
private java.lang.String processDescribe;
- /**做工说明*/
- @Excel(name = "做工说明", width = 15)
+ /**
+ * 做工说明
+ */
+ @Excel(name = "做工说明", width = 15)
@ApiModelProperty(value = "做工说明")
private java.lang.String mkExplain;
- /**品质要求*/
- @Excel(name = "品质要求", width = 15)
+ /**
+ * 品质要求
+ */
+ @Excel(name = "品质要求", width = 15)
@ApiModelProperty(value = "品质要求")
private java.lang.String qualityRequire;
- /**工序时间*/
- @Excel(name = "工序时间", width = 15)
+ /**
+ * 工序时间
+ */
+ @Excel(name = "工序时间", width = 15)
@ApiModelProperty(value = "工序时间")
private java.lang.String processTime;
- /**工序单价*/
- @Excel(name = "工序单价", width = 15)
+ /**
+ * 工序单价
+ */
+ @Excel(name = "工序单价", width = 15)
@ApiModelProperty(value = "工序单价")
private java.lang.Double price;
- /**工序等级*/
- @Excel(name = "工序等级", width = 15)
+ /**
+ * 工序等级
+ */
+ @Excel(name = "工序等级", width = 15)
@ApiModelProperty(value = "工序等级")
private java.lang.String grade;
// /**面料代码*/
@@ -79,8 +94,10 @@ public class ZyProcess implements Serializable {
// @Excel(name = "面料等级", width = 15)
// @ApiModelProperty(value = "面料等级")
// private java.lang.String fabricGrade;
- /**针距（针/厘米）*/
- @Excel(name = "针距（针/厘米）", width = 15)
+ /**
+ * 针距（针/厘米）
+ */
+ @Excel(name = "针距（针/厘米）", width = 15)
@ApiModelProperty(value = "针距（针/厘米）")
private java.lang.Integer needlePitch;
// /**机器名*/
@@ -88,36 +105,52 @@ public class ZyProcess implements Serializable {
// @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
// @ApiModelProperty(value = "机器名")
// private java.lang.String machineId;
- /**手工宽放*/
- @Excel(name = "手工宽放", width = 15)
+ /**
+ * 手工宽放
+ */
+ @Excel(name = "手工宽放", width = 15)
@ApiModelProperty(value = "手工宽放")
private java.lang.String manualWide;
- /**手工时间*/
- @Excel(name = "手工时间", width = 15)
+ /**
+ * 手工时间
+ */
+ @Excel(name = "手工时间", width = 15)
@ApiModelProperty(value = "手工时间")
private java.lang.Double manualTime;
- /**机器转速*/
- @Excel(name = "机器转速", width = 15)
+ /**
+ * 机器转速
+ */
+ @Excel(name = "机器转速", width = 15)
@ApiModelProperty(value = "机器转速")
private java.lang.Integer machineSpeed;
- /**机器宽放*/
- @Excel(name = "机器宽放", width = 15)
+ /**
+ * 机器宽放
+ */
+ @Excel(name = "机器宽放", width = 15)
@ApiModelProperty(value = "机器宽放")
private java.lang.String machineWide;
- /**机器时间*/
- @Excel(name = "机器时间", width = 15)
+ /**
+ * 机器时间
+ */
+ @Excel(name = "机器时间", width = 15)
@ApiModelProperty(value = "机器时间")
private java.lang.Double machineTime;
- /**机器浮于*/
- @Excel(name = "机器浮于", width = 15)
+ /**
+ * 机器浮于
+ */
+ @Excel(name = "机器浮于", width = 15)
@ApiModelProperty(value = "机器浮于")
private java.lang.String machineFloat;
- /**绑包宽放*/
- @Excel(name = "绑包宽放", width = 15)
+ /**
+ * 绑包宽放
+ */
+ @Excel(name = "绑包宽放", width = 15)
@ApiModelProperty(value = "绑包宽放")
private java.lang.String bundleWide;
- /**绑包时间*/
- @Excel(name = "绑包时间", width = 15)
+ /**
+ * 绑包时间
+ */
+ @Excel(name = "绑包时间", width = 15)
@ApiModelProperty(value = "绑包时间")
private java.lang.String bundleTime;
// /**部件表*/
@@ -129,72 +162,100 @@ public class ZyProcess implements Serializable {
// @Excel(name = "是否为瓶颈工序", width = 15)
// @ApiModelProperty(value = "是否为瓶颈工序")
// private java.lang.Integer isBottleneck;
- /**企业名称*/
- @Excel(name = "企业名称", width = 15)
+ /**
+ * 企业名称
+ */
+ @Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private java.lang.String enterpriseId;
- /**工具名称*/
+ /**工具名称*/
// @Excel(name = "工具名称", width = 15, dictTable = "zy_tool", dicText = "name", dicCode = "id")
// @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
// @ApiModelProperty(value = "工具名称")
// private java.lang.String toolId;
- /**款式名称*/
- @Excel(name = "款式名称", width = 15)
+ /**
+ * 款式名称
+ */
+ @Excel(name = "款式名称", width = 15)
@ApiModelProperty(value = "款式名称")
- @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id")
+ @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id")
private java.lang.String styleId;
- /**工段代码*/
- @Excel(name = "工段代码", width = 15)
+ /**
+ * 工段代码
+ */
+ @Excel(name = "工段代码", width = 15)
@ApiModelProperty(value = "工段代码")
private java.lang.String worksectionCode;
- /**合同号*/
+ /**合同号*/
// @Excel(name = "合同号", width = 15)
// @ApiModelProperty(value = "合同号")
// private java.lang.String contractNum;
- /**合计（手工TMU）*/
- @Excel(name = "合计（手工TMU）", width = 15)
+ /**
+ * 合计（手工TMU）
+ */
+ @Excel(name = "合计（手工TMU）", width = 15)
@ApiModelProperty(value = "合计（手工TMU）")
private java.lang.Integer totalManualTmu;
- /**合计（机器TMU）*/
- @Excel(name = "合计（机器TMU）", width = 15)
+ /**
+ * 合计（机器TMU）
+ */
+ @Excel(name = "合计（机器TMU）", width = 15)
@ApiModelProperty(value = "合计（机器TMU）")
private java.lang.Integer totalMachineTmu;
- /**合计（手工秒）*/
- @Excel(name = "合计（手工秒）", width = 15)
+ /**
+ * 合计（手工秒）
+ */
+ @Excel(name = "合计（手工秒）", width = 15)
@ApiModelProperty(value = "合计（手工秒）")
private java.lang.Integer totalMaunal;
- /**合计（机器秒）*/
- @Excel(name = "合计（机器秒）", width = 15)
+ /**
+ * 合计（机器秒）
+ */
+ @Excel(name = "合计（机器秒）", width = 15)
@ApiModelProperty(value = "合计（机器秒）")
private java.lang.Integer totalMachine;
- /**图片*/
- @Excel(name = "图片", width = 15)
+ /**
+ * 图片
+ */
+ @Excel(name = "图片", width = 15)
@ApiModelProperty(value = "图片")
private java.lang.String image;
- /**视频*/
- @Excel(name = "视频", width = 15)
+ /**
+ * 视频
+ */
+ @Excel(name = "视频", width = 15)
@ApiModelProperty(value = "视频")
private java.lang.String vedio;
- @TableField(exist = false)
- private List zyClothAction;
- /**创建人*/
- @ApiModelProperty(value = "创建人")
- private java.lang.String createBy;
- /**创建日期*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "创建日期")
- private java.util.Date createTime;
- /**更新人*/
- @ApiModelProperty(value = "更新人")
- private java.lang.String updateBy;
- /**更新日期*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "更新日期")
- private java.util.Date updateTime;
- @Excel(name = "工序类型", width = 15)
- @ApiModelProperty(value = "工序类型")
- private int processType;
+ @TableField(exist = false)
+ private List zyClothAction;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**
+ * 创建日期
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**
+ * 更新日期
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+
+ @Excel(name = "工序类型", width = 15)
+ @ApiModelProperty(value = "工序类型")
+ private int processType;
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index 86f54118..b835c93a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
@@ -11,15 +11,17 @@ import java.util.Objects;
/**
*
* 部门表 存储树结构数据的实体类 + * sys_depart *
- * + * * @Author Steve - * @Since 2019-01-22 + * @Since 2019-01-22 */ + public class SysDepartTreeModel implements Serializable{ - + private static final long serialVersionUID = 1L; - + /** 对应SysDepart中的id字段,前端数据树中的key*/ private String key; @@ -32,7 +34,7 @@ public class SysDepartTreeModel implements Serializable{ private boolean isLeaf; // 以下所有字段均与SysDepart相同 - + private String id; private String parentId; @@ -46,7 +48,7 @@ public class SysDepartTreeModel implements Serializable{ private Integer departOrder; private String description; - + private String orgCategory; private String orgType; @@ -185,7 +187,7 @@ public class SysDepartTreeModel implements Serializable{ public void setDepartName(String departName) { this.departName = departName; } - + public String getOrgCategory() { return orgCategory; } @@ -367,7 +369,7 @@ public class SysDepartTreeModel implements Serializable{ Objects.equals(updateTime, model.updateTime) && Objects.equals(children, model.children); } - + /** * 重写hashCode方法 */ @@ -375,7 +377,7 @@ public class SysDepartTreeModel implements Serializable{ public int hashCode() { return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr, - departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, + departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address, memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime, children); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java index faed4dce..2a26bca1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java @@ -100,6 +100,7 @@ public class ZyClothsStyle implements Serializable { /**折叠搭配及包装*/ @Excel(name = "折叠搭配及包装", width = 15) @ApiModelProperty(value = "折叠搭配及包装") + @Dict(dicCode = "foldingPackaging") private String foldingPackaging; /**配件及标志*/ @Excel(name = "配件及标志", width = 15) @@ -108,6 +109,7 @@ public class ZyClothsStyle implements Serializable { /**缝纫形式*/ @Excel(name = "缝纫形式", width = 15) @ApiModelProperty(value = "缝纫形式") + @Dict(dicCode = "sewingForm") private String sewingForm; /**企业id*/ @Excel(name = "企业id", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")