diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index b24104c..fb4d047 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -855,4 +855,10 @@ public class DisasterInfoController { return R.data(disasterInfoService.getUserDisasterInfoListNew(Condition.getPage(query), params.get("userId"),params.get("roleId"))); } + //home页面 受影响国家统计 + @GetMapping("/getAffectedCountryCount") + public R getAffectedCountryCount() { + return R.data(disasterInfoService.getAffectedCountryCount()); + } + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index 117b25c..f518a79 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -60,6 +60,9 @@ public class ToolController{ if(!StringUtils.isEmpty(tool.getRelatedDisasterType())) { queryWrapper.eq("related_disaster_type", tool.getRelatedDisasterType()); } + if(!StringUtils.isEmpty(tool.getDisasterType())) { + queryWrapper.like("disaster_type", tool.getDisasterType()); + } String checkd = tool.getChecked(); if(checkd != null && checkd.equals("1")){ queryWrapper.isNull("review_time"); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index 14a31cd..a574f65 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -117,4 +117,6 @@ public interface DisasterInfoMapper extends BaseMapper { IPage getUserDisasterInfoListNew(IPage page, @Param("userId") String userId); void updateApplyForCount(@Param("id") Long id); + + Integer getAffectedCountryCount(); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index cf37f44..9cd8a90 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -1750,4 +1750,9 @@ id=#{id} + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index 06fecf3..ac0c502 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -98,4 +98,6 @@ public interface DisasterInfoService extends IService { IPage getUserDisasterInfoListNew(IPage page, String userId, String roleId); void updateApplyForCount(Long disasterId); + + Integer getAffectedCountryCount(); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 657fbdd..fd45700 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -626,4 +626,9 @@ public class DisasterInfoServiceImpl extends ServiceImpl