车间能级提升-智能设备管理系统
zhuguifei
2025-03-12 66e943c91e133eec5a0822ea22fd92cbc04bc9f3
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintOrderController.java
@@ -2,10 +2,14 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.eims.domain.vo.MaintOrdeGroupVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -46,6 +50,30 @@
        return eimsMaintOrderService.queryPageListCustom(bo, pageQuery);
    }
    @SaCheckPermission("eims:maintOrder:list")
    @GetMapping("/groupList")
    public TableDataInfo<MaintOrdeGroupVo> group(EimsMaintOrderBo bo, PageQuery pageQuery) {
//        return eimsMaintOrderService.queryPageList(bo, pageQuery);
        return eimsMaintOrderService.queryPageGroupList(bo, pageQuery);
    }
    @SaCheckPermission("eims:maintOrder:list")
    @GetMapping("/detailList")
    public TableDataInfo<EimsMaintOrderVo> groupDetail(EimsMaintOrderBo bo, PageQuery pageQuery) {
        // 这里使用mintCode传递了 equid + plantime
        String maintCode = bo.getMaintCode();
        if (StringUtils.isEmpty(maintCode) || !maintCode.contains("_")) {
            return TableDataInfo.build(new Page<>(0,0));
        }
        String[] split = maintCode.split("_");
        bo.setEquId(Long.valueOf(split[0]));
        bo.setPlanTime(DateUtils.parseDate(split[1]));
        bo.setMaintCode(null);
//        return eimsMaintOrderService.queryPageList(bo, pageQuery);
        return eimsMaintOrderService.queryPageListCustom(bo, pageQuery);
    }
    /**
     * 导出保养工单列表
     */
@@ -65,7 +93,7 @@
    @SaCheckPermission("eims:maintOrder:query")
    @GetMapping("/{id}")
    public R<EimsMaintOrderVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {
                                       @PathVariable Long id) {
        return R.ok(eimsMaintOrderService.queryById(id));
    }