From 5da45630af37d2ac9541cfbad2aede0f88c4a9b5 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 21 二月 2024 15:55:31 +0800
Subject: [PATCH] 接口基本信息：参数对象 header对象调取接口呈现

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index e73f0da..121128e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -17,10 +17,12 @@
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import javafx.scene.control.TableRow;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,6 +58,9 @@
 	 * 鍚屾闆嗘垚鏈嶅姟
 	 */
 	private final 	ICodeDuckingSyncService codeDuckingSyncService;
+
+	/*@Value("${erp.item.btmName:XHDH}")
+	private String ERP_ITEM_BTMNAME;*/
 
 	/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
 	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
@@ -130,7 +135,7 @@
 		}
 		query.setCurrent(queryObject.getPage());
 		query.setSize(queryObject.getLimit());
-		IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
+		IPage<DockingSystemConfigVO> pages= dockingSystemConfigService.page(condtionMap,query);
 		return R.data(pages);
 	}
 
@@ -254,33 +259,53 @@
 		}
 		query.setCurrent(queryObject.getPage());
 		query.setSize(queryObject.getLimit());
+		if(queryObject.getOrder().equals("asc")){
+			query.setAscs(queryObject.getSort());
+		}else{
+			query.setDescs(queryObject.getSort());
+		}
+
 		IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
 		return R.data(pages);
 	}
 
 	/**
 	 * 鎺ュ彛param鍒楄〃
-	 * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridParam")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
-	public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){
-		IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query);
+	public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(condtionMap,query);
 		return R.data(pages);
 	}
 
 	/**
 	 * 鎺ュ彛param鍒楄〃
-	 * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridHeader")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
-	public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){
-		IPage<DockingSysIntHeaderVO>  pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query);
+	public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingSysIntHeaderVO>  pages=dokingSysManaentService.gridHeader(condtionMap,query);
 		return R.data(pages);
 
 
@@ -294,4 +319,18 @@
 	public  R sendData(String oid){
 		return codeDuckingSyncService.sendData(oid);
 	}
+
+	/***
+	 * 椤圭洰鍨嬪彿浠ｅ彿鏌ヨ鍚屾
+	 * @return
+	 */
+	@PostMapping("/searchItemDataForERP")
+	public R searchItemDataForERP(String endDate){
+			try {
+				codeDuckingSyncService.saveItemDataSyncScheduing(endDate);
+				return R.success("鍚屾鎴愬姛");
+			}catch (Throwable e){
+			 return	R.fail("鍚屾澶辫触");
+			}
+	}
 }

--
Gitblit v1.9.3