Merge remote-tracking branch 'origin/master'

lyh

2025-04-10 d6dc4fa6ee7cf3aa860bd4e06312f230db168da7

 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,10 @@
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.constant.WeekMaintenanceStatusEnum;
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;
@@ -21,6 +21,7 @@

import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;

/**
 * @Description: 周保工单
@@ -41,22 +42,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());
        Page<EamWeekMaintenanceOrder> page = new Page<EamWeekMaintenanceOrder>(pageNo, pageSize);
        IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.page(page, queryWrapper);
//        QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
        Page<EamWeekMaintenanceOrder> page = new Page<>(pageNo, pageSize);
        IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.queryPageList(page, query);
        return Result.OK(pageList);
    }

@@ -88,14 +88,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("编辑成功!");
    }

@@ -114,6 +123,45 @@
    }

    /**
     * 通过id作废
     *
     * @param id
     * @return
     */
    @AutoLog(value = "周保工单-作废")
    @ApiOperation(value = "周保工单-作废", notes = "周保工单-作废")
    @DeleteMapping(value = "/abolish")
    public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
        EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
        if(entity == null) {
            return Result.error("要作废的数据不存在，请刷新重试！");
        }
        if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
            return Result.error("该状态的数据不允许进行作废！");
        }
        entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.ABOLISH.name());
        eamWeekMaintenanceOrderService.updateById(entity);
        return Result.OK("作废成功!");
    }

    /**
     * 通过id领取
     *
     * @param id
     * @return
     */
    @AutoLog(value = "周保工单-领取")
    @ApiOperation(value = "周保工单-领取", notes = "周保工单-领取")
    @GetMapping(value = "/collect")
    public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamWeekMaintenanceOrderService.collect(id);
        if(!b) {
            Result.OK("领取失败!");
        }
        return Result.OK("领取成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
@@ -128,12 +176,32 @@
    }

    /**
     * 通过id批量作废
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "周保工单-批量作废")
    @ApiOperation(value = "周保工单-批量作废", notes = "周保工单-批量作废")
    @DeleteMapping(value = "/abolishBatch")
    public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
        List<String> list = Arrays.asList(ids.split(","));
        list.forEach(id -> {
            EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
            if (entity != null && WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
                entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.ABOLISH.name());
                eamWeekMaintenanceOrderService.updateById(entity);
            }
        });
        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) {