From 138d5f087e386c657d964e4e4c2b8ac65038e085 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 二月 2021 14:47:06 +0800
Subject: [PATCH] 优化 考勤任务上报

---
 service-common/src/main/java/com/java110/common/api/AttrSpecApi.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java b/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
index 049fba6..ed106ed 100644
--- a/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
@@ -43,7 +43,7 @@
     @RequestMapping(value = "/saveAttrSpec", method = RequestMethod.POST)
     public ResponseEntity<String> saveAttrSpec(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+        //Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
         Assert.hasKeyAndValue(reqJson, "tableName", "璇锋眰鎶ユ枃涓湭鍖呭惈tableName");
         Assert.hasKeyAndValue(reqJson, "specName", "璇锋眰鎶ユ枃涓湭鍖呭惈specName");
         Assert.hasKeyAndValue(reqJson, "specHoldplace", "璇锋眰鎶ユ枃涓湭鍖呭惈specHoldplace");
@@ -113,9 +113,19 @@
      * @path /app/attrSpec/queryAttrSpec
      */
     @RequestMapping(value = "/queryAttrSpec", method = RequestMethod.GET)
-    public ResponseEntity<String> queryAttrSpec(@RequestParam(value = "tableName") String tableName) {
+    public ResponseEntity<String> queryAttrSpec(@RequestParam(value = "tableName", required = false) String tableName,
+                                                @RequestParam(value = "specCd", required = false) String specCd,
+                                                @RequestParam(value = "specName", required = false) String specName,
+                                                @RequestParam(value = "page", required = false) int page,
+                                                @RequestParam(value = "row", required = false) int row
+
+    ) {
         AttrSpecDto attrSpecDto = new AttrSpecDto();
         attrSpecDto.setTableName(tableName);
+        attrSpecDto.setPage(page);
+        attrSpecDto.setRow(row);
+        attrSpecDto.setSpecCd(specCd);
+        attrSpecDto.setSpecName(specName);
         return getAttrSpecBMOImpl.get(attrSpecDto);
     }
 }

--
Gitblit v1.8.0