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

海外-查看-更新消息，清单由是改为否的时候，清单记录的2

Browse Source
This commit is contained in:
yuezhihang
2022-03-14 17:08:23 +08:00
parent bbe8114507
commit fd1cbe8a79
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+21 -3
View File
@@ -98,7 +98,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO");
//不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM");
}
});
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr);
} else {
@@ -136,7 +142,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO");
//不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM");
}
});
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr);
} else {
@@ -215,7 +227,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO");
//不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM");
}
});
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr);
} else {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+7
View File
@@ -1618,6 +1618,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (StringUtils.isNotBlank(attrStr)) {
newMap = JSONObject.fromObject(attrStr);
}
//更新日志bug修复
Map<String,String> map=new HashMap<>();
map.put("1","是");
map.put("2","否");
sarStandardsInfoEO.setIsRelateAccess(map.get(sarStandardsInfoEO.getIsRelateAccess()));
beforeSarStandardsInfo.setIsRelateAccess(map.get(beforeSarStandardsInfo.getIsRelateAccess()));
newMap = changeMap(sarStandardsInfoEO, newMap);
oldMap = changeMap(beforeSarStandardsInfo, oldMap);
// 增加关联事件
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+1 -1
View File
@@ -1118,7 +1118,7 @@
<if test="page.applyArctic != null and page.applyArctic != ''">
and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
</if>
<if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
<if test="null != page.advanceSearchStr and page.advanceSearchStr != ''">
and (${page.advanceSearchStr})
</if>
</trim>