From 3971214ea3db700a2986b77e1c45ed2b8dae9ee3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 19:02:11 +0800
Subject: [PATCH] 开发更新
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 7ab9436..fcabf72 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -51,6 +51,7 @@
public static final String SPECIAL_COMPANY_ID ="SPECIAL_COMPANY_ID" ;
public static final String YW_DEVICE ="YW_DEVICE" ;
public static final String YW_PATROL ="YW_PATROL" ;
+ public static final String YW_CONTRACT_BILL ="YW_CONTRACT_BILL" ;
public static final String RESERVATION_TOTAL_NUM ="RESERVATION_TOTAL_NUM" ;
public static final String SIGN_IN_PLACE_LAT ="SIGN_IN_PLACE_LAT" ;
@@ -117,6 +118,7 @@
public static final String ERP ="ERP" ;
public static final Integer THREE =3 ;
public static final Integer FOUR =4 ;
+ public static final Integer SEVEN =7 ;
public static final Integer FIVE =5 ;
public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
public static final String VIRTUAL_CARD_INDEX = "02098469790";
@@ -182,6 +184,48 @@
public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
// FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
+ /**
+ * 浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱
+ * @param circleType
+ * @return
+ */
+ public static String getUnitTypeByNum(Integer circleType) {
+
+ int zlPayType = Constants.formatIntegerNum(circleType);
+ if(zlPayType == 1){
+ return "鍏�/銕÷锋湀";
+ }else if(zlPayType == 2){
+ return "鍏�/銕÷峰ぉ";
+ }else if(zlPayType == 3){
+ return "鍏�/澶�";
+ }else if(zlPayType == 4){
+ return "鍏�/鏈�";
+ }else if(zlPayType == 5){
+ return "鍏�/骞�";
+ }else if(zlPayType == 6){
+ return "鍏�/鍦�";
+ }
+ return "鍏�/銕÷峰ぉ";
+ }
+
+ /**
+ * 鍛ㄦ湡鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
+ * @param zlPayType
+ * @return
+ */
+ public static String getPayTypeByNum(Integer zlPayType) {
+ if(zlPayType == null){
+ return "";
+ }
+ if(zlPayType == 1){
+ return "3涓湀涓�浠�";
+ }else if(zlPayType == 2){
+ return "6涓湀涓�浠�";
+ }else if(zlPayType == 3){
+ return "1骞翠竴浠�";
+ }
+ return "涓�娆℃�т粯娆�";
+ }
public static String getRandom6Num( ) {
Random random = new Random();
@@ -212,6 +256,19 @@
public static final int custom = 4;
public static final int self = -1;
}
+
+
+ /**
+ * 璐﹀崟绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃ 2绉熻祦鎶奸噾 3鐗╀笟鎶奸噾 4鑷缓璐﹀崟
+ */
+ public interface contractBillType{
+ int lease = 0;
+ int property= 1;
+ int leaseDeposit = 2;
+ int propertyDeposit =3;
+ int create =4;
+ }
+
/**
* 浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
@@ -1237,7 +1294,8 @@
FN_DEVICE_RECORD_FILE(6, "闃滃畞鏈嶅姟骞冲彴杩愮淮璁板綍鍥剧墖 ", "闃滃畞鏈嶅姟骞冲彴杩愮淮璁板綍鍥剧墖 "),
FN_PATROL_POINT_FILE(7, "宸℃鐐归檮浠� ", "宸℃鐐归檮浠� "),
FN_CONTRACT_BILL_FILE(8, "鍚堝悓璐﹀崟闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
- YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 ")
+ YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 "),
+ FN_CONTRACT_REVENUE_FILE(10, "鏀舵敮娴佹按闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
;
// 鎴愬憳鍙橀噺
@@ -1303,9 +1361,9 @@
WORKORDER_CREATE(0, "宸ュ崟鍒涘缓", "宸ュ崟鍒涘缓"),
WORKORDER_DISPATCH(1, "宸ュ崟鎸囨淳", "宸ュ崟鎸囨淳"),
WORKORDER_DEAL(2, "宸ュ崟澶勭悊 ", "宸ュ崟澶勭悊 "),
- CONTRACT_CREATE(3, "鍚堝悓鍒涘缓 ", "鍚堝悓鍒涘缓 "),
- CONTRACT_UPDATE(4, "鍚堝悓鍙樻洿 ", "鍚堝悓鍙樻洿 "),
- CONTRACT_BACK(5, "鍚堝悓閫�绉� ", "鍚堝悓閫�绉� "),
+ CONTRACT_CREATE(3, "鍚堝悓鏂板缓 ", "鏂板缓 "),
+ CONTRACT_UPDATE(4, "鍚堝悓鍙樻洿 ", "鍙樻洿 "),
+ CONTRACT_BACK(5, "鍚堝悓閫�绉� ", "閫�绉� "),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3