Merge remote-tracking branch 'origin/dev' into dev

view-mysql.sql

@@ -87,7 +87,7 @@ create
     or replace view workflow_field_table_view as
 select wb.id,
        wb.fieldname,
-       concat(ht.indexdesc, '：', wb.fieldname) indexdesc,
+       concat(ht.indexdesc, '：', wb.fieldname,'(',wb.id,')') indexdesc,
        (
            case
                when wb.detailtable is null then (select distinct tablename from workflow_bill where id = wb.billid)
@@ -103,16 +103,12 @@ select wb.id,
                when wb.detailtable is null then 'main table'
                else wb.detailtable end
            )                                   showtablename,
-       (case
-            when wb.fieldhtmltype = '1' then '单行文本框'
-            when wb.FIELDHTMLTYPE = '2' then '多行文本框'
-            when wb.FIELDHTMLTYPE = '3' then '流览框'
-            when wb.FIELDHTMLTYPE = '4' then 'check框'
-            when wb.FIELDHTMLTYPE = '5' then '选择框'
-            else '附件上传' end)               fieldhtmltype,
+
+       wf.TYPENAME as fieldhtmltype,
        wb.FIELDHTMLTYPE                        fieldtype
 from workflow_billfield wb
          left join htmllabelindex ht on wb.fieldlabel = ht.id
+         left join workflow_fieldtype wf on wf.ID = wb.fieldhtmltype
 union all
 select *
 from cus_workflow_base_field_assist;

view-oracle.sql

@@ -91,7 +91,7 @@ VALUES (-989, 'workflowid', '工作流id：workflowid', 'workflow_requestbase',
 create or replace view workflow_field_table_view as
 select wb.id,
        wb.fieldname,
-       (ht.indexdesc || '：' || wb.fieldname) indexdesc,
+       (ht.indexdesc || '：' || wb.fieldname || '(' || CAST(wb.id as VARCHAR2(10)) || ')') indexdesc,
        (
            case
                when wb.detailtable is null then (select distinct tablename from workflow_bill where id = wb.billid)
@@ -107,16 +107,11 @@ select wb.id,
                when wb.detailtable is null then 'main table'
                else wb.detailtable end
            )                                 showtablename,
-       (case
-            when wb.fieldhtmltype = '1' then '单行文本框'
-            when wb.FIELDHTMLTYPE = '2' then '多行文本框'
-            when wb.FIELDHTMLTYPE = '3' then '流览框'
-            when wb.FIELDHTMLTYPE = '4' then 'check框'
-            when wb.FIELDHTMLTYPE = '5' then '选择框'
-            else '附件上传' end)             fieldhtmltype,
+       wf.TYPENAME as fieldhtmltype,
        wb.FIELDHTMLTYPE                      fieldtype
 from workflow_billfield wb
          left join htmllabelindex ht on wb.fieldlabel = ht.id
+         left join workflow_fieldtype wf on wf.ID = wb.fieldhtmltype
 union all
 select *
 from cus_workflow_base_field_assist /

view-sql-server.sql

@@ -95,7 +95,7 @@ drop view workflow_field_table_view
 create view workflow_field_table_view as
 select wb.id,
        wb.fieldname,
-       (ht.indexdesc + '：' + wb.fieldname) indexdesc,
+       (ht.indexdesc + '：' + wb.fieldname + '（' + CONVERT(varchar(10),wb.id) + ')') indexdesc,
        (
            case
                when wb.detailtable is null then (select distinct tablename from workflow_bill where id = wb.billid)
@@ -111,16 +111,11 @@ select wb.id,
                when wb.detailtable is null then 'main table'
                else wb.detailtable end
            )                               showtablename,
-       (case
-            when wb.fieldhtmltype = '1' then '单行文本框'
-            when wb.FIELDHTMLTYPE = '2' then '多行文本框'
-            when wb.FIELDHTMLTYPE = '3' then '流览框'
-            when wb.FIELDHTMLTYPE = '4' then 'check框'
-            when wb.FIELDHTMLTYPE = '5' then '选择框'
-            else '附件上传' end)           fieldhtmltype,
+       wf.TYPENAME as fieldhtmltype,
        wb.FIELDHTMLTYPE                    fieldtype
 from workflow_billfield wb
          left join htmllabelindex ht on wb.fieldlabel = ht.id
+         left join workflow_fieldtype wf on wf.ID = wb.fieldhtmltype
 union all
 select *
 from cus_workflow_base_field_assist go