5910 【成型线】

src/main/java/com/dk/mdm/mapper/mst/MoldlineMapper.xml

@@ -54,7 +54,7 @@
         <result column="userBindKindName" property="userBindKindName"/>
         <result column="pdtGlueKindName" property="pdtGlueKindName"/>
         <result column="modelName" property="modelName"/>
-        <result column="moldlineSysTagNames" property="moldlineSysTagNames"/>
+        <result column="moldlineTagNames" property="moldlineTagNames"/>
         <result column="spaceName" property="spaceName"/>
         <result column="moldingUserNames" property="moldingUserNames"/>
         <result column="flowNodeName" property="flowNodeName"/>
@@ -188,8 +188,8 @@
         sys.f_get_name_i18n_lang(tdk3.kind_name_i18n,#{i18n}) as pdtGlueKindName,
 
         tme.model_name as modelName,
-        (select string_agg(sys.f_get_name_i18n_lang(kind_name_i18n,#{i18n}), ' | ') from sys.t_data_kind where kind_code
-        = any(tm.moldline_sys_tags)) as moldlineSysTagNames,
+        (select string_agg(data_value, ' | ') from core.t_dictionary_data where data_id
+        = any(tm.moldline_tags)) as moldlineTagNames,
         tu.user_name as manageUserName,
         sys.f_code_name(tu.user_code,tu.user_name) AS "manageUserCodeName",
         tfs.space_name as spaceName,
@@ -283,8 +283,8 @@
         sys.f_get_name_i18n_lang(tdk3.kind_name_i18n,'zh_CN') as pdtGlueKindName,
 
         tme.model_name as modelName,
-        (select string_agg(sys.f_get_name_i18n_lang(kind_name_i18n,'zh_CN'), ' | ') from sys.t_data_kind where kind_code
-        = any(tm.moldline_sys_tags)) as moldlineSysTagNames,
+        (select string_agg(data_value, ' | ') from core.t_dictionary_data where data_id
+        = any(tm.moldline_tags)) as moldlineTagNames,
         sys.f_code_name(tu.user_code,tu.user_name) AS "manageUserCodeName",
         tfs.space_name as spaceName,
         (select string_agg(sys.f_code_name(user_code,user_name), ' | ') from core.t_user where user_id = any(tm.molding_users)) as moldingUserNames,

src/main/java/com/dk/mdm/model/response/mst/MoldlineResponse.java

@@ -226,11 +226,11 @@ public class MoldlineResponse implements Serializable {
 
 
     /**
-     * 成型线标签 (【数据种类】成线标签-高压、中压、普通)
+     * 成型标签 【数据字典】生产-成型标签【工艺流程中控制产品流转】
      */
-    @Excel(name = "成型线标签 (【数据种类】成线标签-高压、中压、普通)")
-    @ApiModelProperty(value = "成型线标签 (【数据种类】成线标签-高压、中压、普通)")
-    private String moldlineSysTagNames;
+    @Excel(name = "成型标签 【数据字典】生产-成型标签【工艺流程中控制产品流转】")
+    @ApiModelProperty(value = "成型标签 【数据字典】生产-成型标签【工艺流程中控制产品流转】")
+    private String moldlineTagNames;
 
 
     /**