故障上报查询条件修改

Lius

2025-04-09 4965acb344354ac22239477c49d461e1238aedf3

故障上报查询条件修改

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

@@ -15,6 +15,7 @@
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,18 +49,18 @@
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamRepairOrder
     * @param eamRepairOrderQuery
     * @param pageNo
     * @param pageSize
     * @return
     */
    @ApiOperation(value = "维修工单-分页列表查询", notes = "维修工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamRepairOrder eamRepairOrder,
    public Result<?> queryPageList(EamRepairOrderQuery eamRepairOrderQuery,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        Page<EamRepairOrder> page = new Page<EamRepairOrder>(pageNo, pageSize);
        IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrder);
        IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrderQuery);
        return Result.OK(pageList);
    }


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

@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;

import java.util.List;

@@ -24,5 +25,5 @@
     * @param equipmentIds
     * @return
     */
    IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, @Param("eamRepairOrder") EamRepairOrder eamRepairOrder, @Param("userId") String userId, @Param("equipmentIds") List<String> equipmentIds);
    IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, @Param("eamRepairOrder") EamRepairOrderQuery eamRepairOrderQuery, @Param("userId") String userId, @Param("equipmentIds") List<String> equipmentIds);
}

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

@@ -21,8 +21,11 @@
                    EXISTS ( SELECT 1 FROM mdc_user_production t3 WHERE t3.user_id = #{userId} AND t3.pro_id= t2.org_id )
                </otherwise>
            </choose>
            <if test="eamRepairOrder.equipmentCode != null and eamRepairOrder.equipmentCode != ''">
                AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentCode }),'%')
            </if>
            <if test="eamRepairOrder.equipmentId != null and eamRepairOrder.equipmentId != ''">
                AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentId }),'%')
                AND t2.id = #{ eamRepairOrder.equipmentId }
            </if>
            <if test="eamRepairOrder.equipmentName != null and eamRepairOrder.equipmentName != ''">
                AND t2.equipment_name LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentName }),'%')

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java

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

import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.entity.EamRepairOrder;

import java.io.Serializable;

/**
 * @Author: Lius
 * @CreateTime: 2025-04-09
 * @Description:
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="请求对象", description="维修工单")
public class EamRepairOrderQuery extends EamRepairOrder implements Serializable {
    /**
     * è®¾å¤‡ç¼–码
     */
    private String equipmentCode;
}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;

/**
 * @Description: ç»´ä¿®å·¥å•
@@ -15,10 +16,10 @@
    /**
     * åˆ†é¡µåˆ—表
     * @param page
     * @param eamRepairOrder
     * @param eamRepairOrderQuery
     * @return
     */
    IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrder eamRepairOrder);
    IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrderQuery eamRepairOrderQuery);

    /**
     * é¢†å–工单，启动维修流程

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

@@ -13,6 +13,7 @@
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.mapper.EamRepairOrderMapper;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
@@ -57,11 +58,11 @@
     * åˆ†é¡µåˆ—表
     *
     * @param page
     * @param eamRepairOrder
     * @param eamRepairOrderQuery
     * @return
     */
    @Override
    public IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrder eamRepairOrder) {
    public IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrderQuery eamRepairOrderQuery) {
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
@@ -72,7 +73,7 @@
            //选择了设备，根据设备id过滤设备
            equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
        }
        return this.baseMapper.pageList(page, eamRepairOrder, sysUser.getId(), equipmentIds);
        return this.baseMapper.pageList(page, eamRepairOrderQuery, sysUser.getId(), equipmentIds);
    }

    @Override