From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 07c89d8..d80f3b3 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -367,7 +367,9 @@
BD_APPLY_PDF(8, "淇濆崟鐢宠琛≒DF ", "淇濆崟鐢宠琛≒DF "),
BD_SIGNED_PDF(9, "绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
COM_SING_IMG(10, "浼佷笟鍗扮珷", "浼佷笟鍗扮珷"),
- BD_DONE_PDF(10, "鏈�缁堟姤鍗�", "鏈�缁堟姤鍗�"),
+ BD_DONE_PDF(11, "鏈�缁堟姤鍗�", "鏈�缁堟姤鍗�"),
+
+ CA_PD_PDF(12, "鏈�缁堟姤鍗�", "鏈�缁堟姤鍗�"),
;
@@ -632,6 +634,17 @@
PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃",""),
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}"),
+ CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
+ CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}"),
+ CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷",""),
+ CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
+ CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}"),
+ CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟",""),
+ CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�",""),
+ CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}"),
+ PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -696,10 +709,11 @@
SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�",""),
FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�",""),
UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param}鍙樻洿涓�${param1}"),
- COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�(涓嶅彲椹冲洖)","鎻愪氦鎰忚锛�${param}"),
- COMPANY_APPLY_RETURN_SELECT(7, "浼佷笟鐢宠閫�鍥�(鍙┏鍥�)","鎻愪氦鎰忚锛�${param}"),
- CLOSE(8, "璁㈠崟鍏抽棴",""),
- PLATFORM_CHECK_PASS(9,"骞冲彴鎶曚繚瀹℃牳閫氳繃",""),
+ COMPANY_BACK_APPLY_UPLOAD(6, "浼佷笟鐢宠閫�鍥�(鎻愪氦鎶曚繚)","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}"),
+ CLOSE(9, "璁㈠崟鍏抽棴",""),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃",""),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -765,17 +779,26 @@
}
return solutions.getPrice().multiply(new BigDecimal(cycle));
}
+ public static BigDecimal countDetailFee(int timeUnit ,BigDecimal price,Date startDate, Date endDate){
+ //鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
+ Integer cycle = DateUtil.calculateBetween(endDate,startDate,timeUnit);
+ if(cycle==-1){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!");
+ }
+ return Constants.formatBigdecimal(price).multiply(new BigDecimal(cycle));
+ }
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
APPROVE(2, "宸蹭笂浼犲鎵�"),
- RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
- PLATFORM_AGREE(4, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
- CLOSE(5, "宸插叧闂�"),
- PALTFORM_CHECK_PASS(6, "瀹℃牳涓嶉�氳繃"),
- PALTFORM_CHECK_PASS_NO(7, "瀹℃牳閫氳繃"),
+ RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
+ RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
+ PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
+ CLOSE(6, "宸插叧闂�"),
+ PALTFORM_CHECK_PASS(7, "瀹℃牳閫氳繃"),
+ PALTFORM_CHECK_PASS_NO(8, "瀹℃牳涓嶉�氳繃"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -935,7 +958,6 @@
-//3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃壒閫氳繃锛�0=瀹℃壒椹冲洖;5=骞冲彴瀹℃壒椹冲洖
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠"),
RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
@@ -982,6 +1004,8 @@
}
+
+
public enum ProjectRecord {
COM_EDITING(0, "浼佷笟淇濆瓨鏁版嵁", "鐢� ${param2} ${param3}淇濆瓨鎴愬姛锛屽綋鍓嶈繘搴︿负 銆�${param4}銆�"),
--
Gitblit v1.9.3