From a9193cfd5ae8d7fa7e0824b5f77e4deb72695dae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 16 五月 2020 22:29:00 +0800
Subject: [PATCH] 合并代码
---
java110-code-generator/src/main/resources/web/template_1.json | 110 ++++++++++++++++---------------------------------------
1 files changed, 32 insertions(+), 78 deletions(-)
diff --git a/java110-code-generator/src/main/resources/web/template_1.json b/java110-code-generator/src/main/resources/web/template_1.json
index b3bb4f7..f9c92a0 100644
--- a/java110-code-generator/src/main/resources/web/template_1.json
+++ b/java110-code-generator/src/main/resources/web/template_1.json
@@ -1,117 +1,71 @@
{
- "templateName":"宸℃浠诲姟",
- "templateCode":"inspectionTask",
- "templateKey":"taskId",
- "templateKeyName":"浠诲姟缂栫爜",
- "searchCode": "taskId",
- "searchName": "浠诲姟缂栫爜",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
+ "searchCode": "name",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "鎵ц浜�",
+ "name": "灏忕▼搴忓悕绉�",
"inputType": "input",
- "code": "planUserName",
+ "code": "name",
"whereCondition": "equal"
},
{
- "name": "宸℃璁″垝",
+ "name": "appId",
"inputType": "input",
- "code": "inspectionPlanId",
- "whereCondition": "equal"
- },
- {
- "name": "宸℃鏃堕棿",
- "inputType": "input",
- "code": "actInsTime",
+ "code": "appId",
"whereCondition": "equal"
}
],
"columns":[
{
- "code":"taskId",
- "cnCode":"浠诲姟缂栫爜",
- "desc":"蹇呭～锛岃閫夋嫨浠诲姟缂栫爜",
+ "code":"name",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"浠诲姟缂栫爜鏍煎紡閿欒",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
"show": true
},
{
- "code": "inspectionPlanId",
- "cnCode":"宸℃璁″垝",
- "desc":"蹇呭～锛岃濉啓鏀惰垂椤圭洰",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
"limit":"maxin",
"limitParam":"1,100",
- "limitErrInfo":"鏀惰垂椤圭洰涓嶈兘瓒呰繃100浣�",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
"show": true
},
{
- "code":"planInsTime",
- "cnCode":"宸℃鏃堕棿",
- "desc":"蹇呭～锛岃閫夋嫨璐圭敤鏍囪瘑",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"1003006,2006012",
- "selectValueName":"鍛ㄦ湡鎬ц垂鐢�,涓�娆℃�ц垂鐢�",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"璐圭敤绫诲瀷鏍煎紡閿欒",
- "show": true
- },
- {
- "code": "actInsTime",
- "cnCode":"瀹為檯宸℃鏃堕棿",
- "desc":"蹇呭～锛岃閫夋嫨璁¤垂璧峰鏃堕棿",
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"璁¤垂璧峰鏃堕棿涓嶆槸鏈夋晥鐨勬椂闂存牸寮�",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
},
{
- "code": "planUserName",
- "cnCode":"宸℃浜�",
- "desc":"蹇呭～锛岃閫夋嫨璁¤垂缁堟鏃堕棿",
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"璁¤垂缁堟鏃堕棿涓嶆槸鏈夋晥鐨勬椂闂存牸寮�",
- "show": true
- },
- {
- "code":"actUserName",
- "cnCode":"瀹為檯宸℃浜�",
- "desc":"蹇呭～锛岃濉啓闄勫姞璐圭敤",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"1001,2002",
- "selectValueName":"闈㈢Н*鍗曚环+闄勫姞璐�,鍥哄畾璐圭敤",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"璁＄畻鍏紡鏍煎紡閿欒",
- "show": false
- },
- {
- "code":"signType",
- "cnCode":"宸℃鏂瑰紡",
- "desc":"蹇呭～锛岃濉啓璁¤垂鍗曚环",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"money",
- "limitParam":"",
- "limitErrInfo":"璁¤垂鍗曚环鏍煎紡閿欒",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
}
]
--
Gitblit v1.8.0