From 3de63514e769ac64da604a3e7e3262b33e653884 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 16 六月 2025 13:55:29 +0800
Subject: [PATCH] feat(eims): 新增修改密码功能并优化用户初始密码设置- 在 SocialAuthStrategy 中使用 BCrypt 对用户初始密码进行加密- 在 eims-ui-mobile 中添加修改密码页面和相关功能 - 更新用户服务以支持修改密码操作 - 调整页面路由以包含新功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintStServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintStServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintStServiceImpl.java
index 78f55ad..2d78c60 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintStServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintStServiceImpl.java
@@ -57,7 +57,37 @@
*/
@Override
public EimsMaintStVo queryById(Long id) {
- return baseMapper.selectVoById(id);
+ EimsMaintStVo stVo = baseMapper.selectVoById(id);
+ if(stVo!=null){
+ fillStDataSingle(stVo);
+ }
+ return stVo;
+ }
+ private void fillStDataSingle(EimsMaintStVo stVo) {
+
+ //1.濉厖璁惧
+ EimsEqu eimsEqu = equMapper.selectById(stVo.getEquId());
+ stVo.setAssetNo(eimsEqu.getAssetNo());
+ //2.缁熻鏁版嵁
+ LambdaQueryWrapper<EimsMaintOrder> orderLqw = Wrappers.lambdaQuery();
+ orderLqw.eq(EimsMaintOrder::getEquId, stVo.getEquId());
+ LocalDate planTime = stVo.getPlanTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate startOfMonth = planTime.with(TemporalAdjusters.firstDayOfMonth());
+ LocalDate endOfMonth = planTime.with(TemporalAdjusters.lastDayOfMonth());
+ orderLqw.between(EimsMaintOrder::getPlanTime, startOfMonth, endOfMonth);
+ // 鎵ц鏌ヨ
+ List<EimsMaintOrderVo> orderList = orderMapper.selectVoList(orderLqw);
+ // TODO 鏍规嵁瀛楀吀maint_order_status
+ Map<String, Long> cMap = orderList.stream()
+ .filter(order -> List.of("0", "1", "2", "3").contains(order.getStatus()))
+ .collect(Collectors.groupingBy(EimsMaintOrderVo::getStatus, Collectors.counting()));
+ stVo.setOrderCount(orderList.size());
+ stVo.setDbyCount(cMap.getOrDefault("0", 0L).intValue());
+ stVo.setByCount(cMap.getOrDefault("1", 0L).intValue());
+ stVo.setDyzCount(cMap.getOrDefault("2", 0L).intValue());
+ stVo.setWcCount(cMap.getOrDefault("3", 0L).intValue());
+
+
}
/**
--
Gitblit v1.9.3