From d02571d59633367ac76b7f58ab38584698b1aa1b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:55:37 +0800
Subject: [PATCH] 高级查询中增加范围查询功能
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index 5da8b84..6998811 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -1,6 +1,5 @@
package com.vci.ubcs.code.applyjtcodeservice.controller;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
@@ -48,32 +47,26 @@
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 鍒嗙被灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreClassifyService dockingPreClassifyService;
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreViewModelService dockingPreViewModelService;
-
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final ICodeClassifyClient codeClassifyClient;
/**
@@ -109,7 +102,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆dockingPreApplyForm")
public R<IPage<DockingPreApplyFormVO>> page(DockingPreApplyForm dockingPreApplyForm, Query query) {
- IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
+ IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query.setDescs("createTime")), Condition.getQueryWrapper(dockingPreApplyForm));
return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
}
@@ -123,7 +116,7 @@
@ApiOperation(value = "淇濆瓨灞炴�ф槧灏勯厤缃�", notes = "dockingPreAttrMappingVOList")
public R batchSave(@RequestBody DockingPreAttrMappingVOList dockingPreAttrMappingVOList){
List<DockingPreAttrMappingVO> dockingPreAttrMappingVOs = dockingPreAttrMappingVOList.getDockingPreAttrMappingVOList();
- List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>();
+ List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS = new ArrayList<>();
try {
dockingPreAttrRangeVOS = dockingPreAttrMappingService.batchAddSave(dockingPreAttrMappingVOs);
}catch (Exception e){
@@ -131,7 +124,6 @@
}
return R.data(dockingPreAttrRangeVOS);
}
-
/**
* 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
@@ -142,7 +134,6 @@
public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
-
/**
* 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
@@ -174,7 +165,6 @@
return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
}
-
/***
* 鐢宠闆嗗洟缂栫爜
* @return
@@ -183,13 +173,13 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
public R applyGroupCode(String oids,String btmName){
- List<BaseModelVO> BaseModelVOS=new ArrayList<>();
try {
return groupMdmInterService.applyGroupCode(oids,btmName);
}catch (Throwable e){
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
+
/***
* 鏇存柊闆嗗洟缂栫爜鏁版嵁
* @return
@@ -222,11 +212,11 @@
}
-/***
- * 鏌ヨ鐢宠鍗曠姸鎬�
- * oids:涓氬姟鏁版嵁oid
- * @return 杩斿洖鎵ц缁撴灉淇℃伅
- */
+ /***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * oids:涓氬姟鏁版嵁oid
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
@GetMapping( "/queryApplyState")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
--
Gitblit v1.9.3