diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java index 66e30f9..a28af19 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java @@ -114,9 +114,9 @@ public class GovEnterpriseScoreDetailController { Map resultMap = new HashMap<>(); for (String im : item) { Map categoryMap = new HashMap<>(); - List category = list.stream().filter(l -> l.getSubItem().equals(im)).map(EnterpriseScoreDetail::getCategory).collect(Collectors.toList()); + List category = list.stream().filter(l -> l.getDeductPointsStandard().equals(im)).map(EnterpriseScoreDetail::getCategory).collect(Collectors.toList()); for (String s : category) { - categoryMap.put(s, list.stream().filter(l -> l.getSubItem().equals(im) && l.getCategory().equals(s)).collect(Collectors.toList())); + categoryMap.put(s, list.stream().filter(l -> l.getDeductPointsStandard().equals(im) && l.getCategory().equals(s)).collect(Collectors.toList())); } resultMap.put(im, categoryMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java index 832a0e6..44462d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java @@ -100,15 +100,15 @@ public class GovEnterpriseScoreStandardController { // wrapper.eq(EnterpriseScoreStandard::getSubItem, enterpriseScoreStandard.getSubItem()); // } // return Result.success(enterpriseScoreStandardService.list(wrapper)); - List item = enterpriseScoreStandardService.getItem(enterpriseScoreStandard.getEnterpriseType()); + List type = enterpriseScoreStandardService.getType(enterpriseScoreStandard.getEnterpriseType()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreStandard); List list = enterpriseScoreStandardService.list(queryWrapper); Map resultMap = new HashMap<>(); - for (String im : item) { + for (String im : type) { Map categoryMap = new HashMap<>(); - List category = list.stream().filter(l -> l.getSubItem().equals(im)).map(EnterpriseScoreStandard::getCategory).collect(Collectors.toList()); + List category = list.stream().filter(l -> l.getDeductPointsStandard().equals(im)).map(EnterpriseScoreStandard::getCategory).collect(Collectors.toList()); for (String s : category) { - categoryMap.put(s, list.stream().filter(l -> l.getSubItem().equals(im) && l.getCategory().equals(s)).collect(Collectors.toList())); + categoryMap.put(s, list.stream().filter(l -> l.getDeductPointsStandard().equals(im) && l.getCategory().equals(s)).collect(Collectors.toList())); } resultMap.put(im, categoryMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java index 131d5fe..75e5bc8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java @@ -24,4 +24,6 @@ public interface EnterpriseScoreDetailMapper extends BaseMapper pageList(@Param(Constants.WRAPPER) Wrapper wrapper); List getItem(Long scoreId); + + List getType(Long scoreId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java index d038f17..645e9b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java @@ -21,4 +21,6 @@ public interface EnterpriseScoreStandardMapper extends BaseMapper wrapper); List getItem(Integer enterpriseType); + + List getType(Integer enterpriseType); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml index 5cfc5b8..a68364a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml @@ -10,4 +10,8 @@ + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml index ec43e2d..4be6075 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml @@ -10,4 +10,8 @@ + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java index 8d1f9f3..f64c408 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java @@ -26,4 +26,6 @@ public interface IEnterpriseScoreDetailService extends IService getItem(Long scoreId); + + List getType(Long scoreId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java index 991296f..9eae881 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java @@ -17,4 +17,6 @@ public interface IEnterpriseScoreStandardService extends IService wrapper); List getItem(Integer enterpriseType); + + List getType(Integer enterpriseType); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java index 5877f90..9576968 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java @@ -92,4 +92,9 @@ public class EnterpriseScoreDetailServiceImpl extends ServiceImpl getItem(Long scoreId) { return baseMapper.getItem(scoreId); } + + @Override + public List getType(Long scoreId) { + return baseMapper.getType(scoreId); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java index 08f2a88..0b95210 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java @@ -26,4 +26,11 @@ public class EnterpriseScoreStandardServiceImpl extends ServiceImpl getItem(Integer enterpriseType) { return baseMapper.getItem(enterpriseType); } + + @Override + public List getType(Integer enterpriseType) { + return baseMapper.getType(enterpriseType); + } + + }