From 3cd1dfdbca7e09d6df685f486d8bf9ab13b962e1 Mon Sep 17 00:00:00 2001 From: shih <510524130@qq.com> Date: Sat, 9 May 2026 17:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=99=BB=E9=99=86=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/report/bygl/ByglBygdBjPlugin.java | 78 ++++++++++--------- .../AddFaultReportingFunctionRecord.java | 2 +- .../system/controller/AuthController.java | 1 + .../vo/auth/AuthPermissionInfoRespVO.java | 3 + 4 files changed, 45 insertions(+), 39 deletions(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java index 3dfb9c2..8ac8d97 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java @@ -156,53 +156,55 @@ public class ByglBygdBjPlugin implements AroundAdvicePlugin { byManagementGdMapper.updateById(gd); String planId = gd.getPlanId(); - - //查询当前计划的工单 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ByManagementGd::getPlanId, planId); - wrapper.eq(ByManagementGd::getOrderState, ByglConstant.BY_STATE_YWC); - List byManagementGds = byManagementGdMapper.selectList(wrapper); + if(planId !=null){ + //查询当前计划的工单 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ByManagementGd::getPlanId, planId); + wrapper.eq(ByManagementGd::getOrderState, ByglConstant.BY_STATE_YWC); + List byManagementGds = byManagementGdMapper.selectList(wrapper); - //当前计划 - ByManagementPlan plan = byManagementPlanMapper.selectById(planId); + //当前计划 + ByManagementPlan plan = byManagementPlanMapper.selectById(planId); - //保养周期 - String interval = plan.getScheduledInterval(); - if("1".equals(interval)) {//周期为180天 - //如果有两条已完成的工单，则将计划状态修改为已完成 - if(byManagementGds.size() >= 2) { - plan.setPlanState(ByglConstant.JH_STATE_YWC); - byManagementPlanMapper.updateById(plan); - }else{ - String planUpkeepTime = gd.getPlanUpkeepTime(); - // 解析完成时间（只有日期部分，需要转换为LocalDateTime） - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate completeLocalDate = LocalDate.parse(planUpkeepTime, formatter); - LocalDateTime completeDate = completeLocalDate.atStartOfDay(); - - // 往后推180天 - LocalDateTime nextMaintenanceDate = adjustToNextMonthFirstDayIfNeeded(completeDate.plusDays(180)); - - // 判断是否超过本年 - int completeYear = completeDate.getYear(); - int nextMaintenanceYear = nextMaintenanceDate.getYear(); - boolean isCrossYear = nextMaintenanceYear > completeYear; - - if(isCrossYear){ + //保养周期 + String interval = plan.getScheduledInterval(); + if("1".equals(interval)) {//周期为180天 + //如果有两条已完成的工单，则将计划状态修改为已完成 + if(byManagementGds.size() >= 2) { plan.setPlanState(ByglConstant.JH_STATE_YWC); byManagementPlanMapper.updateById(plan); }else{ - DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String nextMaintenanceDateStr = nextMaintenanceDate.format(dateFormatter); - plan.setNextUpkeepTime(nextMaintenanceDateStr); - byManagementPlanMapper.updateById(plan); + String planUpkeepTime = gd.getPlanUpkeepTime(); + // 解析完成时间（只有日期部分，需要转换为LocalDateTime） + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate completeLocalDate = LocalDate.parse(planUpkeepTime, formatter); + LocalDateTime completeDate = completeLocalDate.atStartOfDay(); + + // 往后推180天 + LocalDateTime nextMaintenanceDate = adjustToNextMonthFirstDayIfNeeded(completeDate.plusDays(180)); + + // 判断是否超过本年 + int completeYear = completeDate.getYear(); + int nextMaintenanceYear = nextMaintenanceDate.getYear(); + boolean isCrossYear = nextMaintenanceYear > completeYear; + + if(isCrossYear){ + plan.setPlanState(ByglConstant.JH_STATE_YWC); + byManagementPlanMapper.updateById(plan); + }else{ + DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String nextMaintenanceDateStr = nextMaintenanceDate.format(dateFormatter); + plan.setNextUpkeepTime(nextMaintenanceDateStr); + byManagementPlanMapper.updateById(plan); + } } + }else if("2".equals(interval)) {//周期为360天 + plan.setPlanState(ByglConstant.JH_STATE_YWC); + byManagementPlanMapper.updateById(plan); } - }else if("2".equals(interval)) {//周期为360天 - plan.setPlanState(ByglConstant.JH_STATE_YWC); - byManagementPlanMapper.updateById(plan); } + //都验收成功 生成记录 ByManagementJl jl = BeanUtils.toBean(ys, ByManagementJl.class); jl.setId(null); diff --git a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/maintenance/AddFaultReportingFunctionRecord.java b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/maintenance/AddFaultReportingFunctionRecord.java index 3b85319..c98b856 100644 --- a/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/maintenance/AddFaultReportingFunctionRecord.java +++ b/lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/maintenance/AddFaultReportingFunctionRecord.java @@ -68,7 +68,7 @@ public class AddFaultReportingFunctionRecord implements AroundAdvicePlugin { devGzbxDO.setFaultNumber(faultNumber); devGzbxDO.setLeaderUserId(leaderUserId); devGzbxDO.setReporter(userId); - devGzbxDO.setCreateUserName(adapterMapper.getNickname(userId)); +// devGzbxDO.setCreateUserName(adapterMapper.getNickname(userId)); devGzbxMapper.updateById(devGzbxDO); } diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java index 847af0f..89acde2 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java @@ -245,6 +245,7 @@ public class AuthController { userVo.setSupAdmin(supAdminFlag);//是否是超级管理员 userVo.setTenantAdmin(tenantAdminFlag);//是否是租户管理员 userVo.setSupAdminToken(isSupAdmin()); + userVo.setMobile(user.getMobile()); return success(vo); } diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/auth/AuthPermissionInfoRespVO.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/auth/AuthPermissionInfoRespVO.java index 072bfa2..2b845b4 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/auth/AuthPermissionInfoRespVO.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/auth/AuthPermissionInfoRespVO.java @@ -54,6 +54,9 @@ public class AuthPermissionInfoRespVO { @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048") private Set deptId; + @Schema(description = "手机号码", example = "15601691300") + private String mobile; + private Long loginDeptId; private Long loginRoleId;