From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-generator/src/main/resources/web/template_1.json | 436 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 262 insertions(+), 174 deletions(-)
diff --git a/java110-generator/src/main/resources/web/template_1.json b/java110-generator/src/main/resources/web/template_1.json
old mode 100644
new mode 100755
index f247163..1d0a8ee
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,213 +1,301 @@
{
- "templateName":"鍚堝悓淇℃伅",
- "directories": "admin",
- "templateCode":"contract",
- "templateKey":"contractId",
- "templateKeyName":"鍚堝悓ID",
- "searchCode": "contractId",
- "searchName": "鍚堝悓ID",
- "conditions": [
+ "templateKeyName": "",
+ "templateName": "",
+ "columns": [
{
- "name": "鍚堝悓鍚嶇О",
+ "hasDefaultValue": false,
+ "limitParam": "30",
+ "code": "roomId",
+ "limitErrInfo": "鎴垮眿ID涓嶈兘瓒呰繃30",
+ "cnCode": "鎴垮眿ID",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "code": "contractName",
- "whereCondition": "equal"
+ "required": true,
+ "desc": "蹇呭～锛屾埧灞婭D"
},
{
- "name": "鍚堝悓缂栧彿",
+ "hasDefaultValue": false,
+ "limitParam": "12",
+ "code": "roomNum",
+ "limitErrInfo": "鎴垮眿缂栧彿涓嶈兘瓒呰繃12",
+ "cnCode": "鎴垮眿缂栧彿",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "code": "contractCode",
- "whereCondition": "equal"
+ "required": true,
+ "desc": "蹇呭～锛屾埧灞嬬紪鍙�"
},
{
- "name": "鍚堝悓绫诲瀷",
+ "hasDefaultValue": false,
+ "limitParam": "30",
+ "code": "unitId",
+ "limitErrInfo": "鍗曞厓ID涓嶈兘瓒呰繃30",
+ "cnCode": "鍗曞厓ID",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "code": "contractType",
- "whereCondition": "equal"
+ "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": "蹇呭～锛屾埧灞嬬姸鎬�"
+ },
+ {
+ "hasDefaultValue": false,
+ "limitParam": "30",
+ "code": "communityId",
+ "limitErrInfo": "灏忓尯ID涓嶈兘瓒呰繃30",
+ "cnCode": "灏忓尯ID",
+ "limit": "maxLength",
+ "show": true,
+ "inputType": "input",
+ "required": true,
+ "desc": "灏忓尯ID"
+ },
+ {
+ "hasDefaultValue": false,
+ "limitParam": "12",
+ "code": "roomType",
+ "limitErrInfo": "鎴垮眿绫诲瀷涓嶈兘瓒呰繃12",
+ "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": "蹇呭～锛岀閲�"
}
],
- "columns":[
+ "searchName": "",
+ "directories": "",
+ "searchCode": "",
+ "templateCode": "",
+ "conditions": [
{
- "code": "contractName",
- "cnCode":"鍚堝悓鍚嶇О",
- "desc":"蹇呭～锛岃濉啓鍚堝悓鍚嶇О",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"鍚堝悓鍚嶇О涓嶈兘瓒呰繃64浣�",
- "show": true
+ "whereCondition": "equal",
+ "code": "roomId",
+ "name": "鎴垮眿ID",
+ "inputType": "input"
},
{
- "code": "contractCode",
- "cnCode":"鍚堝悓缂栧彿",
- "desc":"閫夊～锛岃濉啓鍚堝悓缂栧彿",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"30",
- "limitErrInfo":"鍚堝悓缂栧彿閿欒",
- "show": true
+ "whereCondition": "equal",
+ "code": "roomNum",
+ "name": "鎴垮眿缂栧彿",
+ "inputType": "input"
},
{
- "code": "contractType",
- "cnCode":"鍚堝悓绫诲瀷",
- "desc":"蹇呭～锛岃閫夋嫨鍚堝悓绫诲瀷",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"10001,10002",
- "selectValueName":"灏忓尯鏂囧寲,鍏朵粬",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓绫诲瀷鏍煎紡閿欒",
- "show": true
+ "whereCondition": "equal",
+ "code": "unitId",
+ "name": "鍗曞厓ID",
+ "inputType": "input"
},
{
- "code": "partyA",
- "cnCode":"鐢叉柟",
- "desc":"蹇呭～锛岃濉啓鐢叉柟",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"鐢叉柟鍚嶇О澶暱",
- "show": true
+ "whereCondition": "equal",
+ "code": "layer",
+ "name": "灞傛暟",
+ "inputType": "input"
},
{
- "code": "partyB",
- "cnCode":"涔欐柟",
- "desc":"蹇呭～锛岃濉啓涔欐柟",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"涔欐柟鍚嶇О澶暱",
- "show": true
+ "whereCondition": "equal",
+ "code": "apartment",
+ "name": "鎴峰瀷",
+ "inputType": "input"
},
{
- "code": "aContacts",
- "cnCode":"鐢叉柟鑱旂郴浜�",
- "desc":"蹇呭～锛岃濉啓鐢叉柟鑱旂郴浜�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"鐢叉柟鑱旂郴浜洪暱搴﹁秴杩�64浣�",
- "show": false
+ "whereCondition": "equal",
+ "code": "builtUpArea",
+ "name": "寤虹瓚闈㈢Н",
+ "inputType": "input"
},
{
- "code": "bContacts",
- "cnCode":"涔欐柟鑱旂郴浜�",
- "desc":"蹇呭～锛岃濉啓鐢叉柟鑱旂郴浜�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"鐢叉柟鑱旂郴浜洪暱搴﹁秴杩�64浣�",
- "show": false
+ "whereCondition": "equal",
+ "code": "feeCoefficient",
+ "name": "绠楄垂绯绘暟",
+ "inputType": "input"
},
{
- "code": "aLink",
- "cnCode":"鐢叉柟鑱旂郴鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓鐢叉柟鑱旂郴鐢佃瘽",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"鐢叉柟鑱旂郴鐢佃瘽閿欒",
- "show": false
+ "whereCondition": "equal",
+ "code": "userId",
+ "name": "鐢ㄦ埛ID",
+ "inputType": "input"
},
{
- "code": "bLink",
- "cnCode":"涔欐柟鑱旂郴鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓涔欐柟鑱旂郴鐢佃瘽",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"涔欐柟鑱旂郴鐢佃瘽閿欒",
- "show": false
+ "whereCondition": "equal",
+ "code": "statusCd",
+ "name": "鏁版嵁鐘舵��",
+ "inputType": "input"
},
{
- "code": "operator",
- "cnCode":"缁忓姙浜�",
- "desc":"蹇呭～锛岃濉啓缁忓姙浜�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"缁忓姙浜鸿秴杩�64浣�",
- "show": true
+ "whereCondition": "equal",
+ "code": "state",
+ "name": "鎴垮眿鐘舵��",
+ "inputType": "input"
},
{
- "code": "operatorLink",
- "cnCode":"鑱旂郴鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓缁忓姙浜鸿仈绯荤數璇�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"缁忓姙浜鸿仈绯荤數璇濇牸寮忛敊璇�",
- "show": false
+ "whereCondition": "equal",
+ "code": "roomType",
+ "name": "鎴垮眿绫诲瀷",
+ "inputType": "input"
},
{
- "code": "amount",
- "cnCode":"鍚堝悓閲戦",
- "desc":"蹇呭～锛岃濉啓鍚堝悓閲戦",
- "required":false,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"money",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓閲戦鏍煎紡閿欒锛屽1.50",
- "show": true
+ "whereCondition": "equal",
+ "code": "roomSubType",
+ "name": "鎴垮眿绫诲瀷",
+ "inputType": "input"
},
{
- "code": "startTime",
- "cnCode":"寮�濮嬫椂闂�",
- "desc":"蹇呭～锛岃濉啓鍚堝悓寮�濮嬫椂闂�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓寮�濮嬫椂闂存牸寮忛敊璇�",
- "show": true
+ "whereCondition": "equal",
+ "code": "roomArea",
+ "name": "瀹ゅ唴闈㈢Н",
+ "inputType": "input"
},
{
- "code": "endTime",
- "cnCode":"缁撴潫鏃堕棿",
- "desc":"蹇呭～锛岃濉啓鍚堝悓缁撴潫鏃堕棿",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓缁撴潫鏃堕棿鏍煎紡閿欒",
- "show": true
- },
- {
- "code": "signingTime",
- "cnCode":"绛捐鏃堕棿",
- "desc":"閫夊～锛岃濉啓鍚堝悓绛捐鏃堕棿",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓绛捐鏃堕棿鏍煎紡閿欒",
- "show": false
+ "whereCondition": "equal",
+ "code": "roomRent",
+ "name": "绉熼噾",
+ "inputType": "input"
}
- ]
-}
\ No newline at end of file
+ ],
+ "templateKey": ""
+}
--
Gitblit v1.8.0