admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录后前端获取登陆人信息加入手机号码字段

Browse Source
This commit is contained in:
shih
2026-05-09 17:54:39 +08:00
parent 82cb7ef34d
commit 3cd1dfdbca
4 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java
View File

@@ -156,53 +156,55 @@ public class ByglBygdBjPlugin implements AroundAdvicePlugin {
byManagementGdMapper.updateById(gd); byManagementGdMapper.updateById(gd);
String planId = gd.getPlanId(); String planId = gd.getPlanId();
if(planId !=null){
//查询当前计划的工单 //查询当前计划的工单
LambdaQueryWrapper<ByManagementGd> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ByManagementGd> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ByManagementGd::getPlanId, planId); wrapper.eq(ByManagementGd::getPlanId, planId);
wrapper.eq(ByManagementGd::getOrderState, ByglConstant.BY_STATE_YWC); wrapper.eq(ByManagementGd::getOrderState, ByglConstant.BY_STATE_YWC);
List<ByManagementGd> byManagementGds = byManagementGdMapper.selectList(wrapper); List<ByManagementGd> byManagementGds = byManagementGdMapper.selectList(wrapper);
//当前计划 //当前计划
ByManagementPlan plan = byManagementPlanMapper.selectById(planId); ByManagementPlan plan = byManagementPlanMapper.selectById(planId);
//保养周期 //保养周期
String interval = plan.getScheduledInterval(); String interval = plan.getScheduledInterval();
if("1".equals(interval)) {//周期为180天 if("1".equals(interval)) {//周期为180天
//如果有两条已完成的工单，则将计划状态修改为已完成 //如果有两条已完成的工单，则将计划状态修改为已完成
if(byManagementGds.size() >= 2) { 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){
plan.setPlanState(ByglConstant.JH_STATE_YWC); plan.setPlanState(ByglConstant.JH_STATE_YWC);
byManagementPlanMapper.updateById(plan); byManagementPlanMapper.updateById(plan);
}else{ }else{
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String planUpkeepTime = gd.getPlanUpkeepTime();
String nextMaintenanceDateStr = nextMaintenanceDate.format(dateFormatter); // 解析完成时间（只有日期部分，需要转换为LocalDateTime）
plan.setNextUpkeepTime(nextMaintenanceDateStr); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
byManagementPlanMapper.updateById(plan); 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); ByManagementJl jl = BeanUtils.toBean(ys, ByManagementJl.class);
jl.setId(null); jl.setId(null);

2
lidee-module/lidee-module-biz/src/main/java/com/lideeyunji/module/biz/controller/maintenance/AddFaultReportingFunctionRecord.java
View File

@@ -68,7 +68,7 @@ public class AddFaultReportingFunctionRecord implements AroundAdvicePlugin {
devGzbxDO.setFaultNumber(faultNumber); devGzbxDO.setFaultNumber(faultNumber);
devGzbxDO.setLeaderUserId(leaderUserId); devGzbxDO.setLeaderUserId(leaderUserId);
devGzbxDO.setReporter(userId); devGzbxDO.setReporter(userId);
devGzbxDO.setCreateUserName(adapterMapper.getNickname(userId)); // devGzbxDO.setCreateUserName(adapterMapper.getNickname(userId));
devGzbxMapper.updateById(devGzbxDO); devGzbxMapper.updateById(devGzbxDO);
} }

1
lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java
View File

@@ -245,6 +245,7 @@ public class AuthController {
userVo.setSupAdmin(supAdminFlag);//是否是超级管理员 userVo.setSupAdmin(supAdminFlag);//是否是超级管理员
userVo.setTenantAdmin(tenantAdminFlag);//是否是租户管理员 userVo.setTenantAdmin(tenantAdminFlag);//是否是租户管理员
userVo.setSupAdminToken(isSupAdmin()); userVo.setSupAdminToken(isSupAdmin());
userVo.setMobile(user.getMobile());
return success(vo); return success(vo);
} }

3
lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/auth/AuthPermissionInfoRespVO.java
View File

@@ -54,6 +54,9 @@ public class AuthPermissionInfoRespVO {
@Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048") @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private Set<Long> deptId; private Set<Long> deptId;
@Schema(description = "手机号码", example = "15601691300")
private String mobile;
private Long loginDeptId; private Long loginDeptId;
private Long loginRoleId; private Long loginRoleId;