From 47f1f14d7788b0baf4578d3aaa5b9f989ee65210 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 16:36:52 +0800
Subject: [PATCH] 首页统计功能查询判断为空增加
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 227274c..d1c5777 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -43,6 +43,7 @@
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.HttpUtils;
@@ -105,6 +106,8 @@
private String itemId;
@Value("${erp.item.attrKey:xhdh}")
public String attrKey;
+ @Value("${erp.item.itemStatus:2}")
+ public String itemStatus;
@Value("${erp.item.systemId:ERP}")
public String systemId;
@@ -113,7 +116,8 @@
@Value("${erp.item.secValue:A}")
public String secValue;
-
+ @Value("${erp.item.btmName:XHDH}")
+ public String btmName;
/**
* 涓氬姟绫诲瀷鐨勬湇鍔�
*/
@@ -261,21 +265,30 @@
* 鍚屾鍨嬪彿浠ｅ彿
*/
@Override
- public void saveItemDataSyncScheduing(String btmName) {
+ public void saveItemDataSyncScheduing(String endDate) {
+ String paramString="";
+ String backString="鎴愬姛";
+ String msg="鎴愬姛";
+ boolean success=true;
SearchItemParam searchItemParam=new SearchItemParam();
searchItemParam.setSystag("VCI"); //璋冪敤绯荤粺鏍囪瘑
- Calendar calendar= Calendar.getInstance();
- calendar.set(Calendar.HOUR_OF_DAY,0);
- calendar.set(Calendar.MINUTE,0);
- calendar.set(Calendar.SECOND,0);
- log.info("鏌ヨ鏃堕棿------->"+calendar.getTime());
SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String lastchangedon= dft.format(calendar.getTime());
+ String lastchangedon="";
+ if(StringUtils.isBlank(endDate)) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ log.info("鏌ヨ鏃堕棿------->"+calendar.getTime());
+ lastchangedon= dft.format(calendar.getTime());
+ }else{
+ lastchangedon=endDate;
+ }
searchItemParam.setLastchangedon(lastchangedon);
- searchItemParam.setStatus("1");//
+ searchItemParam.setStatus(itemStatus);//
Map<String,String>searchDataMap= VciBaseUtil.objectToMapString(searchItemParam);
- //SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
- SearchItemVO searchItemVO=new SearchItemVO();
+ SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
+ /*SearchItemVO searchItemVO=new SearchItemVO();
List<SearchItemDataVO> data=new ArrayList<>();
SearchItemDataVO searchItemDataVO1=initData("1","","pro-00001");
SearchItemDataVO searchItemDataVO2=initData("0","item-00001","");
@@ -283,11 +296,7 @@
data.add(searchItemDataVO2);
searchItemVO.setData(data);
searchItemVO.setCode("200");
- searchItemVO.setMsg("");
- String paramString="";
- String backString="鎴愬姛";
- String msg="鎴愬姛";
- boolean success=true;
+ searchItemVO.setMsg("");*/
if(searchItemVO!=null) {
paramString = JSONObject.toJSON(searchItemVO).toString();
try {
@@ -424,6 +433,7 @@
success=false;
backString="鏌ヨ澶辫触--->"+e;
msg="鏌ヨ澶辫触--->"+e;
+ throw new VciBaseException(e.getMessage());
}finally {
try {
//璁板綍鏃ュ織
@@ -431,6 +441,7 @@
}catch (Throwable e){
e.printStackTrace();
log.error(e.getMessage());
+ throw new VciBaseException(e.getMessage());
}
}
}
--
Gitblit v1.9.3