修改

“linengliang”

2023-12-13 da3078e5241ff564e2581370d499a853f7ec8ee3

修改

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

@@ -396,6 +396,8 @@
    private String isJudging;
    @Dict(dicCode = "is_product")
    private String isLine;
    @Dict(dicCode = "is_product")
    private String nums;


}

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

@@ -81,6 +81,7 @@
                                        @Param("lineId")String lineId,
                                        @Param("isLineEquip")String isLineEquip,
                                       @Param("isLine")String isLine,
                                       @Param("equipNums") List<String> equipNums,
                                       @Param("sql")String sql
    );
    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);

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

@@ -298,6 +298,12 @@
        <if test="specificEquipment != null and  specificEquipment != ''">
            and t1.specific_equipment = #{specificEquipment}
        </if>
        <if test="equipNums.size!=0">
            and t1.num in
            <foreach collection="equipNums" open="(" separator="," close=")" item="num">
                #{num}
            </foreach>
        </if>
        <if test="warrantyStart != null">
            and DATEDIFF(day,t1.warranty_start,#{warrantyStart})=0
        </if>

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
@@ -14,8 +15,11 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @Description: mom_eam_equipment
@@ -100,6 +104,10 @@
    @Override
    public Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment) {
        String sql = equipment.getEquipmentCategoryUda1();
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(equipment.getNums())){
            equipNums = Arrays.asList(equipment.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        return page.setRecords(baseMapper.getEquipmentList(
                page,
                equipment.getNum(),
@@ -118,6 +126,7 @@
                equipment.getLineId(),
                equipment.getIsLineEquip(),
                equipment.getIsLine(),
                equipNums,
                sql
        ));
    }

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

@@ -23,6 +23,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: equipment_report_repair
@@ -104,7 +105,7 @@
        }
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank((String)params.get("nums"))){
            equipNums = Arrays.asList(((String) params.get("nums")).trim().split(","));
            equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        return super.getBaseMapper().getReportRepairList(pageData, params,equipNums) ;
    }

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

@@ -29,6 +29,7 @@
import java.text.SimpleDateFormat;
import java.time.YearMonth;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: 维修工单
@@ -102,7 +103,7 @@
        }
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(repairOrder.getNums())){
            equipNums = Arrays.asList(repairOrder.getNums().trim().split(","));
            equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        return page.setRecords(baseMapper.getRepairOrderList(page,repairOrder.getId(),repairOrder.getNum(),repairOrder.getEquipmentNum(),repairOrder.getEquipmentName(),repairOrder.getStatus(),repairOrder.getRepairOrderType(),repairOrder.getEquipmentCategoryId(),repairOrder.getFactoryModelId(),repairOrder.getSpecificEquipment(),repairOrder.getTeamId(),equipNums,repairOrder.getRepairOrderUda1()));
    }