FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!226
This commit is contained in:
super_liu
2021-11-10 13:16:27 +08:00
parent 6dedfa9ea4 c333bd9e3e
commit d6432e2746
4 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+12 -12
View File
@@ -293,12 +293,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
// List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
// if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
// page.setMenuRoleList(getMenuIdList);
// } else {
// page.setMenuRoleList(null);
// }
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
@@ -1586,12 +1586,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
// List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
// if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
// page.setMenuRoleList(getMenuIdList);
// } else {
// page.setMenuRoleList(null);
// }
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java
+17 -7
View File
@@ -91,19 +91,19 @@ public class BussStandExportUtil {
Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
switch (name) {
case "企标类别":
value = sarStandardsInfoEO.getStandSortShow();
value = verifyBean(sarStandardsInfoEO.getStandSortShow());
break;
case "企标编号":
value = sarStandardsInfoEO.getStandCode();
value = verifyBean(sarStandardsInfoEO.getStandCode());
break;
case "中文名称":
value = sarStandardsInfoEO.getStandName();
value = verifyBean(sarStandardsInfoEO.getStandName());
break;
case "英文名称":
value = sarStandardsInfoEO.getStandEnName();
value = verifyBean(sarStandardsInfoEO.getStandEnName());
break;
case "文本状态":
value = sarStandardsInfoEO.getStandStatusShow();
value = verifyBean(sarStandardsInfoEO.getStandStatusShow());
break;
case "标准实施日期":
String putTime="";
@@ -116,10 +116,10 @@ public class BussStandExportUtil {
value = putTime;
break;
case "代替企标编号":
value = sarStandardsInfoEO.getReplaceStandNum();
value = verifyBean(sarStandardsInfoEO.getReplaceStandNum());
break;
case "被代替企标编号":
value = sarStandardsInfoEO.getReplacedStandNum();
value = verifyBean(sarStandardsInfoEO.getReplacedStandNum());
break;
case "发布日期":
String issueTime="";
@@ -149,4 +149,14 @@ public class BussStandExportUtil {
return value;
}
private static String verifyBean(String value){
String val = "";
if(StringUtils.isNotBlank(value)){
val =value;
}else {
val = "";
}
return val;
}
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/LawsStandExportUtil.java
+24 -14
View File
@@ -91,19 +91,19 @@ public class LawsStandExportUtil {
Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
switch (name) {
case "政策分类":
value = sarStandardsInfoEO.getLawsType();
value = verifyBean(sarStandardsInfoEO.getLawsType());
break;
case "政策编号":
value = sarStandardsInfoEO.getLawsNumber();
value = verifyBean(sarStandardsInfoEO.getLawsNumber());
break;
case "中文名称":
value = sarStandardsInfoEO.getLawsName();
value = verifyBean(sarStandardsInfoEO.getLawsName());
break;
case "英文名称":
value = sarStandardsInfoEO.getLawsEnName();
value = verifyBean(sarStandardsInfoEO.getLawsEnName());
break;
case "政策文号":
value = sarStandardsInfoEO.getLawsNo();
value = verifyBean(sarStandardsInfoEO.getLawsNo());
break;
case "发文日期":
String issueTime="";
@@ -116,7 +116,7 @@ public class LawsStandExportUtil {
value = issueTime;
break;
case "发文单位":
value = sarStandardsInfoEO.getIssueCompany();
value = verifyBean(sarStandardsInfoEO.getIssueCompany());
break;
case "征集意见周期-起始时间":
String commentCycleStart="";
@@ -137,31 +137,31 @@ public class LawsStandExportUtil {
value = commentCycleEnd;
break;
case "文本状态":
value = sarStandardsInfoEO.getStandStatusShow();
value = verifyBean(sarStandardsInfoEO.getStandStatusShow());
break;
case "适用区域":
value = sarStandardsInfoEO.getLawsSyqy();
value = verifyBean(sarStandardsInfoEO.getLawsSyqy());
break;
case "适用车型":
value = sarStandardsInfoEO.getLawsSycx();
value = verifyBean(sarStandardsInfoEO.getLawsSycx());
break;
case "是否纳入认证清单":
value = sarStandardsInfoEO.getIsRelateAccess() != null ? (sarStandardsInfoEO.getIsRelateAccess().equals("1")?"是":"否"): "";
break;
case "年度":
value = sarStandardsInfoEO.getLawsYear();
value = verifyBean(sarStandardsInfoEO.getLawsYear());
break;
case "福田转发通知文号":
value = sarStandardsInfoEO.getLawsNotisyncNum();
value = verifyBean(sarStandardsInfoEO.getLawsNotisyncNum());
break;
case "信息简报":
value = sarStandardsInfoEO.getLawsBulletin();
value = verifyBean(sarStandardsInfoEO.getLawsBulletin());
break;
case "标签":
value = sarStandardsInfoEO.getLawsLabel();
value = verifyBean(sarStandardsInfoEO.getLawsLabel());
break;
case "备注":
value = sarStandardsInfoEO.getLawsRemark();
value = verifyBean(sarStandardsInfoEO.getLawsRemark());
break;
default:
String field = attrInfoMap.get(name);
@@ -173,4 +173,14 @@ public class LawsStandExportUtil {
return value;
}
private static String verifyBean(String value){
String val = "";
if(StringUtils.isNotBlank(value)){
val =value;
}else {
val = "";
}
return val;
}
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
+29 -14
View File
@@ -101,23 +101,28 @@ public class StandExportUtil {
Map<String,Object> attrValueMap = sarStandardsInfoEO.getAttrInfoMap();
switch (name) {
case "标准性质":
value = sarStandardsInfoEO.getStandNatureShow();
value = verifyBean(sarStandardsInfoEO.getStandNatureShow());
break;
case "是否纳入认证清单":
switch (sarStandardsInfoEO.getIsRelateAccess()){
case "0": value="否"; break;
case "1": value="是"; break;
default:value="";
boolean notBlank = StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess());
if (notBlank) {
switch (sarStandardsInfoEO.getIsRelateAccess()){
case "0": value="否"; break;
case "1": value="是"; break;
default:value="";
}
}else {
value = "";
}
break;
case "标准体系":
value = sarStandardsInfoEO.getStandSystem();
value = verifyBean(sarStandardsInfoEO.getStandSystem());
break;
case "适用区域":
value = sarStandardsInfoEO.getCountryShow();
value = verifyBean(sarStandardsInfoEO.getCountryShow());
break;
case "标准类别":
value = sarStandardsInfoEO.getStandSortShow();
value = verifyBean(sarStandardsInfoEO.getStandSortShow());
break;
case "重要度":
if (StringUtils.isNotBlank(sarStandardsInfoEO.getIsRelateAccess())) {
@@ -130,19 +135,19 @@ public class StandExportUtil {
value = sarStandardsInfoEO.getIsRelateAccess();
break;
case "标准编号":
value = sarStandardsInfoEO.getStandNumber();
value = verifyBean(sarStandardsInfoEO.getStandNumber());
break;
case "标准年份":
value = sarStandardsInfoEO.getStandYear();
value = verifyBean(sarStandardsInfoEO.getStandYear());
break;
case "中文名称":
value = sarStandardsInfoEO.getStandName();
value = verifyBean(sarStandardsInfoEO.getStandName());
break;
case "英文名称":
value = sarStandardsInfoEO.getStandEnName();
value = verifyBean(sarStandardsInfoEO.getStandEnName());
break;
case "文本状态":
value = sarStandardsInfoEO.getStandTextStatusShow();
value = verifyBean(sarStandardsInfoEO.getStandTextStatusShow());
break;
case "发布日期":
if (sarStandardsInfoEO.getIssueTime() != null) {
@@ -154,7 +159,7 @@ public class StandExportUtil {
}
break;
case "文本说明":
value = sarStandardsInfoEO.getSynopsis();
value = verifyBean(sarStandardsInfoEO.getSynopsis());
break;
default:
String field = attrInfoMap.get(name);
@@ -166,4 +171,14 @@ public class StandExportUtil {
return value;
}
private static String verifyBean(String value){
String val = "";
if(StringUtils.isNotBlank(value)){
val =value;
}else {
val = "";
}
return val;
}
}