From a8ba678a3fe5a39da2c732014cebbb66e408e97c Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期三, 02 四月 2025 18:45:12 +0800
Subject: [PATCH] 问题与漏洞修改
---
consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
index 4c19f65..190366b 100644
--- a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
+++ b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
@@ -13,69 +13,66 @@
/**
* 1 閲囪喘
*/
- CAIGOU((short) 1),
+ CAIGOU(1),
/**
* 2 璋冩嫧
*/
- DIAOBO((short) 2),
+ DIAOBO(2),
/**
* 3鍑哄簱
*/
- CHUKU((short) 3),
+ CHUKU(3),
/**
* 4閮ㄩ棬鍒嗗彂
*/
- BUMENFENFA((short) 4),
+ BUMENFENFA(4),
/**
* 鎶ュ簾
*/
- BAOFEI((short) 5),
+ BAOFEI(5),
/**
* 閮ㄩ棬鐗╁搧鍥為��浠撳簱
*/
- BUMENTUIHUI((short) 6),
+ BUMENTUIHUI(6),
/**
* 鐗╁搧鐩樼偣
*/
- PANDIAN((short) 7),
- ;
+ PANDIAN(7),;
- private short value;
+ private Integer value;
- WhBusinessEnum(short value) {
+ WhBusinessEnum(Integer value) {
this.value = value;
}
- public short getValue() {
+ public Integer getValue() {
return value;
}
/**
- * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
+ * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
*
* @param flowType 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
- * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛�
- * flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛� flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
*/
public static Map<String, Short> getTypeByFlowType(Short flowType) {
- //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
Short flowBusinessType = null;
- //1=璋冨锛�2=璋冨噺
+ // 1=璋冨锛�2=璋冨噺
Short flowThisType = null;
- //鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
- Short transferBusinessType = null;
+ // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
switch (flowType) {
- //1閲囪喘鍏ュ簱
+ // 1閲囪喘鍏ュ簱
case 1:
flowThisType = 1;
flowBusinessType = 1;
break;
- //2閫�杩樺叆搴�
+ // 2閫�杩樺叆搴�
case 2:
flowThisType = 1;
flowBusinessType = 2;
break;
- //3璋冩嫧鍏ュ簱
+ // 3璋冩嫧鍏ュ簱
case 3:
flowThisType = 1;
flowBusinessType = 3;
@@ -85,19 +82,19 @@
flowThisType = 1;
flowBusinessType = 7;
break;
- //5鐢抽鍑哄簱
+ // 5鐢抽鍑哄簱
case 5:
flowThisType = 2;
flowBusinessType = 4;
-// transferBusinessType = 1;
+ // transferBusinessType = 1;
break;
// 6璋冩嫧鍑哄簱
case 6:
flowThisType = 2;
flowBusinessType = 2;
-// transferBusinessType = 1;
+ // transferBusinessType = 1;
break;
- //7鐩樹簭鍑哄簱
+ // 7鐩樹簭鍑哄簱
case 7:
flowThisType = 2;
flowBusinessType = 7;
@@ -118,4 +115,47 @@
rtnMap.put("flowThisType", flowThisType);
return rtnMap;
}
+
+ /**
+ * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
+ *
+ * @param deptFlowType // 鍚岀爜琛紝1 鐗╁搧鐢抽 2 鐗╁搧鍒嗗彂 3 鐗╁搧閫�杩� 4 鐗╁搧鎶ュ簾
+ * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛� flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ */
+ public static Map<String, Short> getTypeByDeptFlowType(Short deptFlowType) {
+ // 鍗曟嵁绫诲瀷 1 閲囪喘 2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ Short flowBusinessType = null;
+ // 1=璋冨锛�2=璋冨噺
+ Short flowThisType = null;
+ // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ switch (deptFlowType) {
+ // 鐗╁搧鐢抽
+ case 1:
+ // flowThisType = 2;
+ // flowBusinessType = 2;
+ break;
+ // 2 鐗╁搧鍒嗗彂
+ case 2:
+ flowThisType = 1;
+ flowBusinessType = 4;
+ // transferBusinessType = 1;
+ break;
+ // 3 鐗╁搧閫�杩�
+ case 3:
+ flowThisType = 2;
+ flowBusinessType = 6;
+ // transferBusinessType = 2;
+ break;
+ // 4 鐗╁搧鎶ュ簾
+ case 4:
+ flowThisType = 2;
+ flowBusinessType = 5;
+ break;
+ }
+ Map<String, Short> rtnMap = new HashMap<>();
+ rtnMap.put("flowBusinessType", flowBusinessType);
+ rtnMap.put("flowThisType", flowThisType);
+ // rtnMap.put("transferBusinessType", transferBusinessType);
+ return rtnMap;
+ }
}
--
Gitblit v1.9.1