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

高级查询

Browse Source
This commit is contained in:
yuezhihang
2022-03-17 17:26:16 +08:00
parent 52c238c02e
commit 9f667ecd51
3 changed files with 24 additions and 24 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
+17 -17
View File
@@ -99,12 +99,12 @@ 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);
//不改传参强行置换 //不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> { // searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){ // if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM"); // sarAdvanceSearchVO.setField("STAND_SYSTEM");
} // }
}); // });
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info");
if (StringUtils.isNotBlank(advanceStr)) { if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr); page.setAdvanceSearchStr(advanceStr);
} else { } else {
@@ -143,12 +143,12 @@ 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);
//不改传参强行置换 //不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> { // searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){ // if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM"); // sarAdvanceSearchVO.setField("STAND_SYSTEM");
} // }
}); // });
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info");
if (StringUtils.isNotBlank(advanceStr)) { if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr); page.setAdvanceSearchStr(advanceStr);
} else { } else {
@@ -228,11 +228,11 @@ 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);
//不改传参强行置换 //不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> { // searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){ // if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM"); // sarAdvanceSearchVO.setField("STAND_SYSTEM");
} // }
}); // });
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
if (StringUtils.isNotBlank(advanceStr)) { if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr); page.setAdvanceSearchStr(advanceStr);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+6 -6
View File
@@ -1817,12 +1817,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
//不改传参强行置换 //不改传参强行置换
searchList.forEach(sarAdvanceSearchVO -> { // searchList.forEach(sarAdvanceSearchVO -> {
if ("TXLB".equals(sarAdvanceSearchVO.getField())){ // if ("TXLB".equals(sarAdvanceSearchVO.getField())){
sarAdvanceSearchVO.setField("STAND_SYSTEM"); // sarAdvanceSearchVO.setField("STAND_SYSTEM");
} // }
}); // });
String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info");
if (StringUtils.isNotBlank(advanceStr)) { if (StringUtils.isNotBlank(advanceStr)) {
page.setAdvanceSearchStr(advanceStr); page.setAdvanceSearchStr(advanceStr);
} else { } else {
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+1 -1
View File
@@ -10,7 +10,7 @@
sar_stand_project_library.product_line as productLine,sar_stand_project_library.project_number as productId, sar_stand_project_library.product_line as productLine,sar_stand_project_library.project_number as productId,
sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName, sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName,
(SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId} AND CLOSE_STATE = '1' ) unCount, (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId} AND CLOSE_STATE = '1' ) unCount,
(SELECT count(*) FROM sar_standard_compliance_product_assess sspa WHERE sspa.STAND_ID=#{product.standId} and sspa.no_involve is not null ) unCounts, (SELECT count(*) FROM sar_standard_compliance_product_assess sspa WHERE sspa.STAND_ID=#{product.standId} and sspa.no_involve is not null and sspa.no_involve !='' ) unCounts,
(SELECT count(*) FROM sar_standard_compliance_product_assess sspa WHERE sspa.STAND_ID=#{product.standId} ) allCounts (SELECT count(*) FROM sar_standard_compliance_product_assess sspa WHERE sspa.STAND_ID=#{product.standId} ) allCounts
FROM FROM
sar_stand_project_library sar_stand_project_library