海外-查看-更新消息,清单由是改为否的时候,清单记录的2
This commit is contained in:
+21
-3
@@ -98,7 +98,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
|||||||
|
|
||||||
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
||||||
List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
|
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)) {
|
if (StringUtils.isNotBlank(advanceStr)) {
|
||||||
page.setAdvanceSearchStr(advanceStr);
|
page.setAdvanceSearchStr(advanceStr);
|
||||||
} else {
|
} else {
|
||||||
@@ -136,7 +142,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
|||||||
|
|
||||||
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
||||||
List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
|
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)) {
|
if (StringUtils.isNotBlank(advanceStr)) {
|
||||||
page.setAdvanceSearchStr(advanceStr);
|
page.setAdvanceSearchStr(advanceStr);
|
||||||
} else {
|
} else {
|
||||||
@@ -215,7 +227,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
|||||||
|
|
||||||
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
|
||||||
List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
|
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)) {
|
if (StringUtils.isNotBlank(advanceStr)) {
|
||||||
page.setAdvanceSearchStr(advanceStr);
|
page.setAdvanceSearchStr(advanceStr);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+7
@@ -1618,6 +1618,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
|||||||
if (StringUtils.isNotBlank(attrStr)) {
|
if (StringUtils.isNotBlank(attrStr)) {
|
||||||
newMap = JSONObject.fromObject(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);
|
newMap = changeMap(sarStandardsInfoEO, newMap);
|
||||||
oldMap = changeMap(beforeSarStandardsInfo, oldMap);
|
oldMap = changeMap(beforeSarStandardsInfo, oldMap);
|
||||||
// 增加关联事件
|
// 增加关联事件
|
||||||
|
|||||||
+1
-1
@@ -1118,7 +1118,7 @@
|
|||||||
<if test="page.applyArctic != null and page.applyArctic != ''">
|
<if test="page.applyArctic != null and page.applyArctic != ''">
|
||||||
and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
|
and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
|
||||||
</if>
|
</if>
|
||||||
<if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
|
<if test="null != page.advanceSearchStr and page.advanceSearchStr != ''">
|
||||||
and (${page.advanceSearchStr})
|
and (${page.advanceSearchStr})
|
||||||
</if>
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
|
|||||||
Reference in New Issue
Block a user