From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-generator/src/main/resources/web/template_1.json | 313 ++++++---------------------------------------------
1 files changed, 40 insertions(+), 273 deletions(-)
diff --git a/java110-generator/src/main/resources/web/template_1.json b/java110-generator/src/main/resources/web/template_1.json
index 1d0a8ee..6088c13 100755
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,150 +1,43 @@
{
- "templateKeyName": "",
- "templateName": "",
+ "templateName":"鏀舵嵁妯℃澘",
+ "directories": "property",
+ "templateCode":"feePrintPage",
+ "templateKey":"pageId",
+ "templateKeyName":"鏀舵嵁ID",
+ "searchCode": "pageId",
+ "searchName": "鏀舵嵁ID",
+ "conditions": [
+ {
+ "whereCondition": "equal",
+ "code": "pageId",
+ "name": "椤甸潰ID",
+ "inputType": "input"
+ },
+ {
+ "whereCondition": "equal",
+ "code": "pageName",
+ "name": "鍚嶇О",
+ "inputType": "input"
+ },
+ {
+ "whereCondition": "equal",
+ "code": "state",
+ "name": "鐘舵��",
+ "inputType": "input"
+ }
+ ],
"columns": [
{
"hasDefaultValue": false,
- "limitParam": "30",
- "code": "roomId",
- "limitErrInfo": "鎴垮眿ID涓嶈兘瓒呰繃30",
- "cnCode": "鎴垮眿ID",
+ "limitParam": "128",
+ "code": "pageName",
+ "limitErrInfo": "鍚嶇О涓嶈兘瓒呰繃128",
+ "cnCode": "鍚嶇О",
"limit": "maxLength",
"show": true,
"inputType": "input",
"required": true,
- "desc": "蹇呭～锛屾埧灞婭D"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "12",
- "code": "roomNum",
- "limitErrInfo": "鎴垮眿缂栧彿涓嶈兘瓒呰繃12",
- "cnCode": "鎴垮眿缂栧彿",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屾埧灞嬬紪鍙�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "30",
- "code": "unitId",
- "limitErrInfo": "鍗曞厓ID涓嶈兘瓒呰繃30",
- "cnCode": "鍗曞厓ID",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屽崟鍏僆D"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "11",
- "code": "layer",
- "limitErrInfo": "灞傛暟涓嶈兘瓒呰繃11",
- "cnCode": "灞傛暟",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屽眰鏁�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "11",
- "code": "section",
- "limitErrInfo": "瀹や笉鑳借秴杩�11",
- "cnCode": "瀹�",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "瀹�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "20",
- "code": "apartment",
- "limitErrInfo": "鎴峰瀷涓嶈兘瓒呰繃20",
- "cnCode": "鎴峰瀷",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屾埛鍨�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "6",
- "code": "builtUpArea",
- "limitErrInfo": "寤虹瓚闈㈢Н涓嶈兘瓒呰繃6",
- "cnCode": "寤虹瓚闈㈢Н",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屽缓绛戦潰绉�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "12",
- "code": "feeCoefficient",
- "limitErrInfo": "绠楄垂绯绘暟涓嶈兘瓒呰繃12",
- "cnCode": "绠楄垂绯绘暟",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛岀畻璐圭郴鏁�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "30",
- "code": "userId",
- "limitErrInfo": "鐢ㄦ埛ID涓嶈兘瓒呰繃30",
- "cnCode": "鐢ㄦ埛ID",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛岀敤鎴稩D"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "200",
- "code": "remark",
- "limitErrInfo": "澶囨敞涓嶈兘瓒呰繃200",
- "cnCode": "澶囨敞",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "澶囨敞"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "2",
- "code": "statusCd",
- "limitErrInfo": "鏁版嵁鐘舵�佷笉鑳借秴杩�2",
- "cnCode": "鏁版嵁鐘舵��",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屾暟鎹姸鎬�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "4",
- "code": "state",
- "limitErrInfo": "鎴垮眿鐘舵�佷笉鑳借秴杩�4",
- "cnCode": "鎴垮眿鐘舵��",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屾埧灞嬬姸鎬�"
+ "desc": "蹇呭～锛屽悕绉�"
},
{
"hasDefaultValue": false,
@@ -156,146 +49,20 @@
"show": true,
"inputType": "input",
"required": true,
- "desc": "灏忓尯ID"
+ "desc": "蹇呭～锛屽皬鍖篒D"
},
{
"hasDefaultValue": false,
- "limitParam": "12",
- "code": "roomType",
- "limitErrInfo": "鎴垮眿绫诲瀷涓嶈兘瓒呰繃12",
- "cnCode": "鎴垮眿绫诲瀷",
+ "limitParam": "512",
+ "code": "pageUrl",
+ "limitErrInfo": "鏀舵嵁椤甸潰涓嶈兘瓒呰繃512",
+ "cnCode": "鏀舵嵁椤甸潰",
"limit": "maxLength",
"show": true,
"inputType": "input",
"required": true,
- "desc": "蹇呭～锛屾埧灞嬬被鍨�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "12",
- "code": "roomSubType",
- "limitErrInfo": "鎴垮眿绫诲瀷涓嶈兘瓒呰繃12",
- "cnCode": "鎴垮眿绫诲瀷",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屾埧灞嬬被鍨�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "6",
- "code": "roomArea",
- "limitErrInfo": "瀹ゅ唴闈㈢Н涓嶈兘瓒呰繃6",
- "cnCode": "瀹ゅ唴闈㈢Н",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛屽鍐呴潰绉�"
- },
- {
- "hasDefaultValue": false,
- "limitParam": "10",
- "code": "roomRent",
- "limitErrInfo": "绉熼噾涓嶈兘瓒呰繃10",
- "cnCode": "绉熼噾",
- "limit": "maxLength",
- "show": true,
- "inputType": "input",
- "required": true,
- "desc": "蹇呭～锛岀閲�"
+ "desc": "蹇呭～锛屾敹鎹〉闈�"
}
- ],
- "searchName": "",
- "directories": "",
- "searchCode": "",
- "templateCode": "",
- "conditions": [
- {
- "whereCondition": "equal",
- "code": "roomId",
- "name": "鎴垮眿ID",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "roomNum",
- "name": "鎴垮眿缂栧彿",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "unitId",
- "name": "鍗曞厓ID",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "layer",
- "name": "灞傛暟",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "apartment",
- "name": "鎴峰瀷",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "builtUpArea",
- "name": "寤虹瓚闈㈢Н",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "feeCoefficient",
- "name": "绠楄垂绯绘暟",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "userId",
- "name": "鐢ㄦ埛ID",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "statusCd",
- "name": "鏁版嵁鐘舵��",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "state",
- "name": "鎴垮眿鐘舵��",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "roomType",
- "name": "鎴垮眿绫诲瀷",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "roomSubType",
- "name": "鎴垮眿绫诲瀷",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "roomArea",
- "name": "瀹ゅ唴闈㈢Н",
- "inputType": "input"
- },
- {
- "whereCondition": "equal",
- "code": "roomRent",
- "name": "绉熼噾",
- "inputType": "input"
- }
- ],
- "templateKey": ""
+ ]
+
}
--
Gitblit v1.8.0