Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

old mode 100644
new mode 100755
@@ -1,136 +1,68 @@
{
  "templateName": "房屋折扣申请",
  "templateName":"收据模板",
  "directories": "property",
  "templateCode": "applyRoomDiscount",
  "templateKey": "ardId",
  "templateKeyName": "申请ID",
  "searchCode": "ardId",
  "searchName": "申请ID",
  "templateCode":"feePrintPage",
  "templateKey":"pageId",
  "templateKeyName":"收据ID",
  "searchCode": "pageId",
  "searchName": "收据ID",
  "conditions": [
    {
      "name": "房屋名称",
      "inputType": "input",
      "code": "roomName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageId",
      "name": "页面ID",
      "inputType": "input"
    },
    {
      "name": "申请类型",
      "inputType": "select",
      "selectValue": "3333,4444,5555",
      "selectValueName": "空置房,采暖不热,房屋质量问题",
      "code": "roomName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageName",
      "name": "名称",
      "inputType": "input"
    },
    {
      "name": "状态",
      "inputType": "select",
      "selectValue": "1,2,3,4,5",
      "selectValueName": "申请验房,验房通过,验房不通过,审批通过,审批不通过",
      "whereCondition": "equal",
      "code": "state",
      "whereCondition": "equal"
      "name": "状态",
      "inputType": "input"
    }
  ],
  "columns": [
    {
      "code": "roomName",
      "cnCode": "房屋",
      "desc": "必填，请填写房屋",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limitParam": "128",
      "code": "pageName",
      "limitErrInfo": "名称不能超过128",
      "cnCode": "名称",
      "limit": "maxLength",
      "limitParam": "64",
      "limitErrInfo": "房屋格式错误",
      "show": true
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，名称"
    },
    {
      "code": "discountId",
      "cnCode": "折扣",
      "desc": "必填，请选择折扣",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "select",
      "selectValue": "1",
      "selectValueName": "折扣",
      "limitParam": "30",
      "code": "communityId",
      "limitErrInfo": "小区ID不能超过30",
      "cnCode": "小区ID",
      "limit": "maxLength",
      "limitParam": "12",
      "limitErrInfo": "折扣错误",
      "show": true
    },
    {
      "code": "applyType",
      "cnCode": "申请类型",
      "desc": "必填，请选择认证方式",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "select",
      "selectValue": "3333,4444,5555",
      "selectValueName": "空置房,采暖不热,房屋质量问题",
      "limit": "num",
      "limitParam": "",
      "limitErrInfo": "申请类型错误",
      "show": true
    },

    {
      "code": "createUserName",
      "cnCode": "申请人",
      "desc": "必填，请填写申请人",
      "required": true,
      "hasDefaultValue": false,
      "show": true,
      "inputType": "input",
      "limit": "maxLength",
      "limitParam": "64",
      "limitErrInfo": "申请人错误",
      "show": true
      "required": true,
      "desc": "必填，小区ID"
    },
    {
      "code": "createUserTel",
      "cnCode": "申请电话",
      "desc": "必填，请填写申请电话",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "phone",
      "limitParam": "",
      "limitErrInfo": "申请电话错误",
      "show": true
    },
    {
      "code": "startTime",
      "cnCode": "开始时间",
      "desc": "必填，请选择开始时间",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "datetime",
      "limitParam": "",
      "limitErrInfo": "开始时间错误",
      "show": true
    },
    {
      "code": "endTime",
      "cnCode": "结束时间",
      "desc": "必填，请选择结束时间",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "datetime",
      "limitParam": "",
      "limitErrInfo": "结束时间错误",
      "show": true
    },
    {
      "code": "createRemark",
      "cnCode": "申请说明",
      "desc": "必填，请填写申请说明",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "maxLength",
      "limitParam": "512",
      "limitErrInfo": "申请申请说明",
      "show": false
      "code": "pageUrl",
      "limitErrInfo": "收据页面不能超过512",
      "cnCode": "收据页面",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，收据页面"
    }
  ]
}

}