From b3c79c2addbccedef3eb29c2befe77803bfd106b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 03 二月 2020 17:06:54 +0800
Subject: [PATCH] 优化收费汇总

---
 java110-code-generator/src/main/resources/web/template_1.json |  142 +++++++++++++++++++++++++++-------------------
 1 files changed, 83 insertions(+), 59 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 49d5e45..b948c91 100644
--- a/java110-code-generator/src/main/resources/web/template_1.json
+++ b/java110-code-generator/src/main/resources/web/template_1.json
@@ -1,111 +1,135 @@
 {
-  "templateName":"娲诲姩",
-  "templateCode":"activities",
-  "templateKey":"activitiesId",
-  "templateKeyName":"娲诲姩ID",
-  "searchCode": "title",
-  "searchName": "娲诲姩鏍囬",
+  "templateName":"璐圭敤椤�",
+  "templateCode":"feeConfig",
+  "templateKey":"configId",
+  "templateKeyName":"璐圭敤椤笽D",
+  "searchCode": "feeName",
+  "searchName": "璐圭敤椤圭洰",
   "conditions": [
     {
-      "name": "娲诲姩鏍囬",
-      "inputType": "input",
-      "code": "title",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "娲诲姩绫诲瀷",
+      "name": "璐圭敤鏍囪瘑",
       "inputType": "select",
-      "selectValue":"10001,10002",
-      "selectValueName":"灏忓尯鏂囧寲,鍏朵粬",
-      "code": "typeCd",
+      "selectValue":"1003006,2006012",
+      "selectValueName":"鍛ㄦ湡鎬ц垂鐢�,涓�娆℃�ц垂鐢�",
+      "code": "feeFlag",
       "whereCondition": "equal"
     },
     {
-      "name": "鍛樺伐鍚嶇О",
+      "name": "璐圭敤椤圭洰",
       "inputType": "input",
-      "code": "userName",
+      "code": "feeName",
       "whereCondition": "equal"
     },
     {
-      "name": "娲诲姩ID",
-      "inputType": "input",
-      "code": "activitiesId",
+      "name": "璐圭敤绫诲瀷",
+      "inputType": "select",
+      "selectValue":"888800010001,888800010002,888800010003,888800010004,888800010005,888800010007",
+      "selectValueName":"鐗╀笟璐�,鍦颁笂鍑哄敭杞︿綅璐�,鍦颁笅鍑哄敭杞︿綅璐�,鍦颁笂鍑虹杞︿綅璐�,鍦颁笅鍑虹杞︿綅璐�,涓存椂杞﹁垂鐢�",
+      "code": "feeTypeCd",
       "whereCondition": "equal"
     }
   ],
   "columns":[
     {
-      "code":"title",
-      "cnCode":"娲诲姩鏍囬",
-      "desc":"蹇呭~锛岃濉啓涓氭椿鍔ㄦ爣棰�",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType":"input",
-      "limit":"maxin",
-      "limitParam":"1,200",
-      "limitErrInfo":"娲诲姩鏍囬涓嶈兘瓒呰繃200浣�",
-      "show": true
-    },
-    {
-      "code": "typeCd",
-      "cnCode":"娲诲姩绫诲瀷",
-      "desc":"蹇呭~锛岃閫夋嫨娲诲姩绫诲瀷",
+      "code":"feeTypeCd",
+      "cnCode":"璐圭敤绫诲瀷",
+      "desc":"蹇呭~锛岃閫夋嫨璐圭敤绫诲瀷",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "select",
-      "selectValue":"10001,10002",
-      "selectValueName":"灏忓尯鏂囧寲,鍏朵粬",
+      "selectValue":"888800010001,888800010002,888800010003,888800010004,888800010005,888800010007",
+      "selectValueName":"鐗╀笟璐�,鍦颁笂鍑哄敭杞︿綅璐�,鍦颁笅鍑哄敭杞︿綅璐�,鍦颁笂鍑虹杞︿綅璐�,鍦颁笅鍑虹杞︿綅璐�,涓存椂杞﹁垂鐢�",
       "limit":"num",
       "limitParam":"",
-      "limitErrInfo":"娲诲姩绫诲瀷鏍煎紡閿欒",
+      "limitErrInfo":"璐圭敤绫诲瀷鏍煎紡閿欒",
       "show": true
     },
     {
-      "code": "headerImg",
-      "cnCode":"澶撮儴鐓х墖",
-      "desc":"蹇呭~锛岃閫夋嫨澶撮儴鐓х墖",
+      "code": "feeName",
+      "cnCode":"鏀惰垂椤圭洰",
+      "desc":"蹇呭~锛岃濉啓鏀惰垂椤圭洰",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
       "limit":"maxin",
-      "limitParam":"1,200",
-      "limitErrInfo":"澶撮儴鐓х墖鏍煎紡閿欒",
+      "limitParam":"1,100",
+      "limitErrInfo":"鏀惰垂椤圭洰涓嶈兘瓒呰繃100浣�",
       "show": true
     },
     {
-      "code": "context",
-      "cnCode":"娲诲姩鍐呭",
-      "desc":"蹇呭~锛岃濉啓娲诲姩鍐呭",
+      "code":"feeFlag",
+      "cnCode":"璐圭敤鏍囪瘑",
+      "desc":"蹇呭~锛岃閫夋嫨璐圭敤鏍囪瘑",
       "required":true,
       "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"maxin",
-      "limitParam":"1,4000",
-      "limitErrInfo":"娲诲姩鍐呭澶暱",
+      "inputType": "select",
+      "selectValue":"1003006,2006012",
+      "selectValueName":"鍛ㄦ湡鎬ц垂鐢�,涓�娆℃�ц垂鐢�",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"璐圭敤绫诲瀷鏍煎紡閿欒",
       "show": true
     },
     {
       "code": "startTime",
-      "cnCode":"寮�濮嬫椂闂�",
-      "desc":"蹇呭~锛岃閫夋嫨寮�濮嬫椂闂�",
+      "cnCode":"璁¤垂璧峰鏃堕棿",
+      "desc":"蹇呭~锛岃閫夋嫨璁¤垂璧峰鏃堕棿",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"date",
+      "limit":"dateTime",
       "limitParam":"",
-      "limitErrInfo":"寮�濮嬫椂闂存牸寮忛敊璇�",
+      "limitErrInfo":"璁¤垂璧峰鏃堕棿涓嶆槸鏈夋晥鐨勬椂闂存牸寮�",
       "show": true
     },
     {
       "code": "endTime",
-      "cnCode":"缁撴潫鏃堕棿",
-      "desc":"蹇呭~锛岃閫夋嫨缁撴潫鏃堕棿",
+      "cnCode":"璁¤垂缁堟鏃堕棿",
+      "desc":"蹇呭~锛岃閫夋嫨璁¤垂缁堟鏃堕棿",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"date",
+      "limit":"dateTime",
       "limitParam":"",
-      "limitErrInfo":"缁撴潫鏃堕棿鏍煎紡閿欒",
+      "limitErrInfo":"璁¤垂缁堟鏃堕棿涓嶆槸鏈夋晥鐨勬椂闂存牸寮�",
+      "show": true
+    },
+    {
+      "code":"computingFormula",
+      "cnCode":"璁$畻鍏紡",
+      "desc":"蹇呭~锛岃濉啓闄勫姞璐圭敤",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"闈㈢Н*鍗曚环+闄勫姞璐�,鍥哄畾璐圭敤",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"璁$畻鍏紡鏍煎紡閿欒",
+      "show": false
+    },
+    {
+      "code":"squarePrice",
+      "cnCode":"璁¤垂鍗曚环",
+      "desc":"蹇呭~锛岃濉啓璁¤垂鍗曚环",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"money",
+      "limitParam":"",
+      "limitErrInfo":"璁¤垂鍗曚环鏍煎紡閿欒",
+      "show": true
+    },
+    {
+      "code":"additionalAmount",
+      "cnCode":"闄勫姞璐圭敤",
+      "desc":"蹇呭~锛岃濉啓闄勫姞璐圭敤",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"money",
+      "limitParam":"",
+      "limitErrInfo":"闄勫姞璐圭敤鏍煎紡閿欒",
       "show": true
     }
   ]

--
Gitblit v1.8.0