Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

@@ -1,112 +1,68 @@
{
  "templateName":"活动",
  "templateCode":"activities",
  "templateKey":"activitiesId",
  "templateKeyName":"活动ID",
  "searchCode": "title",
  "searchName": "活动标题",
  "templateName":"收据模板",
  "directories": "property",
  "templateCode":"feePrintPage",
  "templateKey":"pageId",
  "templateKeyName":"收据ID",
  "searchCode": "pageId",
  "searchName": "收据ID",
  "conditions": [
    {
      "name": "活动标题",
      "inputType": "input",
      "code": "title",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageId",
      "name": "页面ID",
      "inputType": "input"
    },
    {
      "name": "活动类型",
      "inputType": "select",
      "selectValue":"10001,10002",
      "selectValueName":"小区文化,其他",
      "code": "typeCd",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageName",
      "name": "名称",
      "inputType": "input"
    },
    {
      "name": "员工名称",
      "inputType": "input",
      "code": "userName",
      "whereCondition": "equal"
    },
    {
      "name": "活动ID",
      "inputType": "input",
      "code": "activitiesId",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "state",
      "name": "状态",
      "inputType": "input"
    }
  ],
  "columns":[
  "columns": [
    {
      "code":"title",
      "cnCode":"活动标题",
      "desc":"必填，请填写业活动标题",
      "required":true,
      "hasDefaultValue":false,
      "inputType":"input",
      "limit":"maxin",
      "limitParam":"1,200",
      "limitErrInfo":"活动标题不能超过200位",
      "show": true
    },
    {
      "code": "typeCd",
      "cnCode":"活动类型",
      "desc":"必填，请选择活动类型",
      "required":true,
      "hasDefaultValue":false,
      "inputType": "select",
      "selectValue":"10001,10002",
      "selectValueName":"小区文化,其他",
      "limit":"num",
      "limitParam":"",
      "limitErrInfo":"活动类型格式错误",
      "show": true
    },
    {
      "code": "headerImg",
      "cnCode":"头部照片",
      "desc":"必填，请选择头部照片",
      "required":true,
      "hasDefaultValue":false,
      "hasDefaultValue": false,
      "limitParam": "128",
      "code": "pageName",
      "limitErrInfo": "名称不能超过128",
      "cnCode": "名称",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit":"maxin",
      "limitParam":"1,200",
      "limitErrInfo":"头部照片格式错误",
      "show": true
      "required": true,
      "desc": "必填，名称"
    },
    {
      "code": "context",
      "cnCode":"活动内容",
      "desc":"必填，请填写活动内容",
      "required":true,
      "hasDefaultValue":false,
      "hasDefaultValue": false,
      "limitParam": "30",
      "code": "communityId",
      "limitErrInfo": "小区ID不能超过30",
      "cnCode": "小区ID",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit":"maxin",
      "limitParam":"1,4000",
      "limitErrInfo":"活动内容太长",
      "show": true
      "required": true,
      "desc": "必填，小区ID"
    },
    {
      "code": "startTime",
      "cnCode":"开始时间",
      "desc":"必填，请选择开始时间",
      "required":true,
      "hasDefaultValue":false,
      "hasDefaultValue": false,
      "limitParam": "512",
      "code": "pageUrl",
      "limitErrInfo": "收据页面不能超过512",
      "cnCode": "收据页面",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit":"date",
      "limitParam":"",
      "limitErrInfo":"开始时间格式错误",
      "show": true
    },
    {
      "code": "endTime",
      "cnCode":"结束时间",
      "desc":"必填，请选择结束时间",
      "required":true,
      "hasDefaultValue":false,
      "inputType": "input",
      "limit":"date",
      "limitParam":"",
      "limitErrInfo":"结束时间格式错误",
      "show": true
      "required": true,
      "desc": "必填，收据页面"
    }
  ]
}

}