From 134404768b4628e58693a31817f1087901de3341 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 01 七月 2025 17:28:11 +0800
Subject: [PATCH] 维修部门班组
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/util/WorkShopOrgCodeProRule.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java
similarity index 67%
copy from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/util/WorkShopOrgCodeProRule.java
copy to lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java
index 07d8ffc..485a926 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/util/WorkShopOrgCodeProRule.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.eam.base.controller.util;
+package org.jeecg.modules.eam.base.rule;
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.MdcProduction;
+import org.jeecg.modules.system.service.IMdcProductionService;
import java.util.ArrayList;
import java.util.List;
@@ -17,16 +17,16 @@
* @create: 2023-07-04 16:15
* @Description: 杞﹂棿鏈烘瀯缂栫爜鐢熸垚瑙勫垯
*/
-public class WorkShopOrgCodeProRule implements IFillRuleHandler {
+public class OrgCodeProRule implements IFillRuleHandler {
@Override
public Object execute(JSONObject params, JSONObject formData) {
- IBaseFactoryService BaseFactoryService = (IBaseFactoryService) SpringContextUtils.getBean("BaseFactoryServiceImpl");
+ IMdcProductionService mdcProductionService = (IMdcProductionService) SpringContextUtils.getBean("mdcProductionServiceImpl");
- LambdaQueryWrapper<BaseFactory> query = new LambdaQueryWrapper<BaseFactory>();
- LambdaQueryWrapper<BaseFactory> query1 = new LambdaQueryWrapper<BaseFactory>();
- // 鍒涘缓涓�涓狶ist闆嗗悎,瀛樺偍鏌ヨ杩斿洖鐨勬墍鏈塀aseFactory瀵硅薄
- List<BaseFactory> BaseFactoryList = new ArrayList<>();
+ LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
+ LambdaQueryWrapper<MdcProduction> query1 = new LambdaQueryWrapper<MdcProduction>();
+ // 鍒涘缓涓�涓狶ist闆嗗悎,瀛樺偍鏌ヨ杩斿洖鐨勬墍鏈塎dcProduction瀵硅薄
+ List<MdcProduction> mdcProductionList = new ArrayList<>();
String[] strArray = new String[2];
//瀹氫箟杞﹂棿绫诲瀷
String orgType = "";
@@ -53,28 +53,28 @@
//濡傛灉鏄渶楂樼骇,鍒欐煡璇㈠嚭鍚岀骇鐨刼rg_code, 璋冪敤宸ュ叿绫荤敓鎴愮紪鐮佸苟杩斿洖
if (StringUtil.isNullOrEmpty(parentId)) {
// 绾垮垽鏂暟鎹簱涓殑琛ㄦ槸鍚︿负绌�,绌哄垯鐩存帴杩斿洖鍒濆缂栫爜
- query1.eq(BaseFactory::getParentId, "").or().isNull(BaseFactory::getParentId);
- query1.orderByDesc(BaseFactory::getOrgCode);
- BaseFactoryList = BaseFactoryService.list(query1);
- if (BaseFactoryList == null || BaseFactoryList.size() == 0) {
+ query1.eq(MdcProduction::getParentId, "").or().isNull(MdcProduction::getParentId);
+ query1.orderByDesc(MdcProduction::getOrgCode);
+ mdcProductionList = mdcProductionService.list(query1);
+ if (mdcProductionList == null || mdcProductionList.size() == 0) {
strArray[0] = YouBianCodeUtil.getNextYouBianCode(null);
strArray[1] = "1";
return strArray;
} else {
- BaseFactory BaseFactory = BaseFactoryList.get(0);
- oldOrgCode = BaseFactory.getOrgCode();
- orgType = BaseFactory.getOrgType();
+ MdcProduction mdcProduction = mdcProductionList.get(0);
+ oldOrgCode = mdcProduction.getOrgCode();
+ orgType = mdcProduction.getOrgType();
newOrgCode = YouBianCodeUtil.getNextYouBianCode(oldOrgCode);
}
} else {//鍙嶄箣鍒欐煡璇㈠嚭鎵�鏈夊悓绾х殑杞﹂棿,鑾峰彇缁撴灉鍚庢湁涓ょ鎯呭喌,鏈夊悓绾у拰娌℃湁鍚岀骇
// 灏佽鏌ヨ鍚岀骇鐨勬潯浠�
- query.eq(BaseFactory::getParentId, parentId);
+ query.eq(MdcProduction::getParentId, parentId);
// 闄嶅簭鎺掑簭
- query.orderByDesc(BaseFactory::getOrgCode);
+ query.orderByDesc(MdcProduction::getOrgCode);
// 鏌ヨ鍑哄悓绾т骇绾跨殑闆嗗悎
- List<BaseFactory> parentList = BaseFactoryService.list(query);
+ List<MdcProduction> parentList = mdcProductionService.list(query);
// 鏌ヨ鍑虹埗绾т骇绾�
- BaseFactory production = BaseFactoryService.getById(parentId);
+ MdcProduction production = mdcProductionService.getById(parentId);
// 鑾峰彇鐖剁骇浜х嚎鐨刢ode
String parentCode = production.getOrgCode();
// 鏍规嵁鐖剁骇浜х嚎绫诲瀷绠楀嚭褰撳墠浜х嚎鐨勭被鍨�
--
Gitblit v1.9.3