|
@@ -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;
|