From b8b04115d5ac7bc9bc2ce17c0e60f67a11c2ffac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 十二月 2023 08:38:07 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index d744a7a..8e54c6b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -1168,10 +1168,7 @@
"order by to_char(CREATETIME, 'mm')";
//鏌ヨ鍑洪渶瑕佸鐞嗙殑鏁版嵁
List<Map> maps = commonsMapper.selectBySql(sql);
- if(maps.size() == 0){
- throw new ServiceException("浼犲叆绫诲瀷["+ datum.getName() + ":" +
- datum.getId() +"]鏈煡鍒扮浉鍏崇粺璁℃暟鎹紝璇风‘璁�!!!!");
- }
+
//褰撳勾姣忔湀鏈堜唤涔嬪墠涔嬪拰
List<Integer> monthCount = new ArrayList<>(12);
//褰撳勾姣忔湀鐨勬湀浠芥暟鎹�
@@ -1179,6 +1176,9 @@
//鑾峰彇褰撳墠鏈堢殑鏁板瓧
Calendar instance = Calendar.getInstance();
int nowmonth = instance.get(Calendar.MONTH) + 1;
+ if(maps.size() == 0){
+ nowmonth = 0;
+ }
//浠�1鍒�12鏈堣繘琛屽鐞�
for (Integer i = 1; i <= 12; i++) {
//褰撳墠鏈堝悗鎵�鏈夋暟鎹缃负0
@@ -2589,12 +2589,24 @@
}
DateConverter dateConverter = new DateConverter();
if (VciFieldTypeEnum.VTDateTime.equals(fieldTypeEnum)) {
- //瀹為檯涓婏紝鏁版嵁搴撻兘鏄痶imestamp鐨勭被鍨�.
- dateConverter.setAsText(value);
- return "to_date('" + dateConverter.getAsText(VciDateUtil.DateTimeFormat) + "','" + DATETIME_FORMAT + "')";
+ //瀹為檯涓婏紝鏁版嵁搴撻兘鏄痶imestamp鐨勭被鍨�. TODO:铏界劧娌¤兘瑙ｅ喅鏌ヨ鏃ユ湡鐨勯棶棰橈紝浣嗘槸鑳芥殏鏃惰В鍐虫姤閿欓棶棰�
+ if(value.contains("*")){
+ value = value.replace("*","%");
+ return "'" + value + "'";
+ }else{
+ value = value.replace("*","");
+ dateConverter.setAsText(value);
+ return "to_date('" + dateConverter.getAsText(VciDateUtil.DateTimeFormat) + "','" + DATETIME_FORMAT + "')";
+ }
} else if (VciFieldTypeEnum.VTDate.equals(fieldTypeEnum)) {
- dateConverter.setAsText(value);
- return "to_date('" + dateConverter.getAsText(VciDateUtil.DateFormat) + "','" + DATE_FORMAT + "')";
+ if(value.contains("*")){
+ value = value.replace("*","%");
+ return "'" + value + "'";
+ }else {
+ value = value.replace("*","");
+ dateConverter.setAsText(value);
+ return "to_date('" + dateConverter.getAsText(VciDateUtil.DateFormat) + "','" + DATE_FORMAT + "')";
+ }
} else if (VciFieldTypeEnum.VTDouble.equals(fieldTypeEnum)
|| VciFieldTypeEnum.VTLong.equals(fieldTypeEnum)
|| VciFieldTypeEnum.VTInteger.equals(fieldTypeEnum)) {
--
Gitblit v1.9.3