工控网新分支
上一版本: 7cfabd1a | 补丁 | 提交 | 显示空白
zhangherong
2025-03-31 17cab0164374a86c946cdffaf7bd0b6b8d4170dc 
art: 设备管理-保养标准-明细项展示
已修改2个文件
44 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java


@@ -1,44 +1,28 @@


package org.jeecg.modules.eam.controller;




import java.util.Arrays;


import java.util.List;


import java.util.Map;


import java.io.IOException;


import java.io.UnsupportedEncodingException;


import java.net.URLDecoder;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;




import cn.hutool.core.collection.CollectionUtil;


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.system.query.QueryGenerator;


import org.jeecg.common.aspect.annotation.AutoLog;


import org.jeecg.common.util.oConvertUtils;


import org.jeecg.common.system.base.controller.JeecgController;


import org.jeecg.common.system.query.QueryGenerator;


import org.jeecg.modules.eam.constant.BusinessCodeConst;


import org.jeecg.modules.eam.entity.EamMaintenanceStandard;


import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;


import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;


import java.util.Date;


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.common.system.base.controller.JeecgController;


import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;


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.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 javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.util.Arrays;




 /**


 * @Description: 保养标准


@@ -65,7 +49,6 @@


     * @param req


     * @return


     */


    @AutoLog(value = "保养标准-分页列表查询")


    @ApiOperation(value="保养标准-分页列表查询", notes="保养标准-分页列表查询")


    @GetMapping(value = "/list")


    public Result<?> queryPageList(EamMaintenanceStandard eamMaintenanceStandard,


@@ -160,7 +143,6 @@


     * @param id


     * @return


     */


    @AutoLog(value = "保养标准-通过id查询")


    @ApiOperation(value="保养标准-通过id查询", notes="保养标准-通过id查询")


    @GetMapping(value = "/queryById")


    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {




 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java


@@ -47,6 +47,7 @@


                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {


        LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();


        queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardId);


        queryWrapper.orderByAsc(EamMaintenanceStandardDetail::getItemCode);


        Page<EamMaintenanceStandardDetail> page = new Page<>(pageNo, pageSize);


        IPage<EamMaintenanceStandardDetail> pageList = eamMaintenanceStandardDetailService.page(page, queryWrapper);


        return Result.OK(pageList);


@@ -63,6 +64,7 @@


    public Result<?> queryList(@RequestParam("standardId") String standardId) {


        LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();


        queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardId);


        queryWrapper.orderByAsc(EamMaintenanceStandardDetail::getItemCode);


        List<EamMaintenanceStandardDetail> list = eamMaintenanceStandardDetailService.list(queryWrapper);


        return Result.OK(list);


    }