|
@@ -286,7 +286,7 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
|
|
|
for (OrganizationRating or : orgRating) {
|
|
|
ls.add(or.getId());
|
|
|
}
|
|
|
- List<OrganizationRatingRule> rules = list.stream().filter(orr -> "年度评级".equals(orr.getCheckCycle())).collect(Collectors.toList());
|
|
|
+ List<OrganizationRatingRule> rules = list.stream().filter(orr -> "年度评级".equals(orr.getBinStage())).collect(Collectors.toList());
|
|
|
List<OrganizationRating> org = iOrganizationRatingService.listByIds(ls);
|
|
|
Map<String, List<OrganizationRating>> col = org.stream().collect(Collectors.groupingBy(OrganizationRating::getBinSection));
|
|
|
|
|
@@ -368,7 +368,7 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
|
|
|
* 基建评级
|
|
|
*/
|
|
|
private R calcJJXMrating(List<OrganizationRatingRule> list, Map<String, List<OrganizationRating>> orgRating, Sheet st, XSSFWorkbook xwb) {
|
|
|
- List<OrganizationRatingRule> rules = list.stream().filter(orr -> "基建评级".equals(orr.getCheckCycle())).collect(Collectors.toList());
|
|
|
+ List<OrganizationRatingRule> rules = list.stream().filter(orr -> "基建评级".equals(orr.getBinStage())).collect(Collectors.toList());
|
|
|
for (Map.Entry<String, List<OrganizationRating>> orgMap : orgRating.entrySet()) {
|
|
|
List<OrganizationRatingRule> collect = rules.stream().filter(rul -> orgMap.getKey().equals(rul.getBinSection())).collect(Collectors.toList());
|
|
|
if (collect.isEmpty()) {
|
|
@@ -420,7 +420,7 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
|
|
|
* 生产经营评级
|
|
|
*/
|
|
|
private R calcSCJYrating(List<OrganizationRatingRule> list, Map<String, List<OrganizationRating>> orgRating, Sheet st, XSSFWorkbook xwb) {
|
|
|
- List<OrganizationRatingRule> rules = list.stream().filter(orr -> "生产经营评级".equals(orr.getCheckCycle())).collect(Collectors.toList());
|
|
|
+ List<OrganizationRatingRule> rules = list.stream().filter(orr -> "生产经营评级".equals(orr.getBinStage())).collect(Collectors.toList());
|
|
|
for (Map.Entry<String, List<OrganizationRating>> orgMap : orgRating.entrySet()) {
|
|
|
List<OrganizationRatingRule> collect = rules.stream().filter(rul -> orgMap.getKey().equals(rul.getBinSection())).collect(Collectors.toList());
|
|
|
for (OrganizationRatingRule ru : rules) {
|
|
@@ -479,7 +479,7 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
|
|
|
* 前期评级
|
|
|
*/
|
|
|
private R calcQQXMrating(List<OrganizationRatingRule> list, Map<String, List<OrganizationRating>> orgRating, Sheet st, XSSFWorkbook xwb) {
|
|
|
- List<OrganizationRatingRule> rules = list.stream().filter(orr -> "前期评级".equals(orr.getCheckCycle())).collect(Collectors.toList());
|
|
|
+ List<OrganizationRatingRule> rules = list.stream().filter(orr -> "前期评级".equals(orr.getBinStage())).collect(Collectors.toList());
|
|
|
for (Map.Entry<String, List<OrganizationRating>> orgMap : orgRating.entrySet()) {
|
|
|
List<OrganizationRatingRule> collect = rules.stream().filter(rul -> orgMap.getKey().equals(rul.getBinSection())).collect(Collectors.toList());
|
|
|
if (collect.isEmpty()) {
|