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

合规评估-标准维度查询不出来bug修复 以及导出接口白名单

Browse Source
This commit is contained in:
yuezhihang
2021-11-07 17:00:49 +08:00
parent f7b0296cef
commit 438ee5ff5f
4 changed files with 188 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+1 -1
View File
@@ -21,7 +21,7 @@ import java.util.List;
@Repository
public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page);
List<SarStandardsInfo> getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark);
int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+4 -4
View File
@@ -307,7 +307,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
Integer rowCount = dao.getSarStandardsInfoCount(page);
page.getPager().setRowCount(rowCount);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
attrInfoCollect(sarlist);
return sarlist;
}
@@ -335,7 +335,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
Integer rowCount = dao.getSarStandardsInfoCount(page);
page.getPager().setRowCount(rowCount);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"999");
attrInfo(sarlist);
return sarlist;
}
@@ -1508,7 +1508,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
standNum = getDelStandInfo.getStandSort() + " " + getDelStandInfo.getStandNumber();
}
sarStandardsInfoEOPage.setReplacedStandNum(standNum);
List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage);
List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage,"0");
if (getReplacedStands != null && !getReplacedStands.isEmpty()) {
for (SarStandardsInfo stand : getReplacedStands) {
SarStandardsInfo newStand = new SarStandardsInfo();
@@ -2739,7 +2739,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
// }
Integer rowCount = dao.getSarStandardsInfoCount(page);
page.getPager().setRowCount(rowCount);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page,"0");
attrInfo(sarlist);
return sarlist;
}