java110 пре 5 година
родитељ
комит
84f41dff3a

+ 1 - 1
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -270,7 +270,7 @@ public class GenerateCodeFactory {
      * @throws GenerateCodeException
      */
     public static String getSpecCd() throws GenerateCodeException {
-            return DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_H) + nextId("%04d");
+            return DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_L) + nextId("%04d");
     }
 
     public static String getOId() throws GenerateCodeException {

+ 2 - 0
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -31,6 +31,7 @@ public class DateUtil {
     public static final String DATE_FORMATE_STRING_I = "yyyy-MM-dd HH:mm:ss.SSS";
     public static final String DATE_FORMATE_STRING_J = "yyyyMMddHHmmss.SSS";
     public static final String DATE_FORMATE_STRING_K = "yyyyMMddHHmmssSSS";
+    public static final String DATE_FORMATE_STRING_L = "MMdd";
 
     static {
         formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -45,6 +46,7 @@ public class DateUtil {
         formats.put("yyyy-MM-dd HH:mm:ss.SSS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
         formats.put("yyyyMMddHHmmss.SSS", new SimpleDateFormat("yyyyMMddHHmmss.SSS"));
         formats.put("yyyyMMddHHmmssSSS", new SimpleDateFormat("yyyyMMddHHmmssSSS"));
+        formats.put("MMdd", new SimpleDateFormat("MMdd"));
     }
 
 

+ 11 - 1
service-common/src/main/java/com/java110/common/api/AttrSpecApi.java

@@ -113,9 +113,19 @@ public class AttrSpecApi {
      * @path /app/attrSpec/queryAttrSpec
      */
     @RequestMapping(value = "/queryAttrSpec", method = RequestMethod.GET)
-    public ResponseEntity<String> queryAttrSpec(@RequestParam(value = "tableName",required = false) 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);
     }
 }