Merge branch 'master' into wangfy-dev

wfy

2021-09-14 cd33651deff9fff7e7d9651b766210771c075190

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

old mode 100644
new mode 100755
@@ -1,85 +1,301 @@
{
  "templateName": "员工门禁授权",
  "directories": "property",
  "templateCode": "machineAuth",
  "templateKey": "authId",
  "templateKeyName": "ID",
  "searchCode": "authId",
  "searchName": "ID",
  "conditions": [
    {
      "name": "设备",
      "inputType": "select",
      "selectValue": "6666",
      "selectValueName": "最美员工",
      "code": "machineId",
      "whereCondition": "equal"
    },
    {
      "name": "员工名称",
      "inputType": "input",
      "code": "personName",
      "whereCondition": "equal"
    },
    {
      "name": "员工编码",
      "inputType": "input",
      "code": "personId",
      "whereCondition": "equal"
    }
  ],
  "templateKeyName": "",
  "templateName": "",
  "columns": [
    {
      "code": "machineId",
      "cnCode": "设备",
      "desc": "必填，请选择设备",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "select",
      "selectValue": "6666",
      "selectValueName": "最美员工",
      "limit": "num",
      "limitParam": "",
      "limitErrInfo": "设备格式错误",
      "show": true
    },
    {
      "code": "personId",
      "cnCode": "员工",
      "desc": "必填，请填写员工",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "select",
      "selectValue": "6666",
      "selectValueName": "最美员工",
      "limitParam": "30",
      "code": "roomId",
      "limitErrInfo": "房屋ID不能超过30",
      "cnCode": "房屋ID",
      "limit": "maxLength",
      "limitParam": "128",
      "limitErrInfo": "员工名称太长",
      "show": true
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，房屋ID"
    },
    {
      "code": "startTime",
      "cnCode": "开始时间",
      "desc": "必填，请填写开始时间",
      "required": true,
      "hasDefaultValue": false,
      "limitParam": "12",
      "code": "roomNum",
      "limitErrInfo": "房屋编号不能超过12",
      "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": "30",
      "code": "unitId",
      "limitErrInfo": "单元ID不能超过30",
      "cnCode": "单元ID",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit": "datetime",
      "limitParam": "",
      "limitErrInfo": "结束时间格式错误",
      "show": true
      "required": true,
      "desc": "必填，单元ID"
    },
    {
      "hasDefaultValue": false,
      "limitParam": "11",
      "code": "layer",
      "limitErrInfo": "层数不能超过11",
      "cnCode": "层数",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，层数"
    },
    {
      "hasDefaultValue": false,
      "limitParam": "11",
      "code": "section",
      "limitErrInfo": "室不能超过11",
      "cnCode": "室",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "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": "必填，用户ID"
    },
    {
      "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": "必填，租金"
    }
  ]
}
  ],
  "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": ""
}