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 | 348 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 279 insertions(+), 69 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 f891dd1..1d0a8ee
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,91 +1,301 @@
{
- "templateName": "鎷煎洟璁剧疆",
- "directories": "goods",
- "templateCode": "groupBuySetting",
- "templateKey": "settingId",
- "templateKeyName": "璁剧疆ID",
- "searchCode": "settingId",
- "searchName": "璁剧疆ID",
- "conditions": [
- {
- "name": "鎷煎洟鍚嶇О",
- "inputType": "input",
- "code": "groupBuyName",
- "whereCondition": "equal"
- },
- {
- "name": "鎷煎洟鏃舵晥",
- "inputType": "input",
- "code": "validHours",
- "whereCondition": "equal"
- },
- {
- "name": "璁剧疆ID",
- "inputType": "input",
- "code": "settingId",
- "whereCondition": "equal"
- }
- ],
+ "templateKeyName": "",
+ "templateName": "",
"columns": [
{
- "code": "groupBuyName",
- "cnCode": "鎷煎洟鍚嶇О",
- "desc": "蹇呭～锛岃濉啓鎷煎洟鍚嶇О",
- "required": true,
"hasDefaultValue": false,
- "inputType": "input",
+ "limitParam": "30",
+ "code": "roomId",
+ "limitErrInfo": "鎴垮眿ID涓嶈兘瓒呰繃30",
+ "cnCode": "鎴垮眿ID",
"limit": "maxLength",
- "limitParam": "256",
- "limitErrInfo": "鎷煎洟鍚嶇О涓嶈兘瓒呰繃256浣�",
- "show": true
+ "show": true,
+ "inputType": "input",
+ "required": true,
+ "desc": "蹇呭～锛屾埧灞婭D"
},
{
- "code": "groupBuyDesc",
- "cnCode": "鎷煎洟绠�浠�",
- "desc": "蹇呭～锛岃濉啓鎷煎洟绠�浠�",
- "required": true,
"hasDefaultValue": false,
- "inputType": "input",
+ "limitParam": "12",
+ "code": "roomNum",
+ "limitErrInfo": "鎴垮眿缂栧彿涓嶈兘瓒呰繃12",
+ "cnCode": "鎴垮眿缂栧彿",
"limit": "maxLength",
- "limitParam": "500",
- "limitErrInfo": "鎷煎洟绠�浠嬩笉鑳借秴杩�500浣�",
- "show": true
+ "show": true,
+ "inputType": "input",
+ "required": true,
+ "desc": "蹇呭～锛屾埧灞嬬紪鍙�"
},
{
- "code": "validHours",
- "cnCode": "鎷煎洟鏃舵晥",
- "desc": "蹇呭～锛岃濉啓鎷煎洟鏃舵晥",
- "required": true,
"hasDefaultValue": false,
+ "limitParam": "30",
+ "code": "unitId",
+ "limitErrInfo": "鍗曞厓ID涓嶈兘瓒呰繃30",
+ "cnCode": "鍗曞厓ID",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "limit": "num",
- "limitParam": "",
- "limitErrInfo": "鎷煎洟鏃舵晥涓嶆槸鏈夋晥鏁板瓧",
- "show": true
+ "required": true,
+ "desc": "蹇呭～锛屽崟鍏僆D"
},
{
- "code": "startTime",
- "cnCode": "寮�濮嬫椂闂�",
- "desc": "蹇呭～锛岃濉啓寮�濮嬫椂闂�",
- "required": true,
"hasDefaultValue": false,
+ "limitParam": "11",
+ "code": "layer",
+ "limitErrInfo": "灞傛暟涓嶈兘瓒呰繃11",
+ "cnCode": "灞傛暟",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "limit": "datetime",
- "limitParam": "",
- "limitErrInfo": "寮�濮嬫椂闂翠笉鏄湁鏁堟棩鏈�",
- "show": true
+ "required": true,
+ "desc": "蹇呭～锛屽眰鏁�"
},
{
- "code": "endTime",
- "cnCode": "缁撴潫鏃堕棿",
- "desc": "蹇呭～锛岃濉啓缁撴潫鏃堕棿",
- "required": true,
"hasDefaultValue": false,
+ "limitParam": "11",
+ "code": "section",
+ "limitErrInfo": "瀹や笉鑳借秴杩�11",
+ "cnCode": "瀹�",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "limit": "datetime",
- "limitParam": "",
- "limitErrInfo": "缁撴潫鏃堕棿涓嶆槸鏈夋晥鏃ユ湡",
- "show": true
+ "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": "蹇呭～锛岀閲�"
}
- ]
-}
\ No newline at end of file
+ ],
+ "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