From 0787d2b3c5d4b12af4218a32323250aa9891246a Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期五, 08 四月 2022 18:03:19 +0800
Subject: [PATCH] 小程序相关603、612、ChoiceAssetController
---
force-app/main/default/classes/NFM603Controller.cls | 258 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 237 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/classes/NFM603Controller.cls b/force-app/main/default/classes/NFM603Controller.cls
index 8a57ad7..693757a 100644
--- a/force-app/main/default/classes/NFM603Controller.cls
+++ b/force-app/main/default/classes/NFM603Controller.cls
@@ -41,6 +41,10 @@
public String QuotationGread; //鎶ヤ环绛夌骇(new)
public String detectionResult; //妫�娴嬬粨鏋�
public String cus_dn; //DN鍙�
+ //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 start
+ public String OTSRepairOrder;
+ //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 end
+
//閫佷慨鐗╂祦
public String deliveryLogisticsMode; //閫佷慨鐗╂祦鏂瑰紡
public String engineerSendDate; //宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
@@ -216,11 +220,28 @@
RcSorcDate__c,
SorcAcceptDate__c,
SorcOgzDate__c,
+ RcOgzDate__c,
Returns_Product_waySAP__c,
DnNO__c,
OgzAcceptDate__c,
DeliveryLogisticsAnnotation__c,
- Department_Class__r.Management_Code__c
+ Department_Class__r.Management_Code__c,
+ Repair_Ordered_DateTime__c,
+ Repair_Inspection_DateTime__c,
+ repair_cancel_dateTime__c,
+ RcSorcDateTime__c,
+ SorcAcceptDateTime__c,
+ OgzAcceptDateTime__c,
+ part_arrangement_complete_DateTime__c,
+ Repair_Start_DateTime__c,
+ Repair_Completed_DateTime__c,
+ Repair_Final_Inspection_DateTime__c,
+ Repair_Shipped_DateTime__c,
+ Repair_Discount_approval_DateTime_form__c,
+ Agreed_DateTime__c,
+ //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 start
+ OTSRepairOrder__c
+ //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 end
from Repair__c where id in: repairOrderIdList
];
}
@@ -235,6 +256,10 @@
// 澶囧搧鍑哄�熻褰� 鏌ユ壘澶囧搧鍑哄�熶竴瑙堟槑缁嗙殑 浜у搧鍨嬪彿
Map < id, List < SparePartsLendingRecord >> rentalMap = getrentalMap(repairIdList);
+ String downSDt = '';
+ String downEDt = '';
+ String upSDt = '';
+ String upEDt = '';
for (Repair__c repair: repairList) {
@@ -273,7 +298,10 @@
info.FaultDesc = reasonMap.get(repair.id); //鏁呴殰鎻忚堪List
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
info.deliveryLogisticsMode = repair.DeliveryLogisticsMode__c; //閫佷慨鐗╂祦鏂瑰紡======鑷繁鍐欏瓧娈�
- info.engineerSendDate = NFMUtil.formatDate2StrDateTime(repair.engineerSendDate__c); // 宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
+ //update wangweipeng 2022/02/16 start
+ //info.engineerSendDate = NFMUtil.formatDate2StrDateTime(repair.engineerSendDate__c); // 宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
+ info.engineerSendDate = NFMUtil.formatDateTime2Str(repair.engineerSendDate__c); // 宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
+ //update wangweipeng 2022/02/16 end
info.deliveryLogisticsNo = repair.DeliveryLogisticsNo__c; //閫佷慨鐗╂祦鍗曞彿======鑷繁鍐欏瓧娈�
info.returnLogisticsMode = repair.ReturnLogisticsMode__c; //杩旈�佺墿娴佹柟寮�======鑷繁鍐欏瓧娈�
info.DeliveryLogisticsAnnotation = repair.DeliveryLogisticsAnnotation__c; //閫佷慨鐗╂祦淇℃伅澶囨敞
@@ -283,29 +311,46 @@
info.returnLogisticsSendTime = NFMUtil.formatDateTime2Str(repair.ReturnOrderSendTime__c); //杩旈�佺墿娴佸彂閫佹椂闂�======鑷繁鍐欏瓧娈�
info.returnLogisticsReceiveTime = NFMUtil.formatDateTime2Str(repair.ReturnLogisticsReceiveTime__c); //杩旈�佺墿娴佺鏀舵椂闂�======鑷繁鍐欏瓧娈�
info.repairproductsRevDate = NFMUtil.formatDate2StrDateTime(repair.On_Site_Repair_Order_Date__c); //鏁呴殰鍝佹帴鏀舵棩
- info.FSErepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.FSE_ApplyForRepair_Day__c); //FSE淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
+ //update wangweipeng 2022/02/16 start
+ //info.FSErepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.FSE_ApplyForRepair_Day__c); //FSE淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
+ info.FSErepairApplyDate = NFMUtil.formatDateTime2Str(repair.FSE_ApplyForRepair_time__c); // FSE淇悊鐢宠鏃堕棿
+ //update wangweipeng 2022/02/16 end
info.logisticsSendDate = NFMUtil.formatDateTime2Str(repair.LogisticsSendTime__c); //鐗╂祦鍙戦�佹棩======鑷繁鍐欏瓧娈�
info.logisticsReceiveDate = NFMUtil.formatDateTime2Str(repair.LogisticsReceiveTime__c); //鐗╂祦鎺ユ敹鏃�======鑷繁鍐欏瓧娈�
- info.SAPrepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.SAP_Transfer_day__c); //SAP淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
- info.RCacceptanceDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Ordered_Date__c); //淇悊鍝丷C鍙楃悊鏃�
- info.inspectionDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Inspection_Date__c); //淇悊妫�娴嬫棩
- info.FirstQuotationDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Firstestimated_Date_formula__c); //鍒濇鎶ヤ环鏃�
+ //update wangweipeng 2022/02/16 start
+ //info.SAPrepairApplyDate = NFMUtil.formatDate2StrDateTime(repair.SAP_Transfer_day__c); //SAP淇悊鐢宠鏃�======鑷繁鍐欏瓧娈�
+ info.SAPrepairApplyDate = NFMUtil.formatDateTime2Str(repair.SAP_Transfer_time__c); // SAP淇悊鐢宠鏃堕棿
+ //info.RCacceptanceDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Ordered_Date__c); //淇悊鍝丷C鍙楃悊鏃�
+ info.RCacceptanceDate = NFMUtil.formatDateTime2Str(repair.Repair_Ordered_DateTime__c); //4.淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級
+ //info.inspectionDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Inspection_Date__c); //淇悊妫�娴嬫棩
+ info.inspectionDate = NFMUtil.formatDateTime2Str(repair.Repair_Inspection_DateTime__c); //5.淇悊妫�娴嬫棩锛堝皬绋嬪簭锛�
+ info.FirstQuotationDate = NFMUtil.formatDate2StrDateNewTime(repair.Repair_Firstestimated_Date_formula__c); //鍒濇鎶ヤ环鏃�
+ //info.priceApprovalDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Discount_approval_Date_formula__c); //鍑忎环鐢宠鎵瑰噯鏃�
+ info.priceApprovalDate = NFMUtil.formatDateTime2Str(repair.Repair_Discount_approval_DateTime_form__c); //鍑忎环鐢宠鎵瑰噯鏃ワ紙灏忕▼搴忥級
+ info.quotationDate = NFMUtil.formatDate2StrDateNewTime(repair.Repair_Quotation_date__c); //鎶ヤ环鏃�
+ //info.cancelRepairDate = NFMUtil.formatDate2StrDateTime(repair.repair_cancel_date__c); //淇悊鍙栨秷鏃�
+ info.cancelRepairDate = NFMUtil.formatDateTime2Str(repair.repair_cancel_dateTime__c); //淇悊鍙栨秷鏃ワ紙灏忕▼搴忥級
+ //info.userAgreeDAte = NFMUtil.formatDate2StrDateTime(repair.Agreed_Date__c); //鐢ㄦ埛鍚屾剰鏃�
+ info.userAgreeDAte = NFMUtil.formatDateTime2Str(repair.Agreed_DateTime__c); //7.鐢ㄦ埛鍚屾剰鏃ワ紙灏忕▼搴忥級
+ //info.partsCompleteDate = NFMUtil.formatDate2StrDateTime(repair.part_arrangement_complete__c); //闆朵欢榻愬瀹屾瘯鏃�
+ info.partsCompleteDate = NFMUtil.formatDateTime2Str(repair.part_arrangement_complete_DateTime__c); //闆朵欢榻愬瀹屾瘯鏃�
+ //info.repairStartDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Start_Date__c); //淇悊寮�濮嬫棩
+ info.repairStartDate = NFMUtil.formatDateTime2Str(repair.Repair_Start_DateTime__c); //8.淇悊寮�濮嬫棩锛堝皬绋嬪簭锛�
+ //info.repairCompleteDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Completed_Date__c); //淇悊瀹屾垚鏃�
+ info.repairCompleteDate = NFMUtil.formatDateTime2Str(repair.Repair_Completed_DateTime__c); //9.淇悊瀹屾垚鏃ワ紙灏忕▼搴忥級
+ //info.finalTestDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Final_Inspection_Date__c); //鏈�缁堟娴嬫棩
+ info.finalTestDate = NFMUtil.formatDateTime2Str(repair.Repair_Final_Inspection_DateTime__c); //10.鏈�缁堟娴嬫棩锛堝皬绋嬪簭锛�
+ //update wangweipeng 2022/02/16 end
info.planQuotationDate = NFMUtil.formatDateTime2Str(repair.PlanQuotationTime__c); //璁″垝鎶ヤ环鏃�======鑷繁鍐欏瓧娈�
info.ActualQuotationDate = NFMUtil.formatDateTime2Str(repair.ActualQuotationStartTime__c); //瀹為檯鎶ヤ环鏃�======鑷繁鍐欏瓧娈�
- info.quotationDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Quotation_date__c); //鎶ヤ环鏃�
- info.priceApprovalDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Discount_approval_Date_formula__c); //鍑忎环鐢宠鎵瑰噯鏃�
info.finalQuotationPrice = repair.Discount_Price_formula__c; //鏈�缁堟姤浠烽噾棰�======鑷繁鍐欏瓧娈�
- info.userAgreeDAte = NFMUtil.formatDate2StrDateTime(repair.Agreed_Date__c); //鐢ㄦ埛鍚屾剰鏃�
- info.partsCompleteDate = NFMUtil.formatDate2StrDateTime(repair.part_arrangement_complete__c); //闆朵欢榻愬瀹屾瘯鏃�
- info.repairStartDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Start_Date__c); //淇悊寮�濮嬫棩
info.repairCompleteExpectedDate = NFMUtil.formatDate2StrDateTime(repair.Planned_Repair_Completed_Date__c); //淇悊瀹屾垚棰勮鏃�
- info.repairCompleteDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Completed_Date__c); //淇悊瀹屾垚鏃�
- info.finalTestDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Final_Inspection_Date__c); //鏈�缁堟娴嬫棩
info.RCreturnDate = null; //RC淇悊鍝佽繑閫佹棩
info.ReturnsProductWay = null; //杩斿搧鏂瑰紡
if (repair.Repair_Shipped_Date__c != null && String.isNotBlank(repair.Returns_Product_waySAP__c)) {
- info.RCreturnDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Shipped_Date__c); //RC淇悊鍝佽繑閫佹棩
+ //info.RCreturnDate = NFMUtil.formatDate2StrDateTime(repair.Repair_Shipped_Date__c); //RC淇悊鍝佽繑閫佹棩
+ info.RCreturnDate = NFMUtil.formatDateTime2Str(repair.Repair_Shipped_DateTime__c); //RC淇悊鍝佽繑閫佹棩 wangweipeng 2022/02/16
info.ReturnsProductWay = repair.Returns_Product_waySAP__c; //杩斿搧鏂瑰紡
}
@@ -319,20 +364,58 @@
info.payCompleteDate = NFMUtil.formatDate2StrDateTime(repair.Received_Date__c); //鍥炴瀹屾瘯鏃�
info.incomeReckoninDate = NFMUtil.formatDate2StrDateTime(repair.Facility_Return_Receipt_Collection_Date__c); //鏀跺叆璁″叆鏃�
info.abandonPayDate = NFMUtil.formatDate2StrDateTime(repair.BaddebtsDate__c); //鏀惧純鍥炴鏃�
- info.cancelRepairDate = NFMUtil.formatDate2StrDateTime(repair.repair_cancel_date__c); //淇悊鍙栨秷鏃�
info.repairOrderCompleteDate = NFMUtil.formatDate2StrDateTime(repair.RepairOrder_Complete_Day__c); //淇悊鍗曞畬鎴愭棩
info.applySpareEquip = repair.if_Rental_Apply__c; //鏄惁鐢宠澶囧搧======鑷繁鍐欏瓧娈�
info.supplySpareEquip = repair.Offer_Rental_New__c + ''; //鏄惁鎻愪緵澶囧搧
info.SparePartsLendingRecord = rentalMap.get(repair.Id);
+ //update wangweipeng 2022/02/16 start
+ //info.RcSorcDate = NFMUtil.formatDate2StrDateTime(repair.RcSorcDate__c);//RC杞琒ORC鏃�
+ info.RcSorcDate = NFMUtil.formatDateTime2Str(repair.RcSorcDateTime__c);//RC杞琒ORC鏃ワ紙灏忕▼搴忥級
+ //info.SorcAcceptDate = NFMUtil.formatDate2StrDateTime(repair.SorcAcceptDate__c);//SORC鍙楃悊鏃�
+ info.SorcAcceptDate = NFMUtil.formatDateTime2Str(repair.SorcAcceptDateTime__c);//SORC鍙楃悊鏃ワ紙灏忕▼搴忥級
+ //info.OgzAcceptDate = NFMUtil.formatDate2StrDateTime(repair.OgzAcceptDate__c);//OGZ鍙楃悊鏃�
+ info.OgzAcceptDate = NFMUtil.formatDateTime2Str(repair.OgzAcceptDateTime__c);//OGZ鍙楃悊鏃ワ紙灏忕▼搴忥級
+ //update wangweipeng 2022/02/16 end
- info.RcSorcDate = NFMUtil.formatDate2StrDateTime(repair.RcSorcDate__c);
- info.SorcAcceptDate = NFMUtil.formatDate2StrDateTime(repair.SorcAcceptDate__c);
- info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.SorcOgzDate__c);
- info.OgzAcceptDate = NFMUtil.formatDate2StrDateTime(repair.OgzAcceptDate__c);
+ // info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.SorcOgzDate__c);RcOgzDate__c
+
+ //update zhangyuheng 2022/03/07
+ info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.RcOgzDate__c);
info.cus_dn = repair.DnNO__c;
+ //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 start
+ info.OTSRepairOrder = repair.OTSRepairOrder__c;
+ //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 end
+
+ //鎶ヤ环鏃ャ�佸垵娆℃姤浠锋棩銆丷C淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鏃堕棿鍒ゆ柇 zyh 20220315 start
+ downSDt = DownStartDt();
+ downEDt = DownEndDt();
+ upSDt = UpStartDt();
+ upEDt = UpEndDt();
+ //瀹氫箟涓嬬彮鏃堕棿
+ if (String.valueOf(info.FirstQuotationDate) >= String.valueOf(downSDt) && String.valueOf(info.FirstQuotationDate) <= String.valueOf(downEDt)) {
+ info.FirstQuotationDate = DownDt();//鍒濇鎶ヤ环鏃�
+ }
+ if (String.valueOf(info.RCacceptanceDate) >= String.valueOf(downSDt) && String.valueOf(info.RCacceptanceDate) <= String.valueOf(downEDt)) {
+ info.RCacceptanceDate = DownDt();//4.淇悊鍝丷C鍙楃悊鏃�
+ }
+ if (String.valueOf(info.quotationDate) >= String.valueOf(downSDt) && String.valueOf(info.quotationDate) <= String.valueOf(downEDt)) {
+ info.quotationDate = DownDt();//鎶ヤ环鏃�
+ }
+ //瀹氫箟涓婄彮鏃堕棿
+ if (String.valueOf(info.FirstQuotationDate) >= String.valueOf(upSDt) && String.valueOf(info.FirstQuotationDate) <= String.valueOf(upEDt)) {
+ info.FirstQuotationDate = UpDt();//鍒濇鎶ヤ环鏃�
+ }
+ if (String.valueOf(info.RCacceptanceDate) >= String.valueOf(upSDt) && String.valueOf(info.RCacceptanceDate) <= String.valueOf(upEDt)) {
+ info.RCacceptanceDate = UpDt();//4.淇悊鍝丷C鍙楃悊鏃�
+ }
+ if (String.valueOf(info.quotationDate) >= String.valueOf(upSDt) && String.valueOf(info.quotationDate) <= String.valueOf(upEDt)) {
+ info.quotationDate = UpDt();//鎶ヤ环鏃�
+ }
+ //鎶ヤ环鏃ャ�佸垵娆℃姤浠锋棩銆丷C淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鏃堕棿鍒ゆ柇 zyh 20220315 end
repairs.add(info);
+ System.debug('repairs1:' + repairs);
}
logstr += '\nend';
if (repairs.size() > 0) {
@@ -476,7 +559,7 @@
public static Set < Id > NFM603_Ids = new Set < Id > ();
// public static Map<Id,Id> rprIdMap = new Map<Id,Id>();
-
+
public static void NFM603Trigger(List < Repair__c > newList, Map < Id, Repair__c > newMap, List < Repair__c > oldList, Map < Id, Repair__c > oldMap) {
List < String > rprIds = new List < String > ();
Map < Id, Id > rprIdMap = new Map < Id, Id > ();
@@ -508,6 +591,38 @@
rprIdMap.put(rpr.Id, rpr.Id);
}
}
+
+ // 2022/4/6 zhangyuheng update start
+ //OTS璁㈠崟鍙锋湁鍊硷紝鍙戦�丄WS
+ if ((oldrpr.OTSRepairOrder__c == null && String.isNotBlank(rpr.OTSRepairOrder__c)) || rpr.OTSRepairOrder__c != oldrpr.OTSRepairOrder__c) {
+ if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+ NFM603Controller.NFM603_Ids.add(rpr.Id);
+ rprIdMap.put(rpr.Id, rpr.Id);
+ }
+ }
+ // 2022/4/6 zhangyuheng update end
+ // 2022/4/7 zhangyuheng update start
+ //閫佷慨鐗╂祦鍗曞彿鏈夊�硷紝鍙戦�丄WS
+ if ((oldrpr.DeliveryLogisticsNo__c == null && String.isNotBlank(rpr.DeliveryLogisticsNo__c)) || rpr.DeliveryLogisticsNo__c != oldrpr.DeliveryLogisticsNo__c) {
+ if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+ NFM603Controller.NFM603_Ids.add(rpr.Id);
+ rprIdMap.put(rpr.Id, rpr.Id);
+ }
+ }
+ //鎶ヤ环閲戦鍙戠敓鏀瑰彉涓斿垵娆℃姤浠锋棩鏈夊�硷紝鍙戦�丄WS
+ if (((rpr.Discount_Price_formula__c != oldrpr.Discount_Price_formula__c) || rpr.Discount_Price_formula__c != null) && rpr.Repair_Firstestimated_Date_formula__c != null) {
+ if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+ NFM603Controller.NFM603_Ids.add(rpr.Id);
+ rprIdMap.put(rpr.Id, rpr.Id);
+ }
+ }
+ if ((rpr.Returns_Product_waySAP__c != oldrpr.Returns_Product_waySAP__c) && rpr.Repair_Shipped_DateTime__c != null) {
+ if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
+ NFM603Controller.NFM603_Ids.add(rpr.Id);
+ rprIdMap.put(rpr.Id, rpr.Id);
+ }
+ }
+ // 2022/4/7 zhangyuheng update end
// 娴嬭瘯鐜娴嬭瘯鐢紝涓婄嚎鍓嶈娉ㄦ帀
if (rpr.Repair_Firstestimated_Date__c != oldrpr.Repair_Firstestimated_Date__c) {
if (NFM603Controller.NFM603_Ids.contains(rpr.Id) == false) {
@@ -549,4 +664,105 @@
}
}
}
+
+ //鎶ヤ环鏃ャ�佸垵娆℃姤浠锋棩銆丷C淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鏃堕棿鏂规硶 zyh 20220315 start
+ //涓嬬彮寮�濮嬫椂闂�
+ public static String DownStartDt(){
+ String timenow = Datetime.now().format('yyyyMMddHHmmss');
+ String dt = NFMUtil.formatDate2Str(Date.today());
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+ return rtn + '173001';
+ }
+ //涓嬬彮缁撴潫鏃堕棿
+ public static String DownEndDt(){
+ String dt = NFMUtil.formatDate2Str(Date.today());
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+ return rtn + '235959';
+ }
+ //涓婄彮寮�濮嬫椂闂�
+ public static String UpStartDt(){
+ String dt = NFMUtil.formatDate2Str(Date.today());
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+ return rtn + '000000';
+ }
+ //涓婄彮缁撴潫鏃堕棿
+ public static String UpEndDt(){
+ String dt = NFMUtil.formatDate2Str(Date.today());
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+ return rtn + '084459';
+ }
+ //涓婄彮瀹氫箟鏃堕棿
+ public static String UpDt(){
+ String dt = NFMUtil.formatDate2Str(Date.today());
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+ return rtn + '090000';
+ }
+ //涓嬬彮瀹氫箟鏃堕棿
+ public static String DownDt(){
+ String dt = NFMUtil.formatDate2Str(Date.today());
+ String rtn = null;
+ if (dt == null) {
+ return rtn;
+ }
+ rtn = String.valueOf(dt);
+ rtn = rtn.replaceAll('-', '');
+ if (rtn >= '40001231') {
+ rtn = '99991231';
+ } else if (rtn < '19000101') {
+ rtn = '19000101';
+ }
+ return rtn + '170000';
+ }
+ //鎶ヤ环鏃ャ�佸垵娆℃姤浠锋棩銆丷C淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鏃堕棿鏂规硶 zyh 20220315 end
+
}
\ No newline at end of file
--
Gitblit v1.9.1