diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue index f43073da..2cf1093e 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue @@ -2,7 +2,7 @@
新增 - 导出 - - 导入 - + + + + - + 删除 @@ -79,19 +79,24 @@ 编辑 - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 + + + 删除 + + + + + + + + + + + + + + @@ -219,7 +224,9 @@ this.superFieldList = fieldList }, handleDetail(id){ - this.$refs.ZyProcessComponentFormDetail.showModal(id) + //id = this.model.id; + console.log("this。model.id +++++"+id); + this.$refs.ZyProcessComponentFormDetail.showModal(id); } } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue index d07a9cd2..55a576ee 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentForm.vue @@ -5,12 +5,12 @@ - + - - + + diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue index 78200417..c5a38fb6 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentFormDetail.vue @@ -3,7 +3,7 @@ title="标准作业指导书" :visible="visible" :confirm-loading="confirmLoading" - :width='1400' + :width='1000' @ok="handleOk" @cancel="handleCancel" style="display:flex;" @@ -14,13 +14,17 @@ {{model.componentId}} - 工艺: + 工序: {{model.processId}} 是否瓶颈工序: {{model.bottleneck}} + + 创建时间: + {{model.createTime}} + @@ -57,20 +61,25 @@ this.model = res.result // this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; // this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; - console.log('this.model') - console.log(this.model) + console.log('this.model++'+id); + console.log(this.model); } ) }, - handleOk() { + handleOk(e) { this.ModalText = 'The modal will be closed after two seconds'; this.confirmLoading = true; setTimeout(() => { this.visible = false; this.confirmLoading = false; - }, 1); + }, 2000); + }, + close () { + this.$emit('close'); + this.visible = false; }, - handleCancel() { + handleCancel(e) { + //this.close() this.visible = false; }, } diff --git a/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue b/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue index 90d00c7e..33aae9b7 100644 --- a/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue +++ b/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue @@ -20,12 +20,12 @@
新增 - 导出 - - 导入 - + + + + - + 删除 @@ -79,19 +79,24 @@ 编辑 - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 + + + 删除 + + + + + + + + + + + + + + @@ -133,14 +138,14 @@ export default { } }, { - title:'模块ID', + title:'模块名称', align:"center", dataIndex: 'modularId_dictText' }, { - title:'工序ID', + title:'工序名称', align:"center", - dataIndex: 'processId' + dataIndex: 'processId_dictText' }, { title:'创建时间', diff --git a/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularForm.vue b/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularForm.vue index 1461d730..65f9853a 100644 --- a/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularForm.vue +++ b/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularForm.vue @@ -14,9 +14,14 @@ dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块名称" disabled/> + + + + + - - + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java index b78f521f..febcf394 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyClothsComponentMapper.java @@ -20,4 +20,6 @@ public interface ZyClothsComponentMapper extends BaseMapper { List selectProcessVo(@Param("list") List list); public List selectByModular(@Param("modular_id")String modular_id); + + String getComponentNameById(String componentId); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java index 3db110f1..f55dd903 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java @@ -12,14 +12,16 @@ import org.jeecg.modules.demo.pro.entity.ZyProcessAction; /** * @Description: zy_process * @Author: jeecg-boot - * @Date: 2021-11-03 + * @Date: 2021-11-03 * @Version: V1.0 */ public interface ZyProcessMapper extends BaseMapper { List selectByIds(@Param("id") String id); - ZyClothActionVo selectListZyClothActionVo(@Param("id") String id); + ZyClothActionVo selectListZyClothActionVo(@Param("id") String id); - public List selectByComponentId(@Param("component_id")String component_id); + public List selectByComponentId(@Param("component_id") String component_id); + + String getProcessNameById(String processId); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml index 5f41c230..00fd10ba 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyClothsComponentMapper.xml @@ -1,24 +1,32 @@ - + + + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyProcessMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyProcessMapper.xml index 7a3696c1..0fde82e5 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyProcessMapper.xml +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/xml/ZyProcessMapper.xml @@ -15,4 +15,9 @@ SELECT * from zy_process where component_id = #{component_id} + diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java index 27356ca9..ecac0583 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java @@ -1,223 +1,235 @@ package org.jeecg.modules.demo.pro.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 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.ZyProcess; +import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper; +import org.jeecg.modules.demo.base.mapper.ZyProcessMapper; import org.jeecg.modules.demo.base.service.IZyClothsComponentService; import org.jeecg.modules.demo.base.service.IZyProcessService; import org.jeecg.modules.demo.pro.entity.NewZyProcessComponent; import org.jeecg.modules.demo.pro.entity.ZyProcessComponent; +import org.jeecg.modules.demo.pro.mapper.ZyProcessComponentMapper; import org.jeecg.modules.demo.pro.service.IZyProcessComponentService; - -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.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.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** * @Description: zy_process_component * @Author: jeecg-boot - * @Date: 2021-11-11 + * @Date: 2021-11-11 * @Version: V1.0 */ -@Api(tags="zy_process_component") +@Api(tags = "zy_process_component") @RestController @RequestMapping("/pro/zyProcessComponent") @Slf4j public class ZyProcessComponentController extends JeecgController { - @Autowired - private IZyProcessComponentService zyProcessComponentService; - @Autowired - private IZyProcessService zyProcessService; - @Autowired - private IZyClothsComponentService zyClothsComponentService; + @Autowired + private IZyProcessComponentService zyProcessComponentService; + @Autowired + private IZyProcessService zyProcessService; + @Autowired + private IZyClothsComponentService zyClothsComponentService; + @Resource + private ZyClothsComponentMapper zyClothsComponentMapper; + @Resource + private ZyProcessMapper zyProcessMapper; + + /** + * 分页列表查询 + * + * @param zyProcessComponent + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "zy_process_component-分页列表查询") + @ApiOperation(value = "zy_process_component-分页列表查询", notes = "zy_process_component-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyProcessComponent zyProcessComponent, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessComponent, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessComponentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * + */ + @AutoLog(value = "zy_process_component-查询所有") + @ApiOperation(value = "zy_process_component-查询所有", notes = "zy_process_component-查询所有") + @GetMapping(value = "/findAll") + public Result findAll() { + List list = zyProcessComponentService.list(); + List list1 = new ArrayList<>(); + for (ZyProcessComponent zy : list) { + NewZyProcessComponent newZy = new NewZyProcessComponent(); + String processId = zy.getProcessId(); + String componentId = zy.getComponentId(); + ZyProcess byId = zyProcessService.getById(processId); + ZyClothsComponent byId1 = zyClothsComponentService.getById(componentId); + newZy.setProcessCode(byId.getProcessCode()); + newZy.setProcessName(byId.getProcessName()); + newZy.setProcessDescribe(byId.getProcessDescribe()); + newZy.setMkExplain(byId.getMkExplain()); + newZy.setQualityRequire(byId.getQualityRequire()); + newZy.setProcessTime(byId.getProcessTime()); + newZy.setPrice(byId.getPrice()); + newZy.setGrade(byId.getGrade()); + newZy.setNeedlePitch(byId.getNeedlePitch()); + newZy.setManualTime(byId.getManualTime()); + newZy.setMachineSpeed(byId.getMachineSpeed()); + newZy.setMachineWide(byId.getMachineWide()); + newZy.setMachineTime(byId.getMachineTime()); + newZy.setMachineFloat(byId.getMachineFloat()); + newZy.setBundleWide(byId.getBundleWide()); + newZy.setBundleTime(byId.getBundleTime()); + newZy.setEnterpriseId(byId.getEnterpriseId()); + newZy.setStyleId(byId.getStyleId()); + newZy.setWorksectionCode(byId.getWorksectionCode()); + newZy.setTotalManualTmu(byId.getTotalManualTmu()); + newZy.setTotalMachineTmu(byId.getTotalMachineTmu()); + newZy.setTotalMaunal(byId.getTotalMaunal()); + newZy.setTotalMachine(byId.getTotalMachine()); + newZy.setNums(byId1.getNums()); + newZy.setPartsName(byId1.getPartsName()); + newZy.setDescription(byId1.getDescription()); + list1.add(newZy); + } + return Result.OK(list1); + } - /** - * 分页列表查询 - * - * @param zyProcessComponent - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "zy_process_component-分页列表查询") - @ApiOperation(value="zy_process_component-分页列表查询", notes="zy_process_component-分页列表查询") - @GetMapping(value = "/list") - public Result queryPageList(ZyProcessComponent zyProcessComponent, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessComponent, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyProcessComponentService.page(page, queryWrapper); - return Result.OK(pageList); - } + /** + * 添加 + * + * @param zyProcessComponent + * @return + */ + @AutoLog(value = "zy_process_component-添加") + @ApiOperation(value = "zy_process_component-添加", notes = "zy_process_component-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyProcessComponent zyProcessComponent) { + zyProcessComponentService.save(zyProcessComponent); + return Result.OK("添加成功！"); + } - /** - * - */ - @AutoLog(value = "zy_process_component-查询所有") - @ApiOperation(value="zy_process_component-查询所有", notes="zy_process_component-查询所有") - @GetMapping(value = "/findAll") - public Result findAll() { - List list = zyProcessComponentService.list(); - List list1 = new ArrayList<>(); - for (ZyProcessComponent zy : list){ - NewZyProcessComponent newZy = new NewZyProcessComponent(); - String processId = zy.getProcessId(); - String componentId = zy.getComponentId(); - ZyProcess byId = zyProcessService.getById(processId); - ZyClothsComponent byId1 = zyClothsComponentService.getById(componentId); - newZy.setProcessCode(byId.getProcessCode()); - newZy.setProcessName(byId.getProcessName()); - newZy.setProcessDescribe(byId.getProcessDescribe()); - newZy.setMkExplain(byId.getMkExplain()); - newZy.setQualityRequire(byId.getQualityRequire()); - newZy.setProcessTime(byId.getProcessTime()); - newZy.setPrice(byId.getPrice()); - newZy.setGrade(byId.getGrade()); - newZy.setNeedlePitch(byId.getNeedlePitch()); - newZy.setManualTime(byId.getManualTime()); - newZy.setMachineSpeed(byId.getMachineSpeed()); - newZy.setMachineWide(byId.getMachineWide()); - newZy.setMachineTime(byId.getMachineTime()); - newZy.setMachineFloat(byId.getMachineFloat()); - newZy.setBundleWide(byId.getBundleWide()); - newZy.setBundleTime(byId.getBundleTime()); - newZy.setEnterpriseId(byId.getEnterpriseId()); - newZy.setStyleId(byId.getStyleId()); - newZy.setWorksectionCode(byId.getWorksectionCode()); - newZy.setTotalManualTmu(byId.getTotalManualTmu()); - newZy.setTotalMachineTmu(byId.getTotalMachineTmu()); - newZy.setTotalMaunal(byId.getTotalMaunal()); - newZy.setTotalMachine(byId.getTotalMachine()); - newZy.setNums(byId1.getNums()); - newZy.setPartsName(byId1.getPartsName()); - newZy.setDescription(byId1.getDescription()); - list1.add(newZy); - } - return Result.OK(list1); - } - /** - * 添加 - * - * @param zyProcessComponent - * @return - */ - @AutoLog(value = "zy_process_component-添加") - @ApiOperation(value="zy_process_component-添加", notes="zy_process_component-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ZyProcessComponent zyProcessComponent) { - zyProcessComponentService.save(zyProcessComponent); - return Result.OK("添加成功！"); - } + /** + * 编辑 + * + * @param zyProcessComponent + * @return + */ + @AutoLog(value = "zy_process_component-编辑") + @ApiOperation(value = "zy_process_component-编辑", notes = "zy_process_component-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyProcessComponent zyProcessComponent) { + zyProcessComponentService.updateById(zyProcessComponent); + return Result.OK("编辑成功!"); + } - /** - * 编辑 - * - * @param zyProcessComponent - * @return - */ - @AutoLog(value = "zy_process_component-编辑") - @ApiOperation(value="zy_process_component-编辑", notes="zy_process_component-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody ZyProcessComponent zyProcessComponent) { - zyProcessComponentService.updateById(zyProcessComponent); - return Result.OK("编辑成功!"); - } + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "zy_process_component-通过id删除") + @ApiOperation(value = "zy_process_component-通过id删除", notes = "zy_process_component-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + zyProcessComponentService.removeById(id); + return Result.OK("删除成功!"); + } - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "zy_process_component-通过id删除") - @ApiOperation(value="zy_process_component-通过id删除", notes="zy_process_component-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - zyProcessComponentService.removeById(id); - return Result.OK("删除成功!"); - } + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "zy_process_component-批量删除") + @ApiOperation(value = "zy_process_component-批量删除", notes = "zy_process_component-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.zyProcessComponentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "zy_process_component-批量删除") - @ApiOperation(value="zy_process_component-批量删除", notes="zy_process_component-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.zyProcessComponentService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "zy_process_component-通过id查询") + @ApiOperation(value = "zy_process_component-通过id查询", notes = "zy_process_component-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ZyProcessComponent zyProcessComponent = zyProcessComponentService.getById(id); - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "zy_process_component-通过id查询") - @ApiOperation(value="zy_process_component-通过id查询", notes="zy_process_component-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ZyProcessComponent zyProcessComponent = zyProcessComponentService.getById(id); - if(zyProcessComponent==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(zyProcessComponent); - } + if (zyProcessComponent == null) { + return Result.error("未找到对应数据"); + } + //部件名称 + String componentId = zyProcessComponent.getComponentId(); + String componentNameById = zyClothsComponentMapper.getComponentNameById(componentId); + zyProcessComponent.setComponentId(componentNameById); + //工序名称 + String processId = zyProcessComponent.getProcessId(); + String processNameById = zyProcessMapper.getProcessNameById(processId); + zyProcessComponent.setProcessId(processNameById); + //瓶颈工序 + String bottleneck = zyProcessComponent.getBottleneck(); + if (bottleneck.equals("1")) { + zyProcessComponent.setBottleneck("是"); + } else if (bottleneck.equals("2")) { + zyProcessComponent.setBottleneck("否"); + } else { + zyProcessComponent.setBottleneck("可能为空或出错了"); + } + return Result.OK(zyProcessComponent); + } /** - * 导出excel - * - * @param request - * @param zyProcessComponent - */ + * 导出excel + * + * @param request + * @param zyProcessComponent + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ZyProcessComponent zyProcessComponent) { return super.exportXls(request, zyProcessComponent, ZyProcessComponent.class, "zy_process_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, ZyProcessComponent.class); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java index 2901d02e..86809eb3 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/entity/ZyProcessModular.java @@ -60,5 +60,6 @@ public class ZyProcessModular implements Serializable { /**工序ID*/ @Excel(name = "工序ID", width = 15) @ApiModelProperty(value = "工序ID") + @Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id") private java.lang.String processId; }