From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
index 6bb937f..ea7c0ef 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
@@ -1,10 +1,7 @@
package com.mes.md.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.engineering.entity.Engineering;
import com.mes.md.entity.*;
import com.mes.md.mapper.AccountMapper;
import com.mes.md.mapper.RoleMapper;
@@ -50,6 +47,7 @@
.selectAs(RoleMenu::getMenuId,"menu_id")
.selectAs(RoleMenu::getPageId,"page_id")
.selectAs(RoleMenu::getMenuSequence,"remark")
+ .selectAs(RoleMenu::getParams,"params")
.selectAs(Menu::getMenuName,"menu_name")
.selectAs(Menu::getMenuNumber,"menu_number")
.selectAs(Menu::getRemark,"menu_remark")
@@ -75,7 +73,6 @@
accountRole.put("account",frist.get("account").toString());
accountRole.put("role_id",frist.get("role_id").toString());
for (Map<String,Object> item:username){
-
if(keyMenus.contains(item.get("menu_id").toString())){
//瀛樺湪姝よ彍鍗�
int index=keyMenus.indexOf(item.get("menu_id").toString());
@@ -89,12 +86,14 @@
page.put("page_number",item.get("page_number"));
page.put("page_url",item.get("page_url"));
page.put("menu_sequence",item.get("menu_sequence"));
+ page.put("params",item.get("params"));
thisPages.add(page);
thisMenu.put("pages",thisPages);
thisMenus.set(index,thisMenu);
accountRole.put("menus",thisMenus);
- }else if(keyMenus.size()>0){
+ }else if(keyMenus.size()>0&&!keyMenus.contains(item.get("menu_id").toString())){
//涓嶅瓨鍦ㄦ鑿滃崟
+ keyMenus.add(item.get("menu_id").toString());
List<Map<String, Object>> thisMenus= (List<Map<String, Object>>) accountRole.get("menus");
Map<String, Object> thisMenu=new HashMap<>();
thisMenu.put("menu_id",item.get("menu_id"));
@@ -109,6 +108,7 @@
page.put("page_number",item.get("page_number"));
page.put("page_url",item.get("page_url"));
page.put("menu_sequence",item.get("menu_sequence"));
+ page.put("params",item.get("params"));
thisPages.add(page);
thisMenu.put("pages",thisPages);
thisMenus.add(thisMenu);
@@ -130,6 +130,7 @@
page.put("page_number",item.get("page_number"));
page.put("page_url",item.get("page_url"));
page.put("menu_sequence",item.get("menu_sequence"));
+ page.put("params",item.get("params"));
pages.add(page);
menu.put("pages",pages);
menus.add(menu);
@@ -158,6 +159,7 @@
*/
@Override
public int addAccount(Account account){
+
return baseMapper.insert(account);
}
/**
--
Gitblit v1.8.0