From 53e7800fab427eeb408b10353bd691603cdbd5e3 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Mon, 15 Mar 2021 20:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wgink/code/factory/service/FieldService.java   |  7 ++++++-
 src/main/resources/template/normal/page/save.ftl   | 14 +++-----------
 src/main/resources/template/normal/page/update.ftl |  8 ++++----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ink/wgink/code/factory/service/FieldService.java b/src/main/java/ink/wgink/code/factory/service/FieldService.java
index 0a931a9..581c9d7 100644
--- a/src/main/java/ink/wgink/code/factory/service/FieldService.java
+++ b/src/main/java/ink/wgink/code/factory/service/FieldService.java
@@ -118,12 +118,17 @@ public class FieldService {
                             fieldVO.setColumnName(columnName);
                             fieldVO.setColumnType(field.get("COLUMN_TYPE").toString());
                             fieldVO.setDataType(field.get("DATA_TYPE").toString());
-                            fieldVO.setCharacterMaximum(field.get("CHARACTER_MAXIMUM") == null ? 0 : Integer.valueOf(field.get("CHARACTER_MAXIMUM").toString()));
+                            fieldVO.setCharacterMaximum(field.get("CHARACTER_MAXIMUM_LENGTH") == null ? 0 : Integer.valueOf(field.get("CHARACTER_MAXIMUM_LENGTH").toString()));
                             fieldVO.setNumericPrecision(field.get("NUMERIC_PRECISION") == null ? 0 : Integer.valueOf(field.get("NUMERIC_PRECISION").toString()));
                             fieldVO.setNumericScale(field.get("NUMERIC_SCALE") == null ? 0 : Integer.valueOf(field.get("NUMERIC_SCALE").toString()));
                             fieldVO.setColumnComment(field.get("COLUMN_COMMENT") == null ? "" : field.get("COLUMN_COMMENT").toString());
                             fieldVO.setColumnDefault(field.get("COLUMN_DEFAULT") == null ? "" : field.get("COLUMN_DEFAULT").toString());
                             fieldVO.setPropertyName(WStringUtil.underLine2LowerUpper(fieldVO.getColumnName()));
+                            if (fieldVO.getNumericPrecision() != 0) {
+                                fieldVO.setPropertyLength(fieldVO.getNumericPrecision());
+                            } else {
+                                fieldVO.setPropertyLength(fieldVO.getCharacterMaximum());
+                            }
                             fieldVO.setNotNull(StringUtils.equalsIgnoreCase(ColumnIsNullableEnum.YES.getValue(), field.get("IS_NULLABLE").toString()) ? false : true);
                             fieldVO.setPropertyType(getPropertyType(fieldVO.getDataType()));
                             fieldVO.setFormFieldType(getFormFieldType(fieldVO.getDataType()));
diff --git a/src/main/resources/template/normal/page/save.ftl b/src/main/resources/template/normal/page/save.ftl
index 49183c4..a5177a1 100644
--- a/src/main/resources/template/normal/page/save.ftl
+++ b/src/main/resources/template/normal/page/save.ftl
@@ -259,11 +259,11 @@
                         <input type="text" id="${field.propertyName}SelectDepartment" class="layui-input" placeholder="请选择${field.columnComment}" data-name="${field.propertyName}" readonly style="cursor:pointer;">
                     </div>
                 </div>
-                        <#elseif field.formFieldValue == "string">
+                        <#elseif field.formFieldValue == "text">
                 <div class="layui-form-item">
                     <label class="layui-form-label">${field.columnComment}</label>
                     <div class="layui-input-block">
-                        <input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if>  <#if field.propertyLength > 0>maxlength="${field.propertyLength}"</#if>>
+                        <input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> maxlength="${field.propertyLength}">
                     </div>
                 </div>
                         </#if>
@@ -670,7 +670,6 @@
 
         // 初始化内容
         function initData() {
-            top.restAjax.get(top.restAjax.path('api/${lowerTableName}/getcurrentuseridinfo', []), {}, null, function(code, data) {
             <#list fieldList! as field>
                 <#if field.formShow>
                     <#if field.formFieldValue == "date">
@@ -694,13 +693,6 @@
                     </#if>
                 </#if>
             </#list>
-            }, function(code, data) {
-                top.dialog.msg(data.msg);
-            }, function() {
-                loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
-            }, function() {
-                top.dialog.close(loadLayerIndex);
-            });
         }
         initData();
 
@@ -718,7 +710,7 @@
                         </#if>
                     </#if>
                 </#list>
-                top.restAjax.post(top.restAjax.path('api/${lowerTableName}/save${lowerTableName}', []), formData.field, null, function(code, data) {
+                top.restAjax.post(top.restAjax.path('api/${lowerTableName}/save', []), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
                         time: 0,
                         btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
diff --git a/src/main/resources/template/normal/page/update.ftl b/src/main/resources/template/normal/page/update.ftl
index b0633b7..3e17d0c 100644
--- a/src/main/resources/template/normal/page/update.ftl
+++ b/src/main/resources/template/normal/page/update.ftl
@@ -259,11 +259,11 @@
                         <input type="text" id="${field.propertyName}SelectDepartment" class="layui-input" placeholder="请选择${field.columnComment}" data-name="${field.propertyName}" readonly style="cursor:pointer;">
                     </div>
                 </div>
-                        <#elseif field.formFieldValue == "string">
+                        <#elseif field.formFieldValue == "text">
                 <div class="layui-form-item">
                     <label class="layui-form-label">${field.columnComment}</label>
                     <div class="layui-input-block">
-                        <input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> <#if field.propertyLength > 0>maxlength="${field.propertyLength}"</#if>>
+                        <input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> maxlength="${field.propertyLength}">
                     </div>
                 </div>
                         </#if>
@@ -689,7 +689,7 @@
         // 初始化内容
         function initData() {
             var loadLayerIndex;
-            top.restAjax.get(top.restAjax.path('api/${lowerTableName}/get${lowerTableName}byid/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), {}, null, function(code, data) {
+            top.restAjax.get(top.restAjax.path('api/${lowerTableName}/get/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), {}, null, function(code, data) {
                 var dataFormData = {};
                 for(var i in data) {
                     dataFormData[i] = data[i] +'';
@@ -741,7 +741,7 @@
                         </#if>
                     </#if>
                 </#list>
-                top.restAjax.put(top.restAjax.path('api/${lowerTableName}/update${lowerTableName}/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), formData.field, null, function(code, data) {
+                top.restAjax.put(top.restAjax.path('api/${lowerTableName}/update/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
                         time: 0,
                         btn: [top.dataMessage.button.yes, top.dataMessage.button.no],