修改

qushaowei

2024-03-18 7c5b03f261845c4e0ec2b4f1f59e21222d055232

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

@@ -852,20 +852,20 @@
                String orgType = calibrationOrderService.findOrgType(productionCode);
                if(ORG_TYPE_2.equals(orgType)){
                    Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
                    list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
                    list = calibrationOrderService.getThisMonthMaintenanceList(area.getId(),"");
                }else if(ORG_TYPE_3.equals(orgType)){
                    Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
                    list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
                    list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
                }
            }
        }else if(USER_TYPE_3.equals(userType)){
            String code = calibrationOrderService.findProductionCode(user.getId());
            if(StringUtils.isBlank(productionCode)){
                Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
                list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
                list = calibrationOrderService.getThisMonthMaintenanceList(area.getId(),"");
            }else{
                Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
                list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
                list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
            }
        }
        return Result.ok(list);
@@ -981,8 +981,8 @@
     * qsw 2024-3-15
     */
    @GetMapping("getTwoMaintenancePlanList")
    public Result<?> getTwoMaintenancePlanList() {
        List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList();
    public Result<?> getTwoMaintenancePlanList(String productionCode) {
        List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList(productionCode);
        return Result.ok();
    }