新增点检工单、swagger配置，新增用户拥有标准查询

lyh

2025-04-02 63a24908dd2bca035d9f26fe071266d548048cdd

新增点检工单、swagger配置，新增用户拥有标准查询

 lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -160,6 +160,24 @@
                .groupName("集成");
    }

    @Bean(value = "defaultApiEam")
    public Docket activitiApiEam() {
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(apiInfo())
                .select()
                //此包路径下的类，才生成接口文档
                .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.eam"))
                //加了ApiOperation注解的类，才生成接口文档
                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                .paths(PathSelectors.any())
                .build()
                .securitySchemes(Collections.singletonList(securityScheme()))
                .securityContexts(securityContexts())
                .globalOperationParameters(setHeaderToken())
                .groupName("eam");
    }

    /***
     * oauth2配置
     * éœ€è¦å¢žåŠ swagger授权回调地址

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,161 @@
package org.jeecg.modules.eam.controller;

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.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

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

 /**
 * @Description: ç‚¹æ£€å·¥å•
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Api(tags="点检工单")
@RestController
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
    @Autowired
    private IEamInspectionOrderService eamInspectionOrderService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamInspectionOrder
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "点检工单-分页列表查询")
    @ApiOperation(value="点检工单-分页列表查询", notes="点检工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
        Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
        IPage<EamInspectionOrder> pageList = eamInspectionOrderService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     *   æ·»åŠ 
     *
     * @param eamInspectionOrder
     * @return
     */
    @AutoLog(value = "点检工单-添加")
    @ApiOperation(value="点检工单-添加", notes="点检工单-添加")
    //@RequiresPermissions("org.jeecg.modules:点检工单:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody EamInspectionOrder eamInspectionOrder) {
        eamInspectionOrderService.save(eamInspectionOrder);
        return Result.OK("添加成功！");
    }

    /**
     *  ç¼–辑
     *
     * @param eamInspectionOrder
     * @return
     */
    @AutoLog(value = "点检工单-编辑")
    @ApiOperation(value="点检工单-编辑", notes="点检工单-编辑")
    //@RequiresPermissions("org.jeecg.modules:点检工单:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody EamInspectionOrder eamInspectionOrder) {
        eamInspectionOrderService.updateById(eamInspectionOrder);
        return Result.OK("编辑成功!");
    }

    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "点检工单-通过id删除")
    @ApiOperation(value="点检工单-通过id删除", notes="点检工单-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        eamInspectionOrderService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "点检工单-批量删除")
    @ApiOperation(value="点检工单-批量删除", notes="点检工单-批量删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamInspectionOrderService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "点检工单-通过id查询")
    @ApiOperation(value="点检工单-通过id查询", notes="点检工单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<EamInspectionOrder> queryById(@RequestParam(name="id",required=true) String id) {
        EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
        if(eamInspectionOrder==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(eamInspectionOrder);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param eamInspectionOrder
    */
    //@RequiresPermissions("org.jeecg.modules:点检工单:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
        return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "点检工单");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("点检工单:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamInspectionOrder.class);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,161 @@
package org.jeecg.modules.eam.controller;

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.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

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

 /**
 * @Description: ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Api(tags="点检工单明细")
@RestController
@RequestMapping("/eam/eamInspectionOrderDetail")
@Slf4j
public class EamInspectionOrderDetailController extends JeecgController<EamInspectionOrderDetail, IEamInspectionOrderDetailService> {
    @Autowired
    private IEamInspectionOrderDetailService eamInspectionOrderDetailService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamInspectionOrderDetail
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "点检工单明细-分页列表查询")
    @ApiOperation(value="点检工单明细-分页列表查询", notes="点检工单明细-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<EamInspectionOrderDetail>> queryPageList(EamInspectionOrderDetail eamInspectionOrderDetail,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamInspectionOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrderDetail, req.getParameterMap());
        Page<EamInspectionOrderDetail> page = new Page<EamInspectionOrderDetail>(pageNo, pageSize);
        IPage<EamInspectionOrderDetail> pageList = eamInspectionOrderDetailService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     *   æ·»åŠ 
     *
     * @param eamInspectionOrderDetail
     * @return
     */
    @AutoLog(value = "点检工单明细-添加")
    @ApiOperation(value="点检工单明细-添加", notes="点检工单明细-添加")
    //@RequiresPermissions("org.jeecg.modules:点检工单明细:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody EamInspectionOrderDetail eamInspectionOrderDetail) {
        eamInspectionOrderDetailService.save(eamInspectionOrderDetail);
        return Result.OK("添加成功！");
    }

    /**
     *  ç¼–辑
     *
     * @param eamInspectionOrderDetail
     * @return
     */
    @AutoLog(value = "点检工单明细-编辑")
    @ApiOperation(value="点检工单明细-编辑", notes="点检工单明细-编辑")
    //@RequiresPermissions("org.jeecg.modules:点检工单明细:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody EamInspectionOrderDetail eamInspectionOrderDetail) {
        eamInspectionOrderDetailService.updateById(eamInspectionOrderDetail);
        return Result.OK("编辑成功!");
    }

    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "点检工单明细-通过id删除")
    @ApiOperation(value="点检工单明细-通过id删除", notes="点检工单明细-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单明细:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        eamInspectionOrderDetailService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "点检工单明细-批量删除")
    @ApiOperation(value="点检工单明细-批量删除", notes="点检工单明细-批量删除")
    //@RequiresPermissions("org.jeecg.modules:点检工单明细:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.eamInspectionOrderDetailService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "点检工单明细-通过id查询")
    @ApiOperation(value="点检工单明细-通过id查询", notes="点检工单明细-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<EamInspectionOrderDetail> queryById(@RequestParam(name="id",required=true) String id) {
        EamInspectionOrderDetail eamInspectionOrderDetail = eamInspectionOrderDetailService.getById(id);
        if(eamInspectionOrderDetail==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(eamInspectionOrderDetail);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param eamInspectionOrderDetail
    */
    //@RequiresPermissions("org.jeecg.modules:点检工单明细:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrderDetail eamInspectionOrderDetail) {
        return super.exportXls(request, eamInspectionOrderDetail, EamInspectionOrderDetail.class, "点检工单明细");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("点检工单明细:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamInspectionOrderDetail.class);
    }

}

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

@@ -159,6 +159,21 @@
    }

    /**
     * æŸ¥è¯¢æ ‡å‡†åˆ—表-前端展示该用户拥有的标准
     * @param keyword è®¾å¤‡ç¼–号
     * @param maintenanceCategory ä¿å…»ç±»åž‹
     * @return
     */
    @AutoLog(value = "保养标准-查询标准列表-前端展示该用户拥有的标准")
    @ApiOperation(value = "保养标准-查询标准列表-前端展示该用户拥有的标准", notes = "保养标准-查询标准列表-前端展示该用户拥有的标准")
    @GetMapping(value = "/listByUser")
    public Result<?> listByUser(@RequestParam(name = "keyword", required = false) String keyword,
                                @RequestParam(name = "maintenanceCategory", required = false) String maintenanceCategory) {
        List<EamMaintenanceStandard> list = eamMaintenanceStandardService.queryListBykeywordAndCategory(keyword, maintenanceCategory);
        return Result.OK(list);
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,124 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: ç‚¹æ£€å·¥å•
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Data
@TableName("eam_inspection_order")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order对象", description="点检工单")
public class EamInspectionOrder implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**工单号*/
    @Excel(name = "工单号", width = 15)
    @ApiModelProperty(value = "工单号")
    private String orderNum;
    /**设备ID*/
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    @Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
    private String equipmentId;
    /**标准ID*/
    @Excel(name = "保养标准ID", width = 15)
    @ApiModelProperty(value = "保养标准ID")
    @Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
    private String standardId;
    /**点检日期*/
    @Excel(name = "点检日期（计划）", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "点检日期")
    private Date inspectionDate;
    /**点检过期时间*/
    @Excel(name = "点检过期时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "点检过期时间")
    private Date expirationTime;
    /**点检时间*/
    @Excel(name = "点检时间（实际）", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "点检时间")
    private Date operateTime;
    /**点检人*/
    @Excel(name = "点检人", width = 15)
    @ApiModelProperty(value = "点检人-是领取人")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String operator;
    /**创建方式*/
    @Excel(name = "创建方式", width = 15)
    @ApiModelProperty(value = "创建方式")
    private String creationMethod;
    /**点检状态*/
    @Excel(name = "点检状态", width = 15)
    @ApiModelProperty(value = "点检状态   å¾…点检-待确认-已完成")
    private String inspectionStatus;
    /**班组长确认*/
    @Excel(name = "班组长确认", width = 15)
    @ApiModelProperty(value = "班组长确认--领取后产生")
    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
    private String confirmUser;
    /**确认时间*/
    @Excel(name = "确认时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "确认时间")
    private Date confirmTime;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注-点检工单创建备注")
    private String remark;
    /**照片文件ids;id以逗号分隔*/
    @Excel(name = "照片文件ids;id以逗号分隔-执行时", width = 15)
    @ApiModelProperty(value = "照片文件ids;id以逗号分隔")
    private String imageFiles;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
package org.jeecg.modules.eam.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Data
@TableName("eam_inspection_order_detail")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order_detail对象", description="点检工单明细")
public class EamInspectionOrderDetail implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**删除标记*/
    @Excel(name = "删除标记", width = 15)
    @ApiModelProperty(value = "删除标记")
    @TableLogic
    private Integer delFlag;
    /**工单ID*/
    @Excel(name = "工单ID", width = 15)
    @ApiModelProperty(value = "工单ID")
    private String orderId;
    /**点检项ID*/
    @Excel(name = "点检项ID", width = 15)
    @ApiModelProperty(value = "点检项ID")
    private String itemId;
    /**点检结果*/
    @Excel(name = "点检结果", width = 15)
    @ApiModelProperty(value = "点检结果-正常-异常")
    private String inspectionResult;
    /**异常描述*/
    @Excel(name = "异常描述", width = 15)
    @ApiModelProperty(value = "异常描述")
    private String exceptionDescription;
    /**异常是否保修*/
    @Excel(name = "异常是否保修", width = 15)
    @ApiModelProperty(value = "异常是否保修")
    private String whetherWarranty;

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderDetailMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;

/**
 * @Description: ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
public interface EamInspectionOrderDetailMapper extends BaseMapper<EamInspectionOrderDetail> {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.EamInspectionOrder;

/**
 * @Description: ç‚¹æ£€å·¥å•
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
public interface EamInspectionOrderMapper extends BaseMapper<EamInspectionOrder> {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java

@@ -1,10 +1,10 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

/**
 * @Description: ä¿å…»æ ‡å‡†
@@ -14,4 +14,13 @@
 */
public interface EamMaintenanceStandardMapper extends BaseMapper<EamMaintenanceStandard> {

    /**
     * æŸ¥è¯¢æ ‡å‡†åˆ—表-前端展示该用户拥有的标准
     * @param userId ç”¨æˆ·
     * @param keyword è®¾å¤‡ç¼–号
     * @param maintenanceCategory ä¿å…»ç±»åž‹
     * @return
     */
    List<EamMaintenanceStandard> queryListBykeywordAndCategory(@Param("userId")String userId ,@Param("keyword") String keyword, @Param("maintenanceCategory") String maintenanceCategory);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderDetailMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamInspectionOrderDetailMapper">

</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamInspectionOrderMapper">

</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml

@@ -2,4 +2,29 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper">

</mapper>
    <select id="queryListBykeywordAndCategory" resultType="org.jeecg.modules.eam.entity.EamMaintenanceStandard">
        SELECT
            m.*
        FROM
            eam_maintenance_standard m
        WHERE
            m.del_flag = 0
          AND m.standard_status= 'NORMAL'
          AND m.maintenance_category = #{maintenanceCategory}
          AND EXISTS (
            SELECT 1
            FROM
                eam_equipment e
                    INNER JOIN mdc_user_production t
                               ON t.user_id = #{userId}
                                   AND t.pro_id = e.org_id  -- å…³è”条件移到JOIN中
            WHERE
                e.id = m.equipment_id
              AND e.del_flag = 0
              AND (
                e.equipment_code LIKE CONCAT('%', #{keyword}, '%')
                    OR e.equipment_name LIKE CONCAT('%', #{keyword}, '%')
                )
        )
    </select>
</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderDetailService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;

/**
 * @Description: ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
public interface IEamInspectionOrderDetailService extends IService<EamInspectionOrderDetail> {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamInspectionOrder;

/**
 * @Description: ç‚¹æ£€å·¥å•
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
public interface IEamInspectionOrderService extends IService<EamInspectionOrder> {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java

@@ -2,9 +2,11 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;

import java.util.List;

/**
 * @Description: ä¿å…»æ ‡å‡†
@@ -47,4 +49,12 @@
     * @return
     */
    EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory);

    /**
     * æŸ¥è¯¢æ ‡å‡†åˆ—表-前端展示该用户拥有的标准
     * @param keyword è®¾å¤‡ç¼–号
     * @param maintenanceCategory ä¿å…»ç±»åž‹
     * @return
     */
    List<EamMaintenanceStandard> queryListBykeywordAndCategory( String keyword, String maintenanceCategory);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderDetailServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.mapper.EamInspectionOrderDetailMapper;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.springframework.stereotype.Service;

/**
 * @Description: ç‚¹æ£€å·¥å•æ˜Žç»†
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Service
public class EamInspectionOrderDetailServiceImpl extends ServiceImpl<EamInspectionOrderDetailMapper, EamInspectionOrderDetail> implements IEamInspectionOrderDetailService {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
import org.springframework.stereotype.Service;

/**
 * @Description: ç‚¹æ£€å·¥å•
 * @Author: jeecg-boot
 * @Date:   2025-04-02
 * @Version: V1.0
 */
@Service
public class EamInspectionOrderServiceImpl extends ServiceImpl<EamInspectionOrderMapper, EamInspectionOrder> implements IEamInspectionOrderService {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java

@@ -2,7 +2,6 @@

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -262,4 +261,16 @@
        }
        return list.get(0);
    }

    /**
     * æŸ¥è¯¢æ ‡å‡†åˆ—表-前端展示该用户拥有的标准
     * @param keyword è®¾å¤‡ç¼–号
     * @param maintenanceCategory ä¿å…»ç±»åž‹
     * @return
     */
    @Override
    public List<EamMaintenanceStandard> queryListBykeywordAndCategory(String keyword, String maintenanceCategory){
        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        return eamMaintenanceStandardMapper.queryListBykeywordAndCategory(loginUser.getId(),keyword, maintenanceCategory);
    }
}