Browse Source

bug 59388,
数据内容分类 显示写活

guoyuanquan@mail.taiji.com.cn 6 months ago
parent
commit
af67975ce1

+ 16 - 2
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/TinfoClassService.java

@@ -314,7 +314,11 @@ public class TinfoClassService {
 	List<TinfoClassDto> dtolsit = new ArrayList<TinfoClassDto>();
 
 	for (TinfoClass u : dataList) {
-
+		for (CodeDto code : dbdcCodeService.findCodeByCodeType("fltag")) {
+			if (code != null && code.getId() != null && u.getFltag().equals(code.getCodeCode())) {
+				u.setFltag(code.getCodeName());
+			}
+		}
 	    dtolsit.add(new TinfoClassDto(u));
 	}
 	pag.setPageResult(dtolsit);
@@ -698,6 +702,11 @@ public class TinfoClassService {
 	List<TinfoClassDto> dtolsit = new ArrayList<TinfoClassDto>();
 
 	for (TinfoClass u : dataList) {
+		for (CodeDto code : dbdcCodeService.findCodeByCodeType("fltag")) {
+			if (code != null && code.getId() != null && u.getFltag().equals(code.getCodeCode())) {
+				u.setFltag(code.getCodeName());
+			}
+		}
 		TinfoClassDto temp = new TinfoClassDto(u);
 		if (StrUtil.isNotBlank(u.getParentid())) {
 			TinfoClass parent = tinfoClassRepository.findOne(u.getParentid());
@@ -1198,7 +1207,12 @@ public class TinfoClassService {
 		  info.setSharemodetypename(rs.getString("sharemodetypename"));
 		  info.setIsglqz(rs.getString("isglqz"));
 		  info.setBgstatus(rs.getString("bgstatus"));
-		  info.setFltag(rs.getString("fltag"));
+		  for (CodeDto code : dbdcCodeService.findCodeByCodeType("fltag")) {
+		  	if (code != null && code.getId() != null && rs.getString("fltag").equals(code.getCodeCode())) {
+				info.setFltag(code.getCodeName());
+		  	}
+		  }
+//		  info.setFltag(rs.getString("fltag"));
 		  
 		  info.setManagetype(rs.getString("managetype"));
                   return info;  

+ 1 - 13
cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_resClassifyList.js

@@ -74,19 +74,7 @@ layui.config({
           ,{field:'updatetime', title:'发布时间',width:200}
           // ,{field:'isopensocial', width:150,title:'开放类型', sort: true}
           // ,{field:'infotypename', width:200,title:'资源分类' }
-          ,{field:'fltag', title:'数据内容分类',width:300,templet: function (res) {
-          	if (res.fltag=="0001"){
-          		return "三维数据";
-			}else if (res.fltag=="0002"){
-          		return "二维数据";
-			}else if (res.fltag=="0003"){
-          		return "结构化数据";
-			}else if (res.fltag=="0004"){
-          		return "半结构化数据";
-			}else {
-          		return " ";
-			}
-				}}
+          ,{field:'fltag', title:'数据内容分类',width:200}
           ,{field:'providebmname',width:200, title:'数据资源管理单位'}
           ,{field:'sharetype',width:200, title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){

+ 1 - 13
cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_yslist.js

@@ -80,19 +80,7 @@ layui.config({
           }}
           // ,{field:'isopensocial', title:'开放类型', sort: true}
           // ,{field:'infotypename', title:'资源分类',width:300 }
-          ,{field:'fltag', title:'数据内容分类',width:300,templet: function (res) {
-					if (res.fltag=="0001"){
-						return "三维数据";
-					}else if (res.fltag=="0002"){
-						return "二维数据";
-					}else if (res.fltag=="0003"){
-						return "结构化数据";
-					}else if (res.fltag=="0004"){
-						return "半结构化数据";
-					}else {
-						return " ";
-					}
-				}}
+          ,{field:'fltag', title:'数据内容分类',width:300}
           
           ,{field:'updatetime', title:'发布时间'}
          

+ 1 - 13
cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_zclist.js

@@ -107,19 +107,7 @@ layui.config({
           }}
           // ,{field:'isopensocial', title:'开放类型', sort: true}
           // ,{field:'infotypename', title:'资源分类',width:300  }
-          ,{field:'fltag', title:'数据内容分类',width:300,templet: function (res) {
-					if (res.fltag=="0001"){
-						return "三维数据";
-					}else if (res.fltag=="0002"){
-						return "二维数据";
-					}else if (res.fltag=="0003"){
-						return "结构化数据";
-					}else if (res.fltag=="0004"){
-						return "半结构化数据";
-					}else {
-						return " ";
-					}
-				}}
+          ,{field:'fltag', title:'数据内容分类'}
           ,{field:'providebmname', title:'数据资源管理单位'}
           ,{field:'sharetype', title:'共享类型', sort: true,templet: function(res){
         	  if(res.sharetype=="1"){