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

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
2510220824
2021-08-24 14:24:40 +08:00
parent 5d7f3195e3 150e6f8676
commit 97cec30f4d
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java
+1 -1
View File
@@ -37,7 +37,7 @@ import java.util.Map;
@Component
public class SendConvertMQService {
// 文档转换远程服务IP地址
// 文档转换远程服务IP地址s
@Value("${convert.host}")
private String convertHost;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+1 -1
View File
@@ -222,7 +222,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
public ResponseMessage<PageInfo<SarBussionessStand>> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception {
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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 {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+1 -1
View File
@@ -200,7 +200,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
page.setPageSize(10000);
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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 {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+6 -2
View File
@@ -1389,7 +1389,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> 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<SarStandardsInfoDao
}
}
page.setOrderBy("SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id");
page.setUserId(LoginUserUtil.getUserId());
if(standardsInfoExcelVO.getUserId() != null){
page.setUserId(standardsInfoExcelVO.getUserId());
}else {
page.setUserId(LoginUserUtil.getUserId());
}
List<SarStandardsInfo> getList = dao.getSarStandardsExportInfo(page);
attrInfoShow(getList);
return getList;
adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
+13 -13
View File
@@ -14,7 +14,7 @@ import java.util.List;
public class SarAdvanceSearchUtil {
// 拼接sql语句
public static String createSql(List<SarAdvanceSearchVO> searchVOList) {
public static String createSql(List<SarAdvanceSearchVO> searchVOList,String tableName) {
String sqlInfo = "";
StringBuilder sqlBuilder = new StringBuilder();
if (searchVOList != null && !searchVOList.isEmpty()) {
@@ -26,14 +26,14 @@ public class SarAdvanceSearchUtil {
List<String> 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 += ")";
}