Bladeren bron

政府服务可视化界面bug修复

wanxing 2 maanden geleden
bovenliggende
commit
23cf23c23d

+ 1 - 1
src/main/java/com/cqut/stack/bn/controller/HotlineController.java

@@ -119,7 +119,7 @@ public class HotlineController {
 
     @ApiOperation(value = "获取当前区县热线办件情况")
     @PostMapping("/getCurrentAreaHotlineAcceptance")
-    public Result<HotlineAcceptance> getCurrentAreaHotlineAcceptance(@RequestBody GetCurrentAreaHotlineAcceptanceDTO dto) {
+    public Result<List<HotlineAcceptance>> getCurrentAreaHotlineAcceptance(@RequestBody GetCurrentAreaHotlineAcceptanceDTO dto) {
         return Result.buildSuccessResult(CodeMessage.S_SUCCESS, hotlineAcceptanceService.getCurrentAreaHotlineAcceptance(dto));
     }
 

+ 0 - 6
src/main/java/com/cqut/stack/bn/pojo/dto/hotlineAcceptance/GetCurrentAreaHotlineAcceptanceDTO.java

@@ -4,15 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 @Data
 @ApiModel("获取当前区县热线办件情况入参")
 public class GetCurrentAreaHotlineAcceptanceDTO {
     @ApiModelProperty(value = "统计年份")
     private Integer year;
-
-    @NotNull(message = "区县名称不能为空")
-    @ApiModelProperty(value = "区县名称")
-    private String districtName;
 }

+ 1 - 1
src/main/java/com/cqut/stack/bn/service/HotlineAcceptanceService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface HotlineAcceptanceService extends IService<HotlineAcceptance> {
 
-    HotlineAcceptance getCurrentAreaHotlineAcceptance(GetCurrentAreaHotlineAcceptanceDTO dto);
+    List<HotlineAcceptance> getCurrentAreaHotlineAcceptance(GetCurrentAreaHotlineAcceptanceDTO dto);
 
     List<HotlineAcceptance> getHotlineAcceptance(GetHotlineDeptAcceptanceDTO getHotlineDeptAcceptanceDTO);
 }

+ 3 - 6
src/main/java/com/cqut/stack/bn/service/impl/HotlineAcceptanceServiceImpl.java

@@ -19,14 +19,11 @@ import java.util.List;
 public class HotlineAcceptanceServiceImpl extends ServiceImpl<HotlineAcceptanceMapper, HotlineAcceptance> implements HotlineAcceptanceService {
 
     @Override
-    public HotlineAcceptance getCurrentAreaHotlineAcceptance(GetCurrentAreaHotlineAcceptanceDTO dto) {
+    public List<HotlineAcceptance> getCurrentAreaHotlineAcceptance(GetCurrentAreaHotlineAcceptanceDTO dto) {
         LambdaQueryWrapper<HotlineAcceptance> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getYear()),HotlineAcceptance::getStatDate,dto.getYear())
-                .eq(HotlineAcceptance::getDistrictName,dto.getDistrictName());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getYear()),HotlineAcceptance::getStatDate,dto.getYear());
         List<HotlineAcceptance> list = this.list(queryWrapper);
-        if(CollectionUtil.isEmpty(list))
-            return null;
-        return list.get(0);
+        return list;
     }
 
     @Override