设备管理 设备保养 bug修改

qushaowei

2023-08-29 0b552dd61546bb5e577d9adb35b09046ebf64341

设备管理 设备保养  bug修改

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

@@ -128,7 +128,7 @@
     */
    @PostMapping(value = "/addNew")
    public Result<String> addNew(@RequestBody MaintenanceCycle maintenanceCycle) {
        String cycleUnit = sysBaseApi.queryDictTextByKey("cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
        String cycleUnit = sysBaseApi.queryDictTextByKey("maintenance_cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
        maintenanceCycle.setName(String.valueOf(maintenanceCycle.getCycle()).concat(cycleUnit));
        maintenanceCycleService.save(maintenanceCycle);
        return Result.OK("添加成功！");

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

@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.eam.mapper.SpecialtyMaintenanceOrderMapper">

    <select id="getSpecialtyMaintenanceOrderList"  parameterType="Map" resultType="Map">
        SELECT
        SELECT DISTINCT
            t1.id,
            t1.num,
            t1.status,
@@ -39,8 +39,8 @@
        LEFT JOIN mom_eam_maintenance_type t9 ON t9.id = t2.maintenance_type_id
        left join sys_user t10 on t1.recipient_user_id = t10.id
        left join sys_user t12 on t1.maintenance_user_id = t12.id
        left join (select * from mom_eam_specialty_maintenance_order_detail where del_flag = 0) t13 on t13.specialty_maintenance_order_id = t1.id
        left join (select * from mom_eam_maintenance_project where del_flag = 0) t14 on t14.id = t13.maintenance_project_id
--         left join (select * from mom_eam_specialty_maintenance_order_detail where del_flag = 0) t13 on t13.specialty_maintenance_order_id = t1.id
--         left join (select * from mom_eam_maintenance_project where del_flag = 0) t14 on t14.id = t13.maintenance_project_id
        WHERE t1.del_flag = 0 and t2.del_flag = 0 and t8.del_flag = 0 and t9.del_flag = 0
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1384,7 +1384,10 @@
    @Override
    public String getUnitNameById(String unitId) {
        Unit unit = unitService.getById(unitId);
        String unitName = unit.getName();
        String unitName = "";
        if(unit != null){
            unitName = unit.getName();
        }
        return unitName;
    }