From 9185957c0709a89c4810b6ee272de06a79752c92 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 01 七月 2025 17:37:08 +0800
Subject: [PATCH] 维修部门班组层级编码生成规则
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/EamBaseRepairDepartTreeModel.java | 22 ++--
/dev/null | 98 ------------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java | 98 ++++++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java | 4
4 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/EamBaseRepairDepartTreeModel.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/EamBaseRepairDepartTreeModel.java
index 82b3627..ec94847 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/EamBaseRepairDepartTreeModel.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/EamBaseRepairDepartTreeModel.java
@@ -24,12 +24,12 @@
private static final long serialVersionUID = 5098613810355342955L;
/**
- * 瀵瑰簲SysMaintainDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey
+ * 瀵瑰簲EamBaseRepairDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨刱ey
*/
private String key;
/**
- * 瀵瑰簲SysMaintainDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨剉alue
+ * 瀵瑰簲EamBaseRepairDepart涓殑id瀛楁,鍓嶇鏁版嵁鏍戜腑鐨剉alue
*/
private String value;
@@ -39,17 +39,17 @@
private String title;
private boolean isLeaf;
- //浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶴ysMaintainDepart鐩稿悓
+ //浠ヤ笅鎵�鏈夊瓧娈靛潎涓嶦amBaseRepairDepart鐩稿悓
private String id;
private String parentId;
- private String maintainName;
+ private String departName;
- private String maintainNameAbbr;
+ private String departNameAbbr;
- private Integer maintainOrder;
+ private Integer departOrder;
private String description;
@@ -57,7 +57,7 @@
private String orgCode;
- private String maintainCode;
+ private String departCode;
private String address;
@@ -97,13 +97,13 @@
this.title = eamBaseRepairDepart.getDepartName();
this.id = eamBaseRepairDepart.getId();
this.parentId = eamBaseRepairDepart.getParentId();
- this.maintainName = eamBaseRepairDepart.getDepartName();
- this.maintainNameAbbr = eamBaseRepairDepart.getDepartNameAbbr();
- this.maintainOrder = eamBaseRepairDepart.getDepartOrder();
+ this.departName = eamBaseRepairDepart.getDepartName();
+ this.departNameAbbr = eamBaseRepairDepart.getDepartNameAbbr();
+ this.departOrder = eamBaseRepairDepart.getDepartOrder();
this.description = eamBaseRepairDepart.getDescription();
this.orgType = eamBaseRepairDepart.getOrgType();
this.orgCode = eamBaseRepairDepart.getOrgCode();
- this.maintainCode = eamBaseRepairDepart.getMaintainCode();
+ this.departCode = eamBaseRepairDepart.getMaintainCode();
this.address = eamBaseRepairDepart.getAddress();
this.memo = eamBaseRepairDepart.getMemo();
this.status = eamBaseRepairDepart.getStatus();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java
index d464039..b4380e1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java
@@ -3,7 +3,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecg.modules.system.entity.EamBaseRepairDepart;
+import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import java.io.Serializable;
import java.util.ArrayList;
@@ -59,7 +59,7 @@
public RepairDepartIdModel convertByUserMaintainDepart(EamBaseRepairDepart mdcMaintainDepart) {
this.key = mdcMaintainDepart.getId();
this.value = mdcMaintainDepart.getId();
- this.title = mdcMaintainDepart.getMaintainName();
+ this.title = mdcMaintainDepart.getDepartName();
return this;
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java
deleted file mode 100644
index 485a926..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeProRule.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.jeecg.modules.eam.base.rule;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import io.netty.util.internal.StringUtil;
-import org.jeecg.common.handler.IFillRuleHandler;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.common.util.YouBianCodeUtil;
-import org.jeecg.modules.system.entity.MdcProduction;
-import org.jeecg.modules.system.service.IMdcProductionService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author: LiuS
- * @create: 2023-07-04 16:15
- * @Description: 杞﹂棿鏈烘瀯缂栫爜鐢熸垚瑙勫垯
- */
-public class OrgCodeProRule implements IFillRuleHandler {
-
- @Override
- public Object execute(JSONObject params, JSONObject formData) {
- IMdcProductionService mdcProductionService = (IMdcProductionService) SpringContextUtils.getBean("mdcProductionServiceImpl");
-
- 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 = "";
- // 瀹氫箟鏂扮紪鐮佸瓧绗︿覆
- String newOrgCode = "";
- // 瀹氫箟鏃х紪鐮佸瓧绗︿覆
- String oldOrgCode = "";
-
- String parentId = null;
- if (formData != null && formData.size() > 0) {
- Object obj = formData.get("parentId");
- if (obj != null) {
- parentId = obj.toString();
- }
- } else {
- if (params != null) {
- Object obj = params.get("parentId");
- if (obj != null) {
- parentId = obj.toString();
- }
- }
- }
-
- //濡傛灉鏄渶楂樼骇,鍒欐煡璇㈠嚭鍚岀骇鐨刼rg_code, 璋冪敤宸ュ叿绫荤敓鎴愮紪鐮佸苟杩斿洖
- if (StringUtil.isNullOrEmpty(parentId)) {
- // 绾垮垽鏂暟鎹簱涓殑琛ㄦ槸鍚︿负绌�,绌哄垯鐩存帴杩斿洖鍒濆缂栫爜
- 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 {
- MdcProduction mdcProduction = mdcProductionList.get(0);
- oldOrgCode = mdcProduction.getOrgCode();
- orgType = mdcProduction.getOrgType();
- newOrgCode = YouBianCodeUtil.getNextYouBianCode(oldOrgCode);
- }
- } else {//鍙嶄箣鍒欐煡璇㈠嚭鎵�鏈夊悓绾х殑杞﹂棿,鑾峰彇缁撴灉鍚庢湁涓ょ鎯呭喌,鏈夊悓绾у拰娌℃湁鍚岀骇
- // 灏佽鏌ヨ鍚岀骇鐨勬潯浠�
- query.eq(MdcProduction::getParentId, parentId);
- // 闄嶅簭鎺掑簭
- query.orderByDesc(MdcProduction::getOrgCode);
- // 鏌ヨ鍑哄悓绾т骇绾跨殑闆嗗悎
- List<MdcProduction> parentList = mdcProductionService.list(query);
- // 鏌ヨ鍑虹埗绾т骇绾�
- MdcProduction production = mdcProductionService.getById(parentId);
- // 鑾峰彇鐖剁骇浜х嚎鐨刢ode
- String parentCode = production.getOrgCode();
- // 鏍规嵁鐖剁骇浜х嚎绫诲瀷绠楀嚭褰撳墠浜х嚎鐨勭被鍨�
- orgType = String.valueOf(Integer.valueOf(production.getOrgType()) + 1);
- // 澶勭悊鍚岀骇浜х嚎涓簄ull鐨勬儏鍐�
- if (parentList == null || parentList.size() == 0) {
- // 鐩存帴鐢熸垚褰撳墠鐨勪骇绾跨紪鐮佸苟杩斿洖
- newOrgCode = YouBianCodeUtil.getSubYouBianCode(parentCode, null);
- } else { //澶勭悊鏈夊悓绾т骇绾跨殑鎯呭喌
- // 鑾峰彇鍚岀骇浜х嚎鐨勭紪鐮�,鍒╃敤宸ュ叿绫�
- String subCode = parentList.get(0).getOrgCode();
- // 杩斿洖鐢熸垚鐨勫綋鍓嶄骇绾跨紪鐮�
- newOrgCode = YouBianCodeUtil.getSubYouBianCode(parentCode, subCode);
- }
- }
- // 杩斿洖鏈�缁堝皝瑁呬簡浜х嚎缂栫爜鍜屼骇绾跨被鍨嬬殑鏁扮粍
- strArray[0] = newOrgCode;
- strArray[1] = orgType;
- return strArray;
- }
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java
new file mode 100644
index 0000000..505d0f2
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java
@@ -0,0 +1,98 @@
+package org.jeecg.modules.eam.base.rule;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.netty.util.internal.StringUtil;
+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.EamBaseRepairDepart;
+import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author: LiuS
+ * @create: 2023-07-04 16:15
+ * @Description: 杞﹂棿鏈烘瀯缂栫爜鐢熸垚瑙勫垯
+ */
+public class OrgCodeRepDepRule implements IFillRuleHandler {
+
+ @Override
+ public Object execute(JSONObject params, JSONObject formData) {
+ IEamBaseRepairDepartService eamBaseRepairDepartService = (IEamBaseRepairDepartService) SpringContextUtils.getBean("eamBaseRepairDepartImpl");
+
+ LambdaQueryWrapper<EamBaseRepairDepart> query = new LambdaQueryWrapper<EamBaseRepairDepart>();
+ LambdaQueryWrapper<EamBaseRepairDepart> query1 = new LambdaQueryWrapper<EamBaseRepairDepart>();
+ // 鍒涘缓涓�涓狶ist闆嗗悎,瀛樺偍鏌ヨ杩斿洖鐨勬墍鏈塃amBaseRepairDepart瀵硅薄
+ List<EamBaseRepairDepart> eamBaseRepairDepartList = new ArrayList<>();
+ String[] strArray = new String[2];
+ //瀹氫箟杞﹂棿绫诲瀷
+ String orgType = "";
+ // 瀹氫箟鏂扮紪鐮佸瓧绗︿覆
+ String newOrgCode = "";
+ // 瀹氫箟鏃х紪鐮佸瓧绗︿覆
+ String oldOrgCode = "";
+
+ String parentId = null;
+ if (formData != null && formData.size() > 0) {
+ Object obj = formData.get("parentId");
+ if (obj != null) {
+ parentId = obj.toString();
+ }
+ } else {
+ if (params != null) {
+ Object obj = params.get("parentId");
+ if (obj != null) {
+ parentId = obj.toString();
+ }
+ }
+ }
+
+ //濡傛灉鏄渶楂樼骇,鍒欐煡璇㈠嚭鍚岀骇鐨刼rg_code, 璋冪敤宸ュ叿绫荤敓鎴愮紪鐮佸苟杩斿洖
+ if (StringUtil.isNullOrEmpty(parentId)) {
+ // 绾垮垽鏂暟鎹簱涓殑琛ㄦ槸鍚︿负绌�,绌哄垯鐩存帴杩斿洖鍒濆缂栫爜
+ query1.eq(EamBaseRepairDepart::getParentId, "").or().isNull(EamBaseRepairDepart::getParentId);
+ query1.orderByDesc(EamBaseRepairDepart::getOrgCode);
+ eamBaseRepairDepartList = eamBaseRepairDepartService.list(query1);
+ if (eamBaseRepairDepartList == null || eamBaseRepairDepartList.size() == 0) {
+ strArray[0] = YouBianCodeUtil.getNextYouBianCode(null);
+ strArray[1] = "1";
+ return strArray;
+ } else {
+ EamBaseRepairDepart eamBaseRepairDepart = eamBaseRepairDepartList.get(0);
+ oldOrgCode = eamBaseRepairDepart.getOrgCode();
+ orgType = eamBaseRepairDepart.getOrgType();
+ newOrgCode = YouBianCodeUtil.getNextYouBianCode(oldOrgCode);
+ }
+ } else {//鍙嶄箣鍒欐煡璇㈠嚭鎵�鏈夊悓绾х殑杞﹂棿,鑾峰彇缁撴灉鍚庢湁涓ょ鎯呭喌,鏈夊悓绾у拰娌℃湁鍚岀骇
+ // 灏佽鏌ヨ鍚岀骇鐨勬潯浠�
+ query.eq(EamBaseRepairDepart::getParentId, parentId);
+ // 闄嶅簭鎺掑簭
+ query.orderByDesc(EamBaseRepairDepart::getOrgCode);
+ // 鏌ヨ鍑哄悓绾х淮淇儴闂ㄧ彮缁勭殑闆嗗悎
+ List<EamBaseRepairDepart> parentList = eamBaseRepairDepartService.list(query);
+ // 鏌ヨ鍑虹埗绾х淮淇儴闂ㄧ彮缁�
+ EamBaseRepairDepart repairDepart = eamBaseRepairDepartService.getById(parentId);
+ // 鑾峰彇鐖剁骇缁翠慨閮ㄩ棬鐝粍鐨刢ode
+ String parentCode = repairDepart.getOrgCode();
+ // 鏍规嵁鐖剁骇缁翠慨閮ㄩ棬鐝粍绫诲瀷绠楀嚭褰撳墠缁翠慨閮ㄩ棬鐝粍鐨勭被鍨�
+ orgType = String.valueOf(Integer.valueOf(repairDepart.getOrgType()) + 1);
+ // 澶勭悊鍚岀骇缁翠慨閮ㄩ棬鐝粍涓簄ull鐨勬儏鍐�
+ if (parentList == null || parentList.size() == 0) {
+ // 鐩存帴鐢熸垚褰撳墠鐨勭淮淇儴闂ㄧ彮缁勭紪鐮佸苟杩斿洖
+ newOrgCode = YouBianCodeUtil.getSubYouBianCode(parentCode, null);
+ } else { //澶勭悊鏈夊悓绾х淮淇儴闂ㄧ彮缁勭殑鎯呭喌
+ // 鑾峰彇鍚岀骇缁翠慨閮ㄩ棬鐝粍鐨勭紪鐮�,鍒╃敤宸ュ叿绫�
+ String subCode = parentList.get(0).getOrgCode();
+ // 杩斿洖鐢熸垚鐨勫綋鍓嶇淮淇儴闂ㄧ彮缁勭紪鐮�
+ newOrgCode = YouBianCodeUtil.getSubYouBianCode(parentCode, subCode);
+ }
+ }
+ // 杩斿洖鏈�缁堝皝瑁呬簡缁翠慨閮ㄩ棬鐝粍缂栫爜鍜岀淮淇儴闂ㄧ彮缁勭被鍨嬬殑鏁扮粍
+ strArray[0] = newOrgCode;
+ strArray[1] = orgType;
+ return strArray;
+ }
+}
--
Gitblit v1.9.3