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 |  161 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 86 insertions(+), 75 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 fa00ad9..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,124 +1,135 @@
 {
-  "templateName":"寮�闂ㄨ褰�",
-  "templateCode":"machineRecord",
-  "templateKey":"machineRecordId",
-  "templateKeyName":"寮�闂ㄨ褰旾D",
-  "searchCode": "name",
-  "searchName": "鍚嶇О",
+  "templateName":"璐圭敤椤�",
+  "templateCode":"feeConfig",
+  "templateKey":"configId",
+  "templateKeyName":"璐圭敤椤笽D",
+  "searchCode": "feeName",
+  "searchName": "璐圭敤椤圭洰",
   "conditions": [
     {
-      "name": "鐢ㄦ埛鍚嶇О",
-      "inputType": "input",
-      "code": "name",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "寮�闂ㄦ柟寮�",
+      "name": "璐圭敤鏍囪瘑",
       "inputType": "select",
-      "code": "openTypeCd",
-      "selectValue":"1000,2000",
-      "selectValueName":"浜鸿劯寮�闂�,閽ュ寵寮�闂�",
+      "selectValue":"1003006,2006012",
+      "selectValueName":"鍛ㄦ湡鎬ц垂鐢�,涓�娆℃�ц垂鐢�",
+      "code": "feeFlag",
       "whereCondition": "equal"
     },
     {
-      "name": "鐢ㄦ埛鎵嬫満",
+      "name": "璐圭敤椤圭洰",
       "inputType": "input",
-      "code": "tel",
+      "code": "feeName",
       "whereCondition": "equal"
     },
     {
-      "name": "鐢ㄦ埛绫诲瀷",
+      "name": "璐圭敤绫诲瀷",
       "inputType": "select",
-      "code": "ownerTypeCd",
-      "selectValue":"1001,1002",
-      "selectValueName":"涓氫富,涓氫富鎴愬憳",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "璁惧鍚嶇О",
-      "inputType": "input",
-      "code": "machineName",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "璁惧缂栫爜",
-      "inputType": "input",
-      "code": "machineCode",
+      "selectValue":"888800010001,888800010002,888800010003,888800010004,888800010005,888800010007",
+      "selectValueName":"鐗╀笟璐�,鍦颁笂鍑哄敭杞︿綅璐�,鍦颁笅鍑哄敭杞︿綅璐�,鍦颁笂鍑虹杞︿綅璐�,鍦颁笅鍑虹杞︿綅璐�,涓存椂杞﹁垂鐢�",
+      "code": "feeTypeCd",
       "whereCondition": "equal"
     }
   ],
   "columns":[
     {
-      "code":"machineCode",
-      "cnCode":"璁惧缂栫爜",
-      "desc":"蹇呭~锛岃濉啓璁惧缂栫爜",
+      "code":"feeTypeCd",
+      "cnCode":"璐圭敤绫诲瀷",
+      "desc":"蹇呭~锛岃閫夋嫨璐圭敤绫诲瀷",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "select",
+      "selectValue":"888800010001,888800010002,888800010003,888800010004,888800010005,888800010007",
+      "selectValueName":"鐗╀笟璐�,鍦颁笂鍑哄敭杞︿綅璐�,鍦颁笅鍑哄敭杞︿綅璐�,鍦颁笂鍑虹杞︿綅璐�,鍦颁笅鍑虹杞︿綅璐�,涓存椂杞﹁垂鐢�",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"璐圭敤绫诲瀷鏍煎紡閿欒",
+      "show": true
+    },
+    {
+      "code": "feeName",
+      "cnCode":"鏀惰垂椤圭洰",
+      "desc":"蹇呭~锛岃濉啓鏀惰垂椤圭洰",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"1,30",
-      "limitErrInfo":"璁惧缂栫爜涓嶈兘瓒呰繃30浣�",
+      "limitParam":"1,100",
+      "limitErrInfo":"鏀惰垂椤圭洰涓嶈兘瓒呰繃100浣�",
       "show": true
     },
     {
-      "code": "machineId",
-      "cnCode":"璁惧ID",
-      "desc":"蹇呭~锛岃濉啓璁惧鐗堟湰鍙�",
+      "code":"feeFlag",
+      "cnCode":"璐圭敤鏍囪瘑",
+      "desc":"蹇呭~锛岃閫夋嫨璐圭敤鏍囪瘑",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"1003006,2006012",
+      "selectValueName":"鍛ㄦ湡鎬ц垂鐢�,涓�娆℃�ц垂鐢�",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"璐圭敤绫诲瀷鏍煎紡閿欒",
+      "show": true
+    },
+    {
+      "code": "startTime",
+      "cnCode":"璁¤垂璧峰鏃堕棿",
+      "desc":"蹇呭~锛岃閫夋嫨璁¤垂璧峰鏃堕棿",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"num",
-      "limitParam":"1,30",
-      "limitErrInfo":"璁惧ID涓嶈兘瓒呰繃30浣�",
+      "limit":"dateTime",
+      "limitParam":"",
+      "limitErrInfo":"璁¤垂璧峰鏃堕棿涓嶆槸鏈夋晥鐨勬椂闂存牸寮�",
       "show": true
     },
     {
-      "code": "name",
-      "cnCode":"鐢ㄦ埛鍚嶇О",
-      "desc":"蹇呭~锛岃閫夋嫨鐢ㄦ埛鍚嶇О",
+      "code": "endTime",
+      "cnCode":"璁¤垂缁堟鏃堕棿",
+      "desc":"蹇呭~锛岃閫夋嫨璁¤垂缁堟鏃堕棿",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"num",
+      "limit":"dateTime",
       "limitParam":"",
-      "limitErrInfo":"瀵硅薄绫诲瀷鏍煎紡閿欒",
+      "limitErrInfo":"璁¤垂缁堟鏃堕棿涓嶆槸鏈夋晥鐨勬椂闂存牸寮�",
       "show": true
     },
     {
-      "code": "openTypeCd",
-      "cnCode":"寮�闂ㄦ柟寮�",
-      "desc":"蹇呭~锛岃閫夋嫨寮�闂ㄦ柟寮�",
+      "code":"computingFormula",
+      "cnCode":"璁$畻鍏紡",
+      "desc":"蹇呭~锛岃濉啓闄勫姞璐圭敤",
       "required":true,
       "hasDefaultValue":false,
-      "selectValue":"1000,2000",
-      "selectValueName":"浜鸿劯寮�闂�,閽ュ寵寮�闂�",
-      "limit":"1,200",
-      "limitParam":"",
-      "limitErrInfo":"寮�闂ㄦ柟寮忎笉鑳借秴杩�200浣�",
-      "show": true
-    },
-    {
-      "code":"tel",
-      "cnCode":"鐢ㄦ埛鎵嬫満鍙�",
-      "desc":"蹇呭~锛岃濉啓鐢ㄦ埛鎵嬫満鍙�",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"闈㈢Н*鍗曚环+闄勫姞璐�,鍥哄畾璐圭敤",
       "limit":"num",
       "limitParam":"",
-      "limitErrInfo":"鐢ㄦ埛鎵嬫満鍙峰繀椤讳负鏁板瓧",
-      "show": true
+      "limitErrInfo":"璁$畻鍏紡鏍煎紡閿欒",
+      "show": false
     },
     {
-      "code": "idCard",
-      "cnCode":"韬唤璇�",
-      "desc":"蹇呭~锛岃濉啓韬唤璇�",
+      "code":"squarePrice",
+      "cnCode":"璁¤垂鍗曚环",
+      "desc":"蹇呭~锛岃濉啓璁¤垂鍗曚环",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"idCard",
+      "limit":"money",
       "limitParam":"",
-      "limitErrInfo":"韬唤璇佹牸寮忛敊璇�",
+      "limitErrInfo":"璁¤垂鍗曚环鏍煎紡閿欒",
+      "show": true
+    },
+    {
+      "code":"additionalAmount",
+      "cnCode":"闄勫姞璐圭敤",
+      "desc":"蹇呭~锛岃濉啓闄勫姞璐圭敤",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"money",
+      "limitParam":"",
+      "limitErrInfo":"闄勫姞璐圭敤鏍煎紡閿欒",
       "show": true
     }
   ]

--
Gitblit v1.8.0