优化代码

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -211,12 +211,11 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_bobjId = "77";
     public static final String CODE_PREFIX_smsId = "78";
     public static final String CODE_PREFIX_adsId = "78";
-<<<<<<< HEAD
     public static final String CODE_PREFIX_userAnId = "88";
     public static final String CODE_PREFIX_anValueId = "68";
-=======
+
     public static final String CODE_PREFIX_backId = "78";
->>>>>>> 7e621d56f2efc96f42a47ba3e5a62af69c6dd043
+
 
 
 

java110-generator/src/main/resources/web/template_1.json

@@ -1,79 +1,125 @@
 {
-  "templateName":"催缴记录",
-  "templateCode":"feeCollectionOrder",
-  "templateKey":"orderId",
-  "templateKeyName":"记录编号",
-  "searchCode": "orderId",
-  "searchName": "记录编号",
+  "templateName": "返省上报",
+  "templateCode": "reportInfoBackCity",
+  "templateKey": "backId",
+  "templateKeyName": "返回ID",
+  "searchCode": "backId",
+  "searchName": "返回ID",
   "directories": "property",
   "conditions": [
     {
-      "name": "名称",
+      "name": "姓名",
       "inputType": "input",
-      "code": "collectionName",
+      "code": "name",
       "whereCondition": "equal"
-    },{
-      "name": "催缴人",
+    },
+    {
+      "name": "身份证",
       "inputType": "input",
-      "code": "staffName",
+      "code": "idCard",
       "whereCondition": "equal"
-    },{
-      "name": "催缴方式",
+    },
+    {
+      "name": "手机号",
       "inputType": "input",
-      "code": "collectionWay",
+      "code": "tel",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "来源地",
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"国内,国外",
+      "code": "source",
       "whereCondition": "equal"
     }
   ],
-  "columns":[
+  "columns": [
     {
-      "code":"collectionName",
-      "cnCode":"催缴名称",
-      "desc":"必填，请填写催缴名称",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "name",
+      "cnCode": "姓名",
+      "desc": "必填，请填写姓名",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"催缴名称超过64位",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "姓名超过64位",
       "show": true
     },
     {
-      "code": "staffName",
-      "cnCode":"催缴人",
-      "desc":"必填，请填写催缴人",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "idCard",
+      "cnCode": "身份证",
+      "desc": "必填，请填写身份证",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"催缴人不能为空",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "身份证不能为空",
       "show": true
     },
     {
-      "code": "collectionWay",
-      "cnCode":"催缴方式",
-      "desc":"必填，请填写催缴方式",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "tel",
+      "cnCode": "手机号",
+      "desc": "必填，请填写手机号",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "phone",
+      "limitParam": "",
+      "limitErrInfo": "手机号格式错误",
+      "show": true
+    },
+    {
+      "code": "source",
+      "cnCode": "来源地",
+      "desc": "必填，请填写来源地",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "select",
-      "selectValue":"001,002,003",
-      "selectValueName":"仅短信方式,短信微信方式,仅微信方式",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"催缴方式超过64位",
+      "selectValue":"1001,2002",
+      "selectValueName":"国内,国外",
+      "limit": "num",
+      "limitParam": "",
+      "limitErrInfo": "来源地格式错误",
+      "show": true
+    },
+    {
+      "code": "sourceCityName",
+      "cnCode": "城市名称",
+      "desc": "必填，请填写城市名称",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "城市名称格式错误",
       "show": true
     },
     {
-      "code":"remark",
-      "cnCode":"备注",
-      "desc":"可填，请填写备注",
-      "required":false,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"备注内容不能超过200",
+      "code": "backTime",
+      "cnCode": "返回时间",
+      "desc": "必填，请填写返回时间",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "dateTime",
+      "limitParam": "",
+      "limitErrInfo": "返回时间格式错误",
+      "show": true
+    },
+    {
+      "code": "remark",
+      "cnCode": "备注",
+      "desc": "可填，请填写备注",
+      "required": false,
+      "hasDefaultValue": false,
+      "defaultValue": "",
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "200",
+      "limitErrInfo": "备注内容不能超过200",
       "show": false
     }
   ]