From ccb933362251344091a3881a4950dcab33c5008f Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期六, 28 三月 2020 11:47:55 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/MasterDataController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
index d33f3d5..6f1c5f7 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
@@ -20,9 +20,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -41,7 +39,8 @@
IMaintainService maintainService;
@Autowired
IMaintainDetailService maintainDetailService;
-
+ @Autowired
+ IMaintainFieldService maintainFieldService;
@Autowired
IMenuMappingService menuMappingService;
@@ -50,6 +49,8 @@
@Autowired
IMasterModifiedService masterModifiedService;
+ @Autowired
+ IMasterAuthorService masterAuthorService;
@RequestMapping(value = "{tableName}/uploaded", method = RequestMethod.GET)
public Result get(@PathVariable String tableName, HttpServletRequest request) {
@@ -106,7 +107,7 @@
}
version = String.valueOf(maxVersion.getVersion());
}
-
+ masterAuthorService.getFilter()
if (StringUtils.isEmpty(fields)) {
if (StringUtils.isEmpty(pageSizeStr)) {
return masterDataService.selectListByPageByVersion(tableName, whereSegment,pageNo,version, findMax);
@@ -130,9 +131,9 @@
version = String.valueOf(maintainService.getNowVersion(tableName).getVersion());
}
if (StringUtils.isEmpty(whereSegment)) {
- return masterDataService.selectList(tableName);
+ return masterDataService.selectList(tableName,Constant.WHERE_DEFAULT, version);
}
- return masterDataService.selectList(tableName,whereSegment);
+ return masterDataService.selectList(tableName,whereSegment, version);
}
@RequestMapping(value = "{maintainId}/modify/{operateStr}", method = RequestMethod.POST)
@@ -334,10 +335,21 @@
}
}
+ @RequestMapping(value = "/getValByMaintainFieldId/{maintainFieldId}", method = RequestMethod.GET)
+ public Result getValByMaintainFieldId(@PathVariable String maintainFieldId,@RequestParam String menuId, @RequestParam String field, HttpServletRequest request) {
+ String tableName = menuMappingService.getTableNameByMenu(menuId);
+ if (StringUtils.isEmpty(tableName)) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ if (maintainFieldId.equalsIgnoreCase(Constant.All)) {
+ Set<String> fieldValList = masterDataService.getFieldValByTable(tableName, field);
+ return Result.success(fieldValList);
+ }
+ Set<String> fieldValByMaintainField = masterDataService.getFieldValByMaintainField(maintainFieldId, field, tableName);
- @RequestMapping(value = "{tableName}/getFieldVal/{field}", method = RequestMethod.GET)
- public Result getFieldVal(@PathVariable String tableName, @PathVariable String field) {
- return masterDataService.getFieldValByTable(tableName,field);
+ return Result.success(fieldValByMaintainField);
}
+
+
}
--
Gitblit v1.8.0