From 69b3f1883104760eacc03ab9f1a72a958933c785 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 17 十月 2023 12:03:10 +0800
Subject: [PATCH] 1、修改回收验证回收的改成发布的，里面的数据oid也要改成最新的的数据oid。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 0507011..988a97b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -7,12 +7,15 @@
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.*;
+import com.vci.ubcs.starter.util.UBCSCondition;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Map;
@Service
public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
@@ -32,6 +35,12 @@
private IDockingLogeService dockingLogeService;
/***
+ * 闆嗘垚浠诲姟鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingTaskService dockingTaskService;
+
+ /***
* 闆嗘垚鎺ュ彛澶村崗璁湇鍔�
*/
@Autowired( required = false)
@@ -49,46 +58,46 @@
private IDockingDataService dockingDataService;
/**
* data鍒楄〃
- * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
@Override
- public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
- IPage<DockingTask> pages=null;
-// IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+ public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) {
+ IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingTaskWrapper.build().pageVO(pages);
}
@Override
- public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
- IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
+ public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) {
+ IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingDataWrapper.build().pageVO(pages);
}
/**
* 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
- * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@Override
- public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
- IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+ public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
+ //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+ IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingLogeWrapper.build().pageVO(pages);
}
@Override
- public IPage<DockingSysIntParamVO> gridParam(DockingSysIntParam dockingSysIntParam, Query query) {
- IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntParam));
+ public IPage<DockingSysIntParamVO> gridParam(Map<String,String> condtionMap, Query query) {
+ IPage<DockingSysIntParam> pages=dockingSysIntParamService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingSysIntParamWrapper.build().pageVO(pages);
}
/**
* 鎺ュ彛param鍒楄〃
- * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@Override
- public IPage<DockingSysIntHeaderVO> gridHeader(DockingSysIntHeader dockingSysIntHeader , Query query) {
- IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSysIntHeader));
+ public IPage<DockingSysIntHeaderVO> gridHeader(Map<String,String> condtionMap , Query query) {
+ IPage<DockingSysIntHeader> pages = dockingSysIntHeaderService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
return DockingSysIntHeaderWrapper.build().pageVO(pages);
}
}
--
Gitblit v1.9.3