xg

“linengliang”

2024-03-13 b77715ee09b86d890c9ecde249db60cf1eaced2f

xg

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

@@ -22,5 +22,5 @@
     * @param isConfirm
     * @return
     */
   List<FaultInfo> myPage(Page<FaultInfo> page,@Param("num") String num,@Param("isConfirm")String isConfirm);
   List<FaultInfo> myPage(Page<FaultInfo> page,@Param("num") String num,@Param("isConfirm")String isConfirm,@Param("id") String id);
}

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

@@ -23,6 +23,6 @@
     * @param reportNum
     * @return
     */
    List<QuanlityConfirm> myPage(Page<QuanlityConfirm> page,@Param("num")String num,@Param("reportNum")String reportNum,@Param("equipmentNum") String equipmentNum);
    List<QuanlityConfirm> myPage(Page<QuanlityConfirm> page,@Param("num")String num,@Param("reportNum")String reportNum,@Param("equipmentNum") String equipmentNum,@Param("id") String id);

}

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

@@ -38,11 +38,17 @@
        t4.item_text urgencyName,
        t5.item_text statusName,
        t6.item_text isStopName,
        t7.item_text errUda1_dictText
        t7.item_text errUda1_dictText,
        t8.id quanlityId,
        t9.id faultInfoId,
        t8.is_confirm isConfirm1,
        t9.is_confirm isConfirm2
        FROM
        mom_eam_equipment_report_repair t1
        left join mom_eam_equipment t2 on t1.equipment_id = t2.id
        left join sys_depart t3 on t1.use_depart_id = t3.id
        left join mom_eam_quanlity_confirm t8 on t1.id = t8.report_id
        left join mom_eam_fault_info t9 on t8.id = t9.quanlity_id
        left join (select * from v_sys_dict where dict_code='urgency') t4 on t1.urgency = t4.item_value
        left join (select * from v_sys_dict where dict_code='equipment_report_repair_status') t5 on t1.status = t5.item_value
        left join (select * from v_sys_dict where dict_code='is_stop') t6 on t1.is_stop = t6.item_value

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

@@ -58,5 +58,9 @@
            <if test="isConfirm != null and isConfirm != ''">
                and t1.is_confirm = #{isConfirm}
            </if>
--             根据id
            <if test="id != null and id != ''">
                and t1.id = #{id}
            </if>
    </select>
</mapper>

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

@@ -34,5 +34,8 @@
            <if test="equipmentNum != null and equipmentNum != ''">
                and t3.num like concat('%',#{equipmentNum},'%')
            </if>
            <if test="id != null and id != ''">
                and t1.id = #{id}
            </if>
    </select>
</mapper>

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

@@ -18,6 +18,6 @@
public class FaultInfoServiceImpl extends ServiceImpl<FaultInfoMapper, FaultInfo> implements IFaultInfoService {
    @Override
    public Page<FaultInfo> myPage(Page<FaultInfo> page, FaultInfo faultInfo) {
        return page.setRecords(baseMapper.myPage(page,faultInfo.getNum(),faultInfo.getIsConfirm()));
        return page.setRecords(baseMapper.myPage(page,faultInfo.getNum(),faultInfo.getIsConfirm(),faultInfo.getId()));
    }
}

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

@@ -19,6 +19,6 @@

    @Override
    public Page<QuanlityConfirm> myPage(Page<QuanlityConfirm> page, QuanlityConfirm quanlityConfirm) {
        return page.setRecords(baseMapper.myPage(page,quanlityConfirm.getNum(),quanlityConfirm.getReportNum(),quanlityConfirm.getEquipmentNum()));
        return page.setRecords(baseMapper.myPage(page,quanlityConfirm.getNum(),quanlityConfirm.getReportNum(),quanlityConfirm.getEquipmentNum(),quanlityConfirm.getId()));
    }
}