art: 设备管理-用户选择-根据岗位选择用户

zhangherong

2025-04-07 d465f6537bda4c5b3844a15b73badf704f44c9a1

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

@@ -1,7 +1,6 @@
package org.jeecg.modules.eam.controller;

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;
@@ -10,9 +9,9 @@
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.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
@@ -41,22 +40,21 @@
    /**
     * 分页列表查询
     *
     * @param eamWeekMaintenanceOrder
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @AutoLog(value = "周保工单-分页列表查询")
    @ApiOperation(value = "周保工单-分页列表查询", notes = "周保工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamWeekMaintenanceOrder eamWeekMaintenanceOrder,
    public Result<?> queryPageList(EamWeekMaintenanceQuery query,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
//        QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
        Page<EamWeekMaintenanceOrder> page = new Page<EamWeekMaintenanceOrder>(pageNo, pageSize);
        IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.page(page, queryWrapper);
        IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.queryPageList(page, query);
        return Result.OK(pageList);
    }

@@ -88,14 +86,23 @@
    /**
     * 编辑
     *
     * @param eamWeekMaintenanceOrder
     * @param request
     * @return
     */
    @AutoLog(value = "周保工单-编辑")
    @ApiOperation(value = "周保工单-编辑", notes = "周保工单-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamWeekMaintenanceOrder eamWeekMaintenanceOrder) {
        eamWeekMaintenanceOrderService.updateById(eamWeekMaintenanceOrder);
    public Result<?> edit(@RequestBody EamWeekMaintenanceRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        if (CollectionUtil.isEmpty(request.getTableDetailList())) {
            return Result.error("保养项不能为空！");
        }
        boolean b = eamWeekMaintenanceOrderService.editWeekMaintenance(request);
        if (!b) {
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }

@@ -133,7 +140,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) {