From 57a3e082d34d5c2c81b3e09056fc1c3e196027ce Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 24 Aug 2021 13:37:36 +0800 Subject: [PATCH 1/2] feat: There is no way the --- .../main/java/com/adc/da/convert/mq/SendConvertMQService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index 6a576e23..e951244d 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -37,7 +37,7 @@ import java.util.Map; @Component public class SendConvertMQService { - // 文档转换远程服务IP地址 + // 文档转换远程服务IP地址s @Value("${convert.host}") private String convertHost; From a971d3bcf75e2b9bae9605d176496fd516f224e7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 24 Aug 2021 13:40:45 +0800 Subject: [PATCH 2/2] feat: There is no way the --- .../SarBussionessStandController.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 8 ++++-- .../da/utils/util/SarAdvanceSearchUtil.java | 26 +++++++++---------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 450daee1..f370bec7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -222,7 +222,7 @@ public class SarBussionessStandController extends BaseController> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 097528d6..f872d44c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -200,7 +200,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); if (com.adc.da.util.utils.StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index ac587322..421bf4f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1389,7 +1389,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_STAND_ATTR_INFO"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { @@ -1398,7 +1398,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); attrInfoShow(getList); return getList; diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index bfc545b2..811274f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -14,7 +14,7 @@ import java.util.List; public class SarAdvanceSearchUtil { // 拼接sql语句 - public static String createSql(List searchVOList) { + public static String createSql(List searchVOList,String tableName) { String sqlInfo = ""; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { @@ -26,14 +26,14 @@ public class SarAdvanceSearchUtil { List list = Arrays.asList(searchVO.getValue().split(",")); for (int i = 0; i < list.size(); i++) { if (i == list.size() - 1) { - sql += searchVO.getField() + " " + searchVO.getType() + " " + "concat(concat('%','" + list.get(i) + "'),'%') "; + sql += tableName+"."+searchVO.getField() + " " + searchVO.getType() + " " + "concat(concat('%','" + list.get(i) + "'),'%') "; } else { - sql += searchVO.getField() + " " + searchVO.getType() + " " + "concat(concat('%','" + list.get(i) + "'),'%') and "; + sql += tableName+"."+searchVO.getField() + " " + searchVO.getType() + " " + "concat(concat('%','" + list.get(i) + "'),'%') and "; } } sql += " )"; } else { - sql += searchVO.getConnect() + " " + searchVO.getField() + " "; + sql += searchVO.getConnect() + " " + tableName+"."+searchVO.getField() + " "; if (!"like".equals(searchVO.getType())) { sql += searchVO.getType() + "'" + searchVO.getValue() + "'"; } else { @@ -44,30 +44,30 @@ public class SarAdvanceSearchUtil { } else if (StringUtils.isNotBlank(searchVO.getTimeSt()) || StringUtils.isNotBlank(searchVO.getTimeEd())) { sql += searchVO.getConnect() + " "; if (StringUtils.isNotBlank(searchVO.getTimeSt()) && StringUtils.isBlank(searchVO.getTimeEd())) { - sql += "(" + searchVO.getField(); + sql += "(" + tableName+"."+searchVO.getField(); sql += (searchVO.getType().equals("!=") ? " not " : "") + " between " + "'" + searchVO.getTimeSt() + "' and '2099-12-31'"; - sql += " or " + searchVO.getField(); + sql += " or " + tableName+"."+searchVO.getField(); sql += (searchVO.getType().equals("!=") ? " not " : "") + " between " + "'" + searchVO.getTimeSt() + " 00:00:00" + "' and '2099-12-31 23:59:59'"; - sql += " or " + searchVO.getField(); + sql += " or " + tableName+"."+searchVO.getField(); sql += " = 'TBD'"; sql += ")"; } else if (StringUtils.isBlank(searchVO.getTimeSt()) && StringUtils.isNotBlank(searchVO.getTimeEd())) { - sql += "(" + searchVO.getField(); + sql += "(" + tableName+"."+searchVO.getField(); sql += (searchVO.getType().equals("!=") ? " not " : "") + " between '1970-01-01' and " + "'" + searchVO.getTimeEd() + "'"; - sql += " or " + searchVO.getField(); + sql += " or " + tableName+"."+searchVO.getField(); sql += (searchVO.getType().equals("!=") ? " not " : "") + " between '1970-01-01 00:00:00' and " + "'" + searchVO.getTimeEd() + " 23:59:59'"; - sql += " or " + searchVO.getField(); + sql += " or " + tableName+"."+searchVO.getField(); sql += " = 'TBD'"; sql += ")"; } else if (StringUtils.isNotBlank(searchVO.getTimeSt()) && StringUtils.isNotBlank(searchVO.getTimeEd())) { - sql += "(" + searchVO.getField(); + sql += "(" + tableName+"."+searchVO.getField(); sql += (searchVO.getType().equals("!=") ? " not " : "") + " between '" + searchVO.getTimeSt() + "' and '" + searchVO.getTimeEd() + "'"; - sql += " or " + searchVO.getField(); + sql += " or " + tableName+"."+searchVO.getField(); sql += (searchVO.getType().equals("!=") ? " not " : "") + " between '" + searchVO.getTimeSt() + " 00:00:00" + "' and '" + searchVO.getTimeEd() + " 23:59:59'"; - sql += " or " + searchVO.getField(); + sql += " or " + tableName+"."+searchVO.getField(); sql += " = 'TBD'"; sql += ")"; }