Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/jsons/reportProject.json

src/main/resources/jsons/event.json

@@ -1,144 +1,151 @@
 [
-  {"name":"Id",
-    "type":"Integer",
-    "value":"id",
-    "field":"id",
+  {
+    "name": "Id",
+    "type": "Integer",
+    "value": "id",
+    "field": "id",
     "sqlField": "id",
     "sqlClass": "getComSql",
     "orderClass": "",
-    "groupClass":"",
-    "ifSearch":"true",
+    "groupClass": "",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"false"
+    "ifShow": "false"
   },
-  {"name":"事件名称",
-  "type":"String",
-  "value":"name",
-  "field": "name",
-  "sqlField": "name",
-  "sqlClass": "getLikeSql",
+  {
+    "name": "事件名称",
+    "type": "String",
+    "value": "name",
+    "field": "name",
+    "sqlField": "name",
+    "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
-    "groupClass":"getComGroup",
-  "ifSearch":"true",
-  "ifGroup": "false",
-    "ifShow":"true"
-},
-  {"name":"创建人",
-    "type":"String",
-    "value":"createName",
-    "field": "createName",
-    "sqlField": "create_id",
-    "sqlClass": "getCreateNameSql",
-    "orderClass": "getCreateNameOrder",
-    "groupClass":"getComGroup",
-    "ifSearch":"true",
+    "groupClass": "getComGroup",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true"
+  },
+  {
+    "name": "报告数量",
+    "type": "Integer",
+    "value": "reportProjectNum",
+    "field": "reportProjectNum",
+    "sqlField": "event_id",
+    "orderClass": "getEventReportNumOrder",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true"
-
+    "ifShow": "true"
   },
-  {"name":"客户",
-    "type":"String",
-    "value":"clientName",
+  {
+    "name": "专题库数量",
+    "type": "Integer",
+    "value": "patentProjectNum",
+    "field": "patentProjectNum",
+    "sqlField": "event_id",
+    "orderClass": "getEventProjectNumOrder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true"
+  },
+  {
+    "name": "客户",
+    "type": "String",
+    "value": "clientName",
     "field": "clientName",
     "sqlField": "client_id",
     "orderClass": "getClientNameOrder",
-    "ifSearch":"true",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true"
   },
-  {"name":"创建时间",
-    "type":"DateTime",
-    "value":"createTime",
-    "field": "createTime",
-    "sqlField": "create_time",
+  {
+    "name": "发生时间",
+    "type": "DateTime",
+    "value": "eventDate",
+    "field": "eventDate",
+    "sqlField": "event_Date",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"true",
+    "groupClass": "getTimeGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true"
   },
-  {"name":"创建月份",
-    "type":"DateTime",
-    "value":"createTimeMonth",
-    "field": "createTimeMonth",
-    "sqlField": "create_time",
-    "sqlClass": "getDateTimeMonthSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"false",
+  {
+    "name": "应用场景",
+    "type": "Array",
+    "value": "scenarioNames",
+    "field": "scenarioNames",
+    "sqlField": "scenario_id",
+    "sqlClass": "getComSql",
+    "orderClass": "getScenarioNameOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow":"false"
+    "ifShow": "true"
   },
-  {"name":"发生时间",
-    "type":"DateTime",
-    "value":"eventDate",
-    "field": "eventDate",
-    "sqlField": "event_Date",
-    "sqlClass": "getDateTimeSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"true",
+  {
+    "name": "创建人",
+    "type": "String",
+    "value": "createName",
+    "field": "createName",
+    "sqlField": "create_id",
+    "sqlClass": "getCreateNameSql",
+    "orderClass": "getCreateNameOrder",
+    "groupClass": "getComGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true"
   },
-  {"name":"发生月份",
-    "type":"DateTime",
-    "value":"eventDateMonth",
-    "field": "eventDateMonth",
-    "sqlField": "event_Date",
-    "sqlClass": "getDateTimeMonthSql",
+  {
+    "name": "创建时间",
+    "type": "DateTime",
+    "value": "createTime",
+    "field": "createTime",
+    "sqlField": "create_time",
+    "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"false",
-    "ifGroup": "true",
-    "ifShow":"false"
+    "groupClass": "getTimeGroup",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true"
   },
-  {"name":"描述",
-    "type":"String",
-    "value":"description",
+  {
+    "name": "描述",
+    "type": "String",
+    "value": "description",
     "field": "description",
     "sqlField": "description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
-    "ifSearch":"true",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true"
-
-  },
-  {"name":"应用场景",
-    "type":"Array",
-    "value":"scenarioNames",
-    "field": "scenarioNames",
-    "sqlField": "scenario_id",
-    "sqlClass": "getComSql",
-    "orderClass": "getScenarioNameOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"true",
-    "ifGroup": "true",
-    "ifShow":"true"
+    "ifShow": "true"
   },
   {
-    "name":"报告数量",
-    "type":"Integer",
-    "value":"reportProjectNum",
-    "field":"reportProjectNum",
-    "sqlField": "event_id",
-    "orderClass": "getEventReportNumOrder",
-    "ifSearch":"false",
-    "ifGroup": "false",
-    "ifShow":"true"
-
+    "name": "创建月份",
+    "type": "DateTime",
+    "value": "createTimeMonth",
+    "field": "createTimeMonth",
+    "sqlField": "create_time",
+    "sqlClass": "getDateTimeMonthSql",
+    "orderClass": "getComOrder",
+    "groupClass": "getTimeGroup",
+    "ifSearch": "false",
+    "ifGroup": "true",
+    "ifShow": "false"
   },
   {
-    "name":"专题库数量",
-    "type":"Integer",
-    "value":"patentProjectNum",
-    "field":"patentProjectNum",
-    "sqlField": "event_id",
-    "orderClass": "getEventProjectNumOrder",
-    "ifSearch":"false",
-    "ifGroup": "false",
-    "ifShow":"true"
+    "name": "发生月份",
+    "type": "DateTime",
+    "value": "eventDateMonth",
+    "field": "eventDateMonth",
+    "sqlField": "event_Date",
+    "sqlClass": "getDateTimeMonthSql",
+    "orderClass": "getComOrder",
+    "groupClass": "getTimeGroup",
+    "ifSearch": "false",
+    "ifGroup": "true",
+    "ifShow": "false"
   }
 ]

src/main/resources/jsons/patentDigProject.json

@@ -26,42 +26,88 @@
     "ifShow": "true"
   },
   {
-    "name": "创建人",
+    "name": "研发项目名称",
     "type": "String",
-    "value": "createName",
-    "field": "createName",
-    "sqlField": "p.create_id",
-    "sqlClass": "getCreateNameSql",
-    "orderClass": "getCreateNameOrder",
+    "value": "rdName",
+    "field": "rdName",
+    "sqlField": "rp.name",
+    "sqlClass": "getComSql",
+    "orderClass": "getComOrder",
     "groupClass": "getComGroup",
-    "ifSearch": "true",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "defaultHidden": "true"
   },
   {
-    "name": "创建时间",
-    "type": "DateTime",
-    "value": "createTime",
-    "field": "createTime",
-    "sqlField": "p.create_time",
-    "sqlClass": "getDateTimeSql",
+    "name": "研发项目编号",
+    "type": "String",
+    "value": "rdnumber",
+    "field": "rdnumber",
+    "sqlField": "rp.number",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
-    "groupClass": "getTimeGroup",
-    "ifSearch": "true",
+    "groupClass": "getComGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "defaultHidden": "true"
   },
   {
-    "name": "描述",
+    "name": "产品",
     "type": "String",
-    "value": "description",
-    "field": "description",
-    "sqlField": "p.description",
+    "value": "product",
+    "field": "product",
+    "sqlField": "rp.product",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
+    "groupClass": "getComGroup",
     "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "产品阶段",
+    "type": "String",
+    "value": "productPhase",
+    "field": "productPhase",
+    "sqlField": "rp.product_phase",
+    "sqlClass": "getComSql",
+    "orderClass": "getComOrder",
+    "groupClass": "getComGroup",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "委托方",
+    "type": "String",
+    "value": "entrustName",
+    "field": "entrustName",
+    "sqlField": "entrust_id",
+    "sqlClass": "getEntrustTrueNameSql",
+    "orderClass": "getEntrustOrder",
+    "groupClass": "getEntrustGroup",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "委托方",
+    "type": "String",
+    "value": "entrustNameTrue",
+    "field": "entrustNameTrue",
+    "sqlField": "entrust_id",
+    "sqlClass": "getEntrustTrueNameSql",
+    "orderClass": "getEntrustOrder",
+    "groupClass": "getEntrustGroup",
+    "ifSearch": "false",
+    "ifGroup": "true",
+    "ifShow": "false",
+    "defaultHidden": "false"
   },
   {
     "name": "负责人名称",
@@ -78,11 +124,11 @@
     "defaultHidden": "true"
   },
   {
-    "name": "产出",
+    "name": "技术方向",
     "type": "String",
-    "value": "output",
-    "field": "output",
-    "sqlField": "dp.output",
+    "value": "technicalDirection",
+    "field": "technicalDirection",
+    "sqlField": "dp.technical_direction",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -92,12 +138,12 @@
     "defaultHidden": "true"
   },
   {
-    "name": "技术方向",
+    "name": "技术关键词",
     "type": "String",
-    "value": "technicalDirection",
-    "field": "technicalDirection",
-    "sqlField": "dp.technical_direction",
-    "sqlClass": "getLikeSql",
+    "value": "technicalKeyword",
+    "field": "technicalKeyword",
+    "sqlField": "dp.technical_keyword",
+    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "false",
@@ -120,12 +166,12 @@
     "defaultHidden": "true"
   },
   {
-    "name": "相关竞争对手",
+    "name": "产出",
     "type": "String",
-    "value": "relatedCompetitors",
-    "field": "relatedCompetitors",
-    "sqlField": "dp.related_competitors",
-    "sqlClass": "getComSql",
+    "value": "output",
+    "field": "output",
+    "sqlField": "dp.output",
+    "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
     "ifSearch": "false",
@@ -133,36 +179,12 @@
     "ifShow": "true",
     "defaultHidden": "true"
   },
-  {"name":"相关事件",
-    "type":"Array",
-    "value":"eventNames",
-    "field": "eventNames",
-    "sqlField": "aspe.event_id",
-    "sqlClass": "getComSql",
-    "orderClass": "getEventOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
-    "ifGroup": "false",
-    "ifShow":"true"
-  },
-  {"name":"相关事件",
-    "type":"String",
-    "value":"eventNames",
-    "field": "eventNames",
-    "sqlField": "aspe.event_id",
-    "sqlClass": "getEventNameSql",
-    "orderClass": "getEventOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"true",
-    "ifGroup": "false",
-    "ifShow":"false"
-  },
   {
-    "name": "技术关键词",
+    "name": "相关竞争对手",
     "type": "String",
-    "value": "technicalKeyword",
-    "field": "technicalKeyword",
-    "sqlField": "dp.technical_keyword",
+    "value": "relatedCompetitors",
+    "field": "relatedCompetitors",
+    "sqlField": "dp.related_competitors",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "groupClass": "getComGroup",
@@ -200,60 +222,66 @@
     "defaultHidden": "true"
   },
   {
-    "name": "研发项目名称",
+    "name": "创建人",
     "type": "String",
-    "value": "rdName",
-    "field": "rdName",
-    "sqlField": "rp.name",
-    "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
+    "value": "createName",
+    "field": "createName",
+    "sqlField": "p.create_id",
+    "sqlClass": "getCreateNameSql",
+    "orderClass": "getCreateNameOrder",
     "groupClass": "getComGroup",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
+    "ifShow": "true"
   },
   {
-    "name": "研发项目编号",
-    "type": "String",
-    "value": "rdnumber",
-    "field": "rdnumber",
-    "sqlField": "rp.number",
-    "sqlClass": "getComSql",
+    "name": "创建时间",
+    "type": "DateTime",
+    "value": "createTime",
+    "field": "createTime",
+    "sqlField": "p.create_time",
+    "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
+    "groupClass": "getTimeGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
+    "ifShow": "true"
   },
   {
-    "name": "产品",
+    "name": "描述",
     "type": "String",
-    "value": "product",
-    "field": "product",
-    "sqlField": "rp.product",
+    "value": "description",
+    "field": "description",
+    "sqlField": "p.description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
     "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
+    "ifShow": "true"
   },
-  {
-    "name": "产品阶段",
-    "type": "String",
-    "value": "productPhase",
-    "field": "productPhase",
-    "sqlField": "rp.product_phase",
+  {"name":"相关事件",
+    "type":"Array",
+    "value":"eventNames",
+    "field": "eventNames",
+    "sqlField": "aspe.event_id",
     "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass": "getComGroup",
-    "ifSearch": "false",
+    "orderClass": "getEventOrder",
+    "groupClass":"getScenarioGroup",
+    "ifSearch":"false",
     "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
+    "ifShow":"true"
+  },
+  {"name":"相关事件",
+    "type":"String",
+    "value":"eventNames",
+    "field": "eventNames",
+    "sqlField": "aspe.event_id",
+    "sqlClass": "getEventNameSql",
+    "orderClass": "getEventOrder",
+    "groupClass":"getScenarioGroup",
+    "ifSearch":"true",
+    "ifGroup": "false",
+    "ifShow":"false"
   },
   {
     "name": "创建月份",
@@ -268,32 +296,4 @@
     "ifGroup": "true",
     "ifShow": "false"
   },
-  {
-    "name": "委托方",
-    "type": "String",
-    "value": "entrustName",
-    "field": "entrustName",
-    "sqlField": "entrust_id",
-    "sqlClass": "getEntrustTrueNameSql",
-    "orderClass": "getEntrustOrder",
-    "groupClass": "getEntrustGroup",
-    "ifSearch": "true",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "defaultHidden": "true"
-  },
-  {
-    "name": "委托方",
-    "type": "String",
-    "value": "entrustNameTrue",
-    "field": "entrustNameTrue",
-    "sqlField": "entrust_id",
-    "sqlClass": "getEntrustTrueNameSql",
-    "orderClass": "getEntrustOrder",
-    "groupClass": "getEntrustGroup",
-    "ifSearch": "false",
-    "ifGroup": "true",
-    "ifShow": "false",
-    "defaultHidden": "false"
-  }
 ]

src/main/resources/jsons/patentProject.json

@@ -1,254 +1,271 @@
 [
-  {"name":"Id",
-    "type":"Integer",
-    "value":"id",
-    "field":"id",
+  {
+    "name": "Id",
+    "type": "Integer",
+    "value": "id",
+    "field": "id",
     "sqlField": "p.id",
     "sqlClass": "getComSql",
     "orderClass": "",
-    "groupClass":"",
-    "ifSearch":"false",
-    "ifGroup": "false",
-    "ifShow":"false"
-
-  },
-  {"name":"专利数据库名称",
-  "type":"String",
-  "value":"name",
-  "field": "name",
-  "sqlField": "p.name",
-  "sqlClass": "getLikeSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getComGroup",
-  "ifSearch":"true",
-  "ifGroup": "false",
-    "ifShow":"true"
-},
-  {"name":"负责人名称",
-    "type":"String",
-    "value":"headName",
-    "field": "headName",
-    "sqlField": "p.head_id",
-    "sqlClass": "getCreateNameSql",
-    "orderClass": "getCreateNameOrder",
-    "groupClass":"getComGroup",
-    "ifSearch":"true",
-    "ifGroup": "false",
-    "ifShow":"true",
-    "defaultHidden": "true"
-  },
-  {"name":"创建人",
-    "type":"String",
-    "value":"createName",
-    "field": "createName",
-    "sqlField": "p.create_id",
-    "sqlClass": "getCreateNameSql",
-    "orderClass": "getCreateNameOrder",
-    "groupClass":"getComGroup",
-    "ifSearch":"true",
+    "groupClass": "",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "false"
   },
-  {"name":"创建时间",
-    "type":"DateTime",
-    "value":"createTime",
-    "field": "createTime",
-    "sqlField": "p.create_time",
-    "sqlClass": "getDateTimeSql",
+  {
+    "name": "专利数据库名称",
+    "type": "String",
+    "value": "name",
+    "field": "name",
+    "sqlField": "p.name",
+    "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"true",
+    "groupClass": "getComGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true"
   },
-  {"name":"创建月份",
-    "type":"DateTime",
-    "value":"createTimeMonth",
-    "field": "createTimeMonth",
-    "sqlField": "p.create_time",
-    "sqlClass": "getDateTimeMonthSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"false",
-    "ifGroup": "true",
-    "ifShow":"false"
-  },
-  {"name":"描述",
-    "type":"String",
-    "value":"description",
-    "field": "description",
-    "sqlField": "p.description",
+  {
+    "name": "报告数量",
+    "type": "String",
+    "value": "reportProjectNum",
+    "field": "reportProjectNum",
+    "sqlField": "p.id",
     "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "ifSearch":"false",
+    "orderClass": "getReportNumOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true",
+    "defaultHidden": "true"
   },
-  {"name":"应用场景",
-    "type":"Array",
-    "value":"scenarioNames",
-    "field": "scenarioNames",
-    "sqlField": "aspe.scenario_id",
+  {
+    "name": "相关事件",
+    "type": "Array",
+    "value": "eventNames",
+    "field": "eventNames",
+    "sqlField": "aspe.event_id",
     "sqlClass": "getComSql",
-    "orderClass": "getProjectScenarioOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"true",
-    "ifGroup": "true",
-    "ifShow":"true"
+    "orderClass": "getEventOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true"
+  },
+  {
+    "name": "相关事件",
+    "type": "String",
+    "value": "eventNames",
+    "field": "eventNames",
+    "sqlField": "aspe.event_id",
+    "sqlClass": "getEventNameSql",
+    "orderClass": "getEventOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "false"
+  },
+  {
+    "name": "负责人名称",
+    "type": "String",
+    "value": "headName",
+    "field": "headName",
+    "sqlField": "p.head_id",
+    "sqlClass": "getCreateNameSql",
+    "orderClass": "getCreateNameOrder",
+    "groupClass": "getComGroup",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "defaultHidden": "true"
   },
-  {"name":"负责部门",
-    "type":"String",
-    "value":"departmentName",
+  {
+    "name": "负责部门",
+    "type": "String",
+    "value": "departmentName",
     "field": "departmentName",
     "sqlField": "p.department_id",
     "sqlClass": "getDepartmentNameSql",
     "orderClass": "getDepartmentNameOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"true",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true",
+    "ifShow": "true",
     "defaultHidden": "true"
   },
-  {"name":"委托方",
-    "type":"String",
-    "value":"entrustName",
+  {
+    "name": "委托方",
+    "type": "String",
+    "value": "entrustName",
     "field": "entrustName",
     "sqlField": "entrust_id",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
-    "groupClass":"getEntrustGroup",
-    "ifSearch":"true",
+    "groupClass": "getEntrustGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true",
+    "ifShow": "true",
     "defaultHidden": "true"
   },
-
-  {"name":"委托方",
-    "type":"String",
-    "value":"entrustNameTrue",
+  {
+    "name": "委托方",
+    "type": "String",
+    "value": "entrustNameTrue",
     "field": "entrustNameTrue",
     "sqlField": "entrust_id",
     "sqlClass": "getEntrustTrueNameSql",
     "orderClass": "getEntrustOrder",
-    "groupClass":"getEntrustGroup",
-    "ifSearch":"false",
+    "groupClass": "getEntrustGroup",
+    "ifSearch": "false",
     "ifGroup": "true",
-    "ifShow":"false",
+    "ifShow": "false",
     "defaultHidden": "false"
   },
-  {"name":"合同号",
-    "type":"String",
-    "value":"contractNo",
-    "field": "contractNo",
+  {
+    "name": "应用场景",
+    "type": "Array",
+    "value": "scenarioNames",
+    "field": "scenarioNames",
+    "sqlField": "aspe.scenario_id",
+    "sqlClass": "getComSql",
+    "orderClass": "getProjectScenarioOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "true",
+    "ifGroup": "true",
+    "ifShow": "true"
+  },
+  {
+    "name": "调查类型",
+    "type": "Array",
+    "value": "matterNames",
+    "field": "matterNames",
+    "sqlField": "aspe.matter_id",
+    "sqlClass": "getComSql",
+    "orderClass": "getMatterOrder",
+    "groupClass": "getMatterGroup",
+    "ifSearch": "true",
+    "ifGroup": "true",
+    "ifShow": "true",
+    "defaultHidden": "true"
+  },
+  {
+    "name": "产品或产品类别名称",
+    "type": "String",
+    "value": "productOrCategoryName",
+    "field": "productOrCategoryName",
     "sqlField": "scenario_id",
     "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+    "orderClass": "getProductOrCategoryOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true",
-    "defaultHidden": "true"
+    "ifShow": "true"
   },
-  {"name":"内部卷号",
-    "type":"String",
-    "value":"volumeNumber",
-    "field": "volumeNumber",
+  {
+    "name": "技术类别名称",
+    "type": "String",
+    "value": "technicalCategoryName",
+    "field": "technicalCategoryName",
     "sqlField": "scenario_id",
     "sqlClass": "getComSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+    "orderClass": "getScenarioNameOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true",
+    "ifShow": "true",
     "defaultHidden": "true"
   },
-  {"name":"委案日",
-    "type":"String",
-    "value":"commissionCaseDay",
-    "field": "commissionCaseDay",
+  {
+    "name": "合同号",
+    "type": "String",
+    "value": "contractNo",
+    "field": "contractNo",
     "sqlField": "scenario_id",
     "sqlClass": "getComSql",
-    "sqlClass": "getComSql",
     "orderClass": "getComOrder",
-    "ifSearch":"false",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true",
+    "ifShow": "true",
     "defaultHidden": "true"
   },
-  {"name":"报告数量",
-    "type":"String",
-    "value":"reportProjectNum",
-    "field": "reportProjectNum",
-    "sqlField": "p.id",
+  {
+    "name": "内部卷号",
+    "type": "String",
+    "value": "volumeNumber",
+    "field": "volumeNumber",
+    "sqlField": "scenario_id",
     "sqlClass": "getComSql",
-    "orderClass": "getReportNumOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+    "orderClass": "getComOrder",
+    "groupClass": "getScenarioGroup",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true",
+    "ifShow": "true",
     "defaultHidden": "true"
   },
-  {"name":"调查类型",
-    "type":"Array",
-    "value":"matterNames",
-    "field": "matterNames",
-    "sqlField": "aspe.matter_id",
+  {
+    "name": "委案日",
+    "type": "String",
+    "value": "commissionCaseDay",
+    "field": "commissionCaseDay",
+    "sqlField": "scenario_id",
     "sqlClass": "getComSql",
-    "orderClass": "getMatterOrder",
-    "groupClass":"getMatterGroup",
-    "ifSearch":"true",
-    "ifGroup": "true",
-    "ifShow":"true",
-    "defaultHidden": "true"
-  },
-  {"name":"相关事件",
-    "type":"Array",
-    "value":"eventNames",
-    "field": "eventNames",
-    "sqlField": "aspe.event_id",
     "sqlClass": "getComSql",
-    "orderClass": "getEventOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+    "orderClass": "getComOrder",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true",
+    "defaultHidden": "true"
   },
-  {"name":"相关事件",
-    "type":"String",
-    "value":"eventNames",
-    "field": "eventNames",
-    "sqlField": "aspe.event_id",
-    "sqlClass": "getEventNameSql",
-    "orderClass": "getEventOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"true",
+  {
+    "name": "创建人",
+    "type": "String",
+    "value": "createName",
+    "field": "createName",
+    "sqlField": "p.create_id",
+    "sqlClass": "getCreateNameSql",
+    "orderClass": "getCreateNameOrder",
+    "groupClass": "getComGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"false"
+    "ifShow": "true"
   },
-  {"name":"产品或产品类别名称",
-    "type":"String",
-    "value":"productOrCategoryName",
-    "field": "productOrCategoryName",
-    "sqlField": "scenario_id",
-    "sqlClass": "getComSql",
-    "orderClass": "getProductOrCategoryOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+  {
+    "name": "创建时间",
+    "type": "DateTime",
+    "value": "createTime",
+    "field": "createTime",
+    "sqlField": "p.create_time",
+    "sqlClass": "getDateTimeSql",
+    "orderClass": "getComOrder",
+    "groupClass": "getTimeGroup",
+    "ifSearch": "true",
     "ifGroup": "false",
-    "ifShow":"true"
+    "ifShow": "true"
   },
-  {"name":"技术类别名称",
-    "type":"String",
-    "value":"technicalCategoryName",
-    "field": "technicalCategoryName",
-    "sqlField": "scenario_id",
+  {
+    "name": "描述",
+    "type": "String",
+    "value": "description",
+    "field": "description",
+    "sqlField": "p.description",
     "sqlClass": "getComSql",
-    "orderClass": "getScenarioNameOrder",
-    "groupClass":"getScenarioGroup",
-    "ifSearch":"false",
+    "orderClass": "getComOrder",
+    "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow":"true",
-    "defaultHidden": "true"
+    "ifShow": "true"
+  },
+  {
+    "name": "创建月份",
+    "type": "DateTime",
+    "value": "createTimeMonth",
+    "field": "createTimeMonth",
+    "sqlField": "p.create_time",
+    "sqlClass": "getDateTimeMonthSql",
+    "orderClass": "getComOrder",
+    "groupClass": "getTimeGroup",
+    "ifSearch": "false",
+    "ifGroup": "true",
+    "ifShow": "false"
   }
-
 ]