From d4c5f8e7bf9b2bb48922396d1be5b2f274d8effb Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 16:43:21 +0800
Subject: [PATCH] 修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryIdModel.java | 12 +-
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 9 -
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryUserMapper.xml | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryUserService.java | 22 ++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/EamBaseRepairDepartController.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryMapper.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryMapper.xml | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryTreeModel.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactory.java | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java | 16 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRepDepRule.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java | 28 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java | 9 -
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryUserController.java | 6
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 32 +++++
/dev/null | 19 ---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactoryUser.java | 10 -
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryUserMapper.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryUserServiceImpl.java | 61 ++++++++++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java | 20 ++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java | 10 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/WorkShopOrgCodeProRule.java | 6
24 files changed, 179 insertions(+), 114 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryUserMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryUserMapper.xml
deleted file mode 100644
index 4362d52..0000000
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryUserMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.eam.base.mapper.BaseFactoryUserMapper">
-
-</mapper>
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryUserService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryUserService.java
deleted file mode 100644
index a280fdc..0000000
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryUserService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.eam.base.service;
-
-import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 璁惧杞﹂棿绠＄悊涓庣敤鎴�
- * @Author: jeecg-boot
- * @Date: 2025-06-30
- * @Version: V1.0
- */
-public interface IBaseFactoryUserService extends IService<BaseFactoryUser> {
-
-}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryUserServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryUserServiceImpl.java
deleted file mode 100644
index 9f300b2..0000000
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryUserServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.eam.base.service.impl;
-
-import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
-import org.jeecg.modules.eam.base.mapper.BaseFactoryUserMapper;
-import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 璁惧杞﹂棿绠＄悊涓庣敤鎴�
- * @Author: jeecg-boot
- * @Date: 2025-06-30
- * @Version: V1.0
- */
-@Service
-public class BaseFactoryUserServiceImpl extends ServiceImpl<BaseFactoryUserMapper, BaseFactoryUser> implements IBaseFactoryUserService {
-
-}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index cfb5b96..7a624fe 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.micrometer.core.instrument.binder.BaseUnits;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
@@ -15,10 +14,10 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
-import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
-import org.jeecg.modules.eam.base.service.IBaseFactoryService;
-import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
index 070541f..45016a3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -78,12 +77,4 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
-
- //鍒楄〃灞曠ず
- @TableField(exist = false)
- private String equipmentCode;
- @TableField(exist = false)
- private String equipmentName;
- @TableField(exist = false)
- private String equipmentModel;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java
index 72c9bbe..4d7b91f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationStandardMapper.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
/**
@@ -22,5 +20,5 @@
* @param queryWrapper
* @return
*/
- IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper);
+ IPage<EamTechnicalStatusEvaluationStandard> queryPageList(Page<EamTechnicalStatusEvaluationStandard> page, QueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
index bce9547..3c9f91a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -193,9 +193,7 @@
if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
//鍏堝垹闄ゆ鏌ラ」
standardDetailService.removeByStandardId(entity.getId());
- request.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setStandardId(entity.getId());
- });
+
//鏍规嵁鍒嗙被鍒ゆ柇鏄惁淇濆瓨
if(CommonConstant.STATUS_1.equals(entity.getHasOtherCheck())) {
//淇濆瓨鍏朵粬鍒嗙被
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java
similarity index 93%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryController.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java
index 4087258..9e6bd90 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryController.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.controller;
+package org.jeecg.modules.system.controller;
import java.util.Arrays;
import java.util.List;
@@ -7,10 +7,10 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
-import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
-import org.jeecg.modules.eam.base.model.WorkShopIdModel;
-import org.jeecg.modules.eam.base.service.IBaseFactoryService;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.service.IBaseFactoryService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -83,10 +83,10 @@
@AutoLog(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
@ApiOperation(value = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�", notes = "浜х嚎琛�-鏌ヨ鏍戝舰缁撴瀯鎵�鏈変骇绾垮悕绉�")
@GetMapping(value = "/queryIdTree")
- public Result<List<WorkShopIdModel>> queryIdTree() {
- Result<List<WorkShopIdModel>> result = new Result<>();
+ public Result<List<EamBaseFactoryIdModel>> queryIdTree() {
+ Result<List<EamBaseFactoryIdModel>> result = new Result<>();
try {
- List<WorkShopIdModel> list = BaseFactoryService.queryProductionIdTreeList();
+ List<EamBaseFactoryIdModel> list = BaseFactoryService.queryProductionIdTreeList();
result.setResult(list);
result.setSuccess(true);
} catch (Exception e) {
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryUserController.java
similarity index 97%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryUserController.java
index 2f1250a..e1cde13 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/BaseFactoryUserController.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.controller;
+package org.jeecg.modules.system.controller;
import java.util.Arrays;
import java.util.List;
@@ -7,8 +7,8 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
-import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/EamBaseRepairDepartController.java
similarity index 99%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/EamBaseRepairDepartController.java
index 59c7742..fca155b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/EamBaseRepairDepartController.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.controller;
+package org.jeecg.modules.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 769ee77..6e13dbd 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -27,10 +27,7 @@
import org.jeecg.common.util.*;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.model.DepartIdModel;
-import org.jeecg.modules.system.model.ProductionIdModel;
-import org.jeecg.modules.system.model.RepairDepartIdModel;
-import org.jeecg.modules.system.model.SysUserSysDepartModel;
+import org.jeecg.modules.system.model.*;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
import org.jeecg.modules.system.vo.SysUserRoleVO;
@@ -102,6 +99,9 @@
@Resource
private IEamBaseRepairDepartUserService eamBaseRepairDepartUserService;
+
+ @Resource
+ private IBaseFactoryUserService iBaseFactoryUserService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃鏁版嵁
@@ -458,6 +458,30 @@
}
}
+ @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁")
+ @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁")
+ @GetMapping(value = "/userBaseFactoryList")
+ public Result<List<EamBaseFactoryIdModel>> userBaseFactoryList(@RequestParam(name = "userId", required = true) String userId) {
+ Result<List<EamBaseFactoryIdModel>> result = new Result<>();
+ try {
+ List<EamBaseFactoryIdModel> repDepIdModelList = this.iBaseFactoryUserService.queryEamBaseFactoryIdsOfUser(userId);
+ if (repDepIdModelList != null && !repDepIdModelList.isEmpty()) {
+ result.setSuccess(true);
+ result.setMessage("鏌ユ壘鎴愬姛");
+ result.setResult(repDepIdModelList);
+ } else {
+ result.setSuccess(false);
+ result.setMessage("鏌ユ壘澶辫触");
+ }
+ return result;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ result.setSuccess(false);
+ result.setMessage("鏌ユ壘杩囩▼涓嚭鐜颁簡寮傚父: " + e.getMessage());
+ return result;
+ }
+ }
+
/**
* 鐢熸垚鍦ㄦ坊鍔犵敤鎴锋儏鍐典笅娌℃湁涓婚敭鐨勯棶棰�,杩斿洖缁欏墠绔�,鏍规嵁璇d缁戝畾閮ㄩ棬鏁版嵁
*
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactory.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactory.java
similarity index 94%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactory.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactory.java
index 3641e0c..a5a57f9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactory.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactory.java
@@ -1,16 +1,13 @@
-package org.jeecg.modules.eam.base.entity;
+package org.jeecg.modules.system.entity;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.util.Date;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactoryUser.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactoryUser.java
similarity index 77%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactoryUser.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactoryUser.java
index cfe2f91..06ab233 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/BaseFactoryUser.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/BaseFactoryUser.java
@@ -1,18 +1,12 @@
-package org.jeecg.modules.eam.base.entity;
+package org.jeecg.modules.system.entity;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryMapper.java
similarity index 70%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryMapper.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryMapper.java
index b8b1a56..8a03705 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryMapper.java
@@ -1,6 +1,6 @@
-package org.jeecg.modules.eam.base.mapper;
+package org.jeecg.modules.system.mapper;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryUserMapper.java
similarity index 71%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryUserMapper.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryUserMapper.java
index 540e1b3..d663efe 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/BaseFactoryUserMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/BaseFactoryUserMapper.java
@@ -1,6 +1,6 @@
-package org.jeecg.modules.eam.base.mapper;
+package org.jeecg.modules.system.mapper;
-import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryMapper.xml
similarity index 68%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryMapper.xml
index e488574..efd1ef5 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.eam.base.mapper.BaseFactoryMapper">
+<mapper namespace="org.jeecg.modules.system.mapper.BaseFactoryMapper">
</mapper>
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryUserMapper.xml
similarity index 67%
copy from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml
copy to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryUserMapper.xml
index e488574..1e51f67 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/BaseFactoryMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/BaseFactoryUserMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.eam.base.mapper.BaseFactoryMapper">
+<mapper namespace="org.jeecg.modules.system.mapper.BaseFactoryUserMapper">
</mapper>
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/WorkShopIdModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryIdModel.java
similarity index 76%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/WorkShopIdModel.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryIdModel.java
index 609a4a2..18c08c7 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/WorkShopIdModel.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryIdModel.java
@@ -1,9 +1,9 @@
-package org.jeecg.modules.eam.base.model;
+package org.jeecg.modules.system.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactory;
import java.io.Serializable;
import java.util.ArrayList;
@@ -18,7 +18,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-public class WorkShopIdModel implements Serializable {
+public class EamBaseFactoryIdModel implements Serializable {
private static final long serialVersionUID = 6403075134223338239L;
@@ -42,7 +42,7 @@
*/
private Boolean selectable = true;
- List<WorkShopIdModel> children = new ArrayList<>();
+ List<EamBaseFactoryIdModel> children = new ArrayList<>();
/**
* 灏咵amBaseFactoryTreeModel鐨勯儴鍒嗘暟鎹斁鍦ㄨ瀵硅薄褰撲腑
@@ -50,7 +50,7 @@
* @param treeModel
* @return
*/
- public WorkShopIdModel convert(EamBaseFactoryTreeModel treeModel) {
+ public EamBaseFactoryIdModel convert(EamBaseFactoryTreeModel treeModel) {
this.key = treeModel.getId();
this.value = treeModel.getId();
this.title = treeModel.getFactoryName();
@@ -62,7 +62,7 @@
*
* @return
*/
- public WorkShopIdModel convertByUserProduction(BaseFactory BaseFactory) {
+ public EamBaseFactoryIdModel convertByUserProduction(BaseFactory BaseFactory) {
this.key = BaseFactory.getId();
this.value = BaseFactory.getId();
this.title = BaseFactory.getFactoryName();
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/EamBaseFactoryTreeModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryTreeModel.java
similarity index 96%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/EamBaseFactoryTreeModel.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryTreeModel.java
index 1d0c674..175e3e6 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/EamBaseFactoryTreeModel.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseFactoryTreeModel.java
@@ -1,10 +1,10 @@
-package org.jeecg.modules.eam.base.model;
+package org.jeecg.modules.system.model;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactory;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRepDepRule.java
similarity index 98%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRepDepRule.java
index 9935b68..72cdb9a 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRepDepRule.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.rule;
+package org.jeecg.modules.system.rule;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
similarity index 80%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryService.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
index 396fd16..375b778 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IBaseFactoryService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryService.java
@@ -1,9 +1,9 @@
-package org.jeecg.modules.eam.base.service;
+package org.jeecg.modules.system.service;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactory;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
-import org.jeecg.modules.eam.base.model.WorkShopIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
import java.util.List;
@@ -40,7 +40,7 @@
/**
* 鏌ヨ鎵�鏈夐儴闂―epartId淇℃伅,骞跺垎鑺傜偣杩涜鏄剧ず
*/
- List<WorkShopIdModel> queryProductionIdTreeList();
+ List<EamBaseFactoryIdModel> queryProductionIdTreeList();
/**
* 鏇存柊浜х嚎鏁版嵁
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryUserService.java
new file mode 100644
index 0000000..d469c6d
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IBaseFactoryUserService.java
@@ -0,0 +1,22 @@
+package org.jeecg.modules.system.service;
+
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+
+import java.util.List;
+
+/**
+ * @Description: 璁惧杞﹂棿绠＄悊涓庣敤鎴�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-30
+ * @Version: V1.0
+ */
+public interface IBaseFactoryUserService extends IService<BaseFactoryUser> {
+
+ /**
+ * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎淇℃伅
+ */
+ List<EamBaseFactoryIdModel> queryEamBaseFactoryIdsOfUser(String userId);
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
similarity index 93%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
index 5790467..047ae84 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/BaseFactoryServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryServiceImpl.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.service.impl;
+package org.jeecg.modules.system.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
@@ -9,16 +9,16 @@
import org.jeecg.common.constant.FillRuleConstant;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
-import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
-import org.jeecg.modules.eam.base.mapper.BaseFactoryMapper;
-import org.jeecg.modules.eam.base.mapper.BaseFactoryUserMapper;
-import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
-import org.jeecg.modules.eam.base.model.WorkShopIdModel;
-import org.jeecg.modules.eam.base.service.IBaseFactoryService;
-import org.jeecg.modules.eam.base.util.FindsBaseFactorysChildrenUtil;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.mapper.BaseFactoryMapper;
+import org.jeecg.modules.system.mapper.BaseFactoryUserMapper;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
+import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.util.FindsBaseFactorysChildrenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -130,7 +130,7 @@
}
@Override
- public List<WorkShopIdModel> queryProductionIdTreeList() {
+ public List<EamBaseFactoryIdModel> queryProductionIdTreeList() {
LambdaQueryWrapper<BaseFactory> query = new LambdaQueryWrapper<>();
query.eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
query.orderByAsc(BaseFactory::getSorter);
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryUserServiceImpl.java
new file mode 100644
index 0000000..6b432bb
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/BaseFactoryUserServiceImpl.java
@@ -0,0 +1,61 @@
+package org.jeecg.modules.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.entity.BaseFactoryUser;
+import org.jeecg.modules.system.mapper.BaseFactoryUserMapper;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.service.IBaseFactoryService;
+import org.jeecg.modules.system.service.IBaseFactoryUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 璁惧杞﹂棿绠＄悊涓庣敤鎴�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-30
+ * @Version: V1.0
+ */
+@Service
+public class BaseFactoryUserServiceImpl extends ServiceImpl<BaseFactoryUserMapper, BaseFactoryUser> implements IBaseFactoryUserService {
+ @Autowired
+ private IBaseFactoryService iBaseFactoryService;
+
+ /**
+ * 鏍规嵁鎸囧畾鐢ㄦ埛id鏌ヨ浜х嚎淇℃伅
+ */
+ @Override
+ public List<EamBaseFactoryIdModel> queryEamBaseFactoryIdsOfUser(String userId){
+ LambdaQueryWrapper<BaseFactoryUser> queryUserRepDep = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<BaseFactory> queryRepDep = new LambdaQueryWrapper<>();
+ try {
+ queryUserRepDep.eq(BaseFactoryUser::getUserId, userId);
+ List<String> repRepDepIdList = new ArrayList<>();
+ List<EamBaseFactoryIdModel> repDepIdModelList = new ArrayList<>();
+ List<BaseFactoryUser> userRepDepList = this.list(queryUserRepDep);
+ if (userRepDepList != null && !userRepDepList.isEmpty()) {
+ for (BaseFactoryUser BaseFactoryUser : userRepDepList) {
+ repRepDepIdList.add(BaseFactoryUser.getFactoryId());
+ }
+ queryRepDep.in(BaseFactory::getId, repRepDepIdList);
+ List<BaseFactory> repDepList = iBaseFactoryService.list(queryRepDep);
+ if (repDepList != null && !repDepList.isEmpty()) {
+ for (BaseFactory BaseFactory : repDepList) {
+ repDepIdModelList.add(new EamBaseFactoryIdModel().convertByUserProduction(BaseFactory));
+ }
+ }
+ return repDepIdModelList;
+ }
+ } catch (Exception e) {
+ e.fillInStackTrace();
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java
similarity index 77%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java
index 3b812f2..4221a0b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java
@@ -1,10 +1,10 @@
-package org.jeecg.modules.eam.base.util;
+package org.jeecg.modules.system.util;
import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
-import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
-import org.jeecg.modules.eam.base.model.WorkShopIdModel;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
import java.util.ArrayList;
import java.util.List;
@@ -22,7 +22,7 @@
* 璇ユ柟娉曟槸s灏咮aseFactory绫诲瀷鐨刲ist闆嗗悎杞崲鎴怑amBaseFactoryTreeModel绫诲瀷鐨勯泦鍚�
*/
public static List<EamBaseFactoryTreeModel> wrapTreeDataToTreeList(List<BaseFactory> recordList) {
- List<WorkShopIdModel> idList = new ArrayList<>();
+ List<EamBaseFactoryIdModel> idList = new ArrayList<>();
List<EamBaseFactoryTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
BaseFactory BaseFactory = recordList.get(i);
@@ -40,17 +40,17 @@
* queryTreeList鐨勫瓙鏂规硶 ====1=====
* 璇ユ柟娉曟槸鎵惧埌骞跺皝瑁呴《绾х埗绫荤殑鑺傜偣鍒癟reeList闆嗗悎
*/
- public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> workShopIdModelList) {
+ public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> EamBaseFactoryIdModelList) {
List<EamBaseFactoryTreeModel> treeList = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
EamBaseFactoryTreeModel branch = recordList.get(i);
if (oConvertUtils.isEmpty(branch.getParentId())) {
treeList.add(branch);
- WorkShopIdModel WorkShopIdModel = new WorkShopIdModel().convert(branch);
- workShopIdModelList.add(WorkShopIdModel);
+ EamBaseFactoryIdModel EamBaseFactoryIdModel = new EamBaseFactoryIdModel().convert(branch);
+ EamBaseFactoryIdModelList.add(EamBaseFactoryIdModel);
}
}
- getGrandChildren(treeList, recordList, workShopIdModelList);
+ getGrandChildren(treeList, recordList, EamBaseFactoryIdModelList);
return treeList;
}
@@ -58,15 +58,15 @@
* queryTreeList鐨勫瓙鏂规硶====3====
*璇ユ柟娉曟槸鎵惧埌椤剁骇鐖剁被涓嬬殑鎵�鏈夊瓙鑺傜偣闆嗗悎骞跺皝瑁呭埌TreeList闆嗗悎
*/
- private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> idList) {
+ private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> idList) {
for (int i = 0; i < treeList.size(); i++) {
EamBaseFactoryTreeModel model = treeList.get(i);
- WorkShopIdModel idModel = idList.get(i);
+ EamBaseFactoryIdModel idModel = idList.get(i);
for (int i1 = 0; i1 < recordList.size(); i1++) {
EamBaseFactoryTreeModel m = recordList.get(i1);
if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
model.getChildren().add(m);
- WorkShopIdModel pim = new WorkShopIdModel().convert(m);
+ EamBaseFactoryIdModel pim = new EamBaseFactoryIdModel().convert(m);
idModel.setSelectable(false);
idModel.getChildren().add(pim);
}
@@ -95,8 +95,8 @@
/**
* 鑾峰彇 DepartIdModel
*/
- public static List<WorkShopIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
- List<WorkShopIdModel> idList = new ArrayList<>();
+ public static List<EamBaseFactoryIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
+ List<EamBaseFactoryIdModel> idList = new ArrayList<>();
List<EamBaseFactoryTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
BaseFactory BaseFactory = recordList.get(i);
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/WorkShopOrgCodeProRule.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/WorkShopOrgCodeProRule.java
similarity index 95%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/WorkShopOrgCodeProRule.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/WorkShopOrgCodeProRule.java
index f17a2e9..f78635a 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/WorkShopOrgCodeProRule.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/WorkShopOrgCodeProRule.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.util;
+package org.jeecg.modules.system.util;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,8 +6,8 @@
import org.jeecg.common.handler.IFillRuleHandler;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.YouBianCodeUtil;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
-import org.jeecg.modules.eam.base.service.IBaseFactoryService;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.service.IBaseFactoryService;
import java.util.ArrayList;
import java.util.List;
--
Gitblit v1.9.3