Merge remote-tracking branch 'origin/master'

Lius

2024-03-14 ae5544f8a02a36a51989a5bccb994c7f542aeb74

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

@@ -88,6 +88,9 @@
//    private IUploadService uploadService;

    private ISysBaseAPI  sysBaseApi;

    @Autowired
    private IAreaService areaService;
    /**
     * 分页列表查询
     *
@@ -478,7 +481,7 @@
                record.setEquipmentModel(equipment.getModel());
                record.setEquipmentSpecification(equipment.getSpecification());
                record.setEquipmentImportance(equipment.getEquipmentImportanceId());
                record.setUseDepartName(depart.getDepartName());
                record.setUseDepartName(ObjectUtils.isNotNull(depart)?depart.getDepartName():"");
            }
//            List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
//            record.setPrecisionParameterList(precisionParameterList);
@@ -671,4 +674,162 @@
        calibrationOrderService.updateById(calibrationOrder);
        return Result.OK("编辑成功!");
    }

    /**
     *首页公司级 技术状态数量统计
     * 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")
    public Result<?> getEquipmentTechnologyStatusList(@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.getEquipmentTechnologyStatusList(areaList.get(0).getId());
        }else{
            list = null;
        }
        return Result.ok(list);
    }

    /**
     *首页（二级页面）设备报修情况统计
     * qsw 2024-3-13
     */
    @GetMapping("getReportRepairEquipmentList")
    public Result<?> getReportRepairEquipmentList(@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.getReportRepairEquipmentList(areaList.get(0).getId());
        }else{
            list = null;
        }
        return Result.ok(list);
    }

    /**
     *首页（二级页面）本月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getThisMonthMaintenanceList")
    public Result<?> getThisMonthMaintenanceList(@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.getThisMonthMaintenanceList(areaList.get(0).getId());
        }else{
            list = null;
        }
        return Result.ok(list);
    }

    /**
     *首页（二级页面）下月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getNextMonthMaintenanceList")
    public Result<?> getNextMonthMaintenanceList(@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.getNextMonthMaintenanceList(areaList.get(0).getId());
        }else{
            list = null;
        }
        return Result.ok(list);
    }

    /**
     *首页（二级页面）下下月三保计划
     * qsw 2024-3-14
     */
    @GetMapping("getNextNextMonthMaintenanceList")
    public Result<?> getNextNextMonthMaintenanceList(@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.getNextNextMonthMaintenanceList(areaList.get(0).getId());
        }else{
            list = null;
        }
        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);
    }

}