Merge remote-tracking branch 'origin/master'

Lius

2024-03-14 ae5544f8a02a36a51989a5bccb994c7f542aeb74

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

@@ -676,7 +676,68 @@
    }

    /**
     *首页技术状态数量统计
     *首页公司级 技术状态数量统计
     * qsw 2024-3-13
     */
    @GetMapping("getFactoryEquipmentTechnologyStatusList")
    public Result<?> getFactoryEquipmentTechnologyStatusList() {
        List<Map<String, Object>> list = calibrationOrderService.getFactoryEquipmentTechnologyStatusList();
        return Result.ok(list);
    }

    /**
     *首页公司级 设备报修情况统计
     * qsw 2024-3-13
     */
    @GetMapping("getFactoryReportRepairEquipmentList")
    public Result<?> getFactoryReportRepairEquipmentList() {
        List<Map<String, Object>> list = calibrationOrderService.getFactoryReportRepairEquipmentList();
        return Result.ok(list);
    }

    /**
     *首页公司级 本月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getFactoryThisMonthMaintenanceList")
    public Result<?> getFactoryThisMonthMaintenanceList() {
        List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceList();
        return Result.ok(list);
    }

    /**
     *首页公司级 下月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getFactoryNextMonthMaintenanceList")
    public Result<?> getFactoryNextMonthMaintenanceList() {
        List<Map<String, Object>> list = calibrationOrderService.getFactoryNextMonthMaintenanceList();
        return Result.ok(list);
    }

    /**
     *首页公司级 本月三保完成数量
     * qsw 2024-3-14
     */
    @GetMapping("getFactoryThisMonthMaintenanceFinishList")
    public Result<?> getFactoryThisMonthMaintenanceFinishList() {
        List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceFinishList();
        return Result.ok(list);
    }

    /**
     *首页公司级 下下月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getFactoryNextNextMonthMaintenanceList")
    public Result<?> getFactoryNextNextMonthMaintenanceList() {
        List<Map<String, Object>> list = calibrationOrderService.getFactoryNextNextMonthMaintenanceList();
        return Result.ok(list);
    }


    /**
     *首页（二级页面）技术状态数量统计
     * qsw 2024-3-13
     */
    @GetMapping("getEquipmentTechnologyStatusList")
@@ -692,7 +753,7 @@
    }

    /**
     *首页设备报修情况统计
     *首页（二级页面）设备报修情况统计
     * qsw 2024-3-13
     */
    @GetMapping("getReportRepairEquipmentList")
@@ -708,7 +769,7 @@
    }

    /**
     *首页本月三保计划
     *首页（二级页面）本月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getThisMonthMaintenanceList")
@@ -724,7 +785,7 @@
    }

    /**
     *首页下月三保计划
     *首页（二级页面）下月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getNextMonthMaintenanceList")
@@ -740,7 +801,7 @@
    }

    /**
     *首页下下月三保计划
     *首页（二级页面）下下月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getNextNextMonthMaintenanceList")
@@ -755,4 +816,20 @@
        return Result.ok(list);
    }

    /**
     *首页（二级页面）本月三保完成数量
     * qsw 2024-3-14
     */
    @GetMapping("getThisMonthMaintenanceFinishList")
    public Result<?> getThisMonthMaintenanceFinishList(@Param("factoryNum") String factoryNum) {
        List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
        List<Map<String, Object>> list;
        if(areaList.size()>0){
            list = calibrationOrderService.getThisMonthMaintenanceFinishList(areaList.get(0).getId());
        }else{
            list = null;
        }
        return Result.ok(list);
    }

}