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

src/main/java/com/cqut/stack/bn/controller/GovernmentServiceController.java

@@ -88,7 +88,7 @@ public class GovernmentServiceController {
 
     @ApiOperation(value = "获取电子证照信息")
     @PostMapping("/getElectronicCertificateInfo")
-    public Result<GetElectronicCertificateInfoVO> getElectronicCertificateInfo(@RequestBody GetElectronicCertificateInfoDTO dto){
+    public Result<GetElectronicCertificateInfoVO> getElectronicCertificateInfo(@Validated @RequestBody GetElectronicCertificateInfoDTO dto){
         return Result.buildSuccessResult(CodeMessage.S_SUCCESS,electronicCertificateService.getElectronicCertificateInfo(dto));
     }
 

src/main/java/com/cqut/stack/bn/pojo/dto/characteristicThing/CharacteristicThingImportDTO.java

@@ -1,10 +1,14 @@
 package com.cqut.stack.bn.pojo.dto.characteristicThing;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @ApiModel("地方特色一件事信息导入模板参数")
 public class CharacteristicThingImportDTO {
@@ -14,13 +18,13 @@ public class CharacteristicThingImportDTO {
 
     @ApiModelProperty(value = "申请件数")
     @ExcelProperty(value = "申请件数",index = 1)
-    private String processNowCount;
+    private String applyCount;
 
     @ApiModelProperty(value = "受理件数")
     @ExcelProperty(value = "受理件数",index = 2)
-    private String processNowAccount ;
+    private String processCount ;
 
     @ApiModelProperty(value = "办结件数")
     @ExcelProperty(value = "办结件数",index = 3)
-    private String processNetCount;
+    private String completeCount;
 }

src/main/java/com/cqut/stack/bn/pojo/dto/characteristicThing/GetCharacteristicThingInfoDTO.java

@@ -10,10 +10,6 @@ import java.time.LocalDate;
 @Data
 @ApiModel("获取地方特色一件事信息入参")
 public class GetCharacteristicThingInfoDTO {
-    @NotNull(message = "统计年份不能为空")
     @ApiModelProperty(value = "统计年份")
-    private Integer year = LocalDate.now().getYear();
-
-    @ApiModelProperty(value = "区县名称(0:南江县，1：通江县，2;巴州区，3：恩阳区，4：平昌县)")
-    private Integer areaName;
+    private Integer year;
 }

src/main/java/com/cqut/stack/bn/pojo/dto/efficientThing/EfficientThingImportDTO.java

@@ -15,13 +15,13 @@ public class EfficientThingImportDTO {
 
     @ApiModelProperty(value = "申请件数")
     @ExcelProperty(value = "申请件数",index = 1)
-    private String processNowCount;
+    private String applyCount;
 
     @ApiModelProperty(value = "受理件数")
     @ExcelProperty(value = "受理件数",index = 2)
-    private String processNowAccount ;
+    private String processCount ;
 
     @ApiModelProperty(value = "办结件数")
     @ExcelProperty(value = "办结件数",index = 3)
-    private String processNetCount;
+    private String completeCount;
 }

src/main/java/com/cqut/stack/bn/pojo/dto/efficientThing/GetEfficientThingInfoDTO.java

@@ -10,10 +10,6 @@ import java.time.LocalDate;
 @Data
 @ApiModel("获取高效办成一件事信息入参")
 public class GetEfficientThingInfoDTO {
-    @NotNull(message = "统计年份不能为空")
     @ApiModelProperty(value = "统计年份")
-    private Integer year = LocalDate.now().getYear();
-
-    @ApiModelProperty(value = "区县名称(0:南江县，1：通江县，2;巴州区，3：恩阳区，4：平昌县)")
-    private Integer areaName;
+    private Integer year;
 }

src/main/java/com/cqut/stack/bn/pojo/dto/electronicCertificate/ElectronicCertificateImportDTO.java

@@ -11,7 +11,7 @@ import lombok.Data;
 public class ElectronicCertificateImportDTO {
     @ApiModelProperty(value = "地区")
     @ExcelProperty(value = "地区",index = 0)
-    private String districtName;
+    private String districtCode;
 
     @ApiModelProperty(value = "需产生证照的办件数")
     @ExcelProperty(value = "需产生证照的办件数",index = 1)

src/main/java/com/cqut/stack/bn/pojo/dto/electronicCertificate/GetElectronicCertificateInfoDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 
 @Data
@@ -12,6 +13,7 @@ public class GetElectronicCertificateInfoDTO {
     @ApiModelProperty(value = "统计年份")
     private Integer year;
 
+    @NotNull(message = "区县名称不能为空")
     @ApiModelProperty(value = "区县名称(0:南江县，1：通江县，2;巴州区，3：恩阳区，4：平昌县)")
     private Integer areaName;
 }

src/main/java/com/cqut/stack/bn/pojo/dto/fourOfficeInfo/GetFourOfficeInfoDTO.java

@@ -10,9 +10,8 @@ import java.time.LocalDate;
 @Data
 @ApiModel("获取四办情况信息入参")
 public class GetFourOfficeInfoDTO {
-    @NotNull(message = "统计年份不能为空")
     @ApiModelProperty(value = "统计年份")
-    private Integer year = LocalDate.now().getYear();
+    private Integer year;
 
     @NotNull(message = "区县名称不能为空")
     @ApiModelProperty(value = "区县名称(0:南江县，1：通江县，2;巴州区，3：恩阳区，4：平昌县)")

src/main/java/com/cqut/stack/bn/pojo/entity/CharacteristicThing.java

@@ -13,14 +13,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * <p>
- * 地方特色一件事
- * </p>
- *
- * @author ${author}
- * @since 2024-11-24
- */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("characteristic_thing")
@@ -30,13 +22,9 @@ public class CharacteristicThing implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键id")
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "目录名称")
-    @TableField("directory_name")
-    private String directoryName;
-
     @ApiModelProperty(value = "申请件数")
     @TableField("apply_count")
     private Integer applyCount;

src/main/java/com/cqut/stack/bn/pojo/entity/EfficientThing.java

@@ -25,10 +25,6 @@ public class EfficientThing implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "目录名称")
-    @TableField("directory_name")
-    private String directoryName;
-
     @ApiModelProperty(value = "申请件数")
     @TableField("apply_count")
     private Integer applyCount;

src/main/java/com/cqut/stack/bn/pojo/listener/ElectronicCertificateListener.java

@@ -24,7 +24,7 @@ public class ElectronicCertificateListener implements ReadListener<ElectronicCer
         ElectronicCertificate electronicCertificate = new ElectronicCertificate();
         BeanUtil.copyProperties(electronicCertificateImportDTO,electronicCertificate);
 
-        electronicCertificate.setDistrictName(GovernmentServiceEnum.DistrictEnum.getCodeByName(electronicCertificateImportDTO.getDistrictName()));
+        electronicCertificate.setDistrictName(GovernmentServiceEnum.DistrictEnum.getCodeByName(electronicCertificateImportDTO.getDistrictCode()));
         electronicCertificateList.add(electronicCertificate);
     }
 

src/main/java/com/cqut/stack/bn/pojo/vo/characteristicThing/GetCharacteristicThingInfoVO.java

@@ -10,7 +10,7 @@ import java.util.Map;
 @Data
 @ApiModel("获取地方特色一件事信息返回参数")
 public class GetCharacteristicThingInfoVO {
-    @ApiModelProperty("x轴数据，前5一件事名称")
+    @ApiModelProperty("x轴数据，区县名称")
     private List<String> xAxisData;
 
     @ApiModelProperty("y轴数据，各状态数量Map(状态，状态对应的List)")

src/main/java/com/cqut/stack/bn/service/impl/AreaEvaluateServiceImpl.java

@@ -50,7 +50,7 @@ public class AreaEvaluateServiceImpl extends ServiceImpl<AreaEvaluateMapper, Are
         FourOfficeListener fourOfficeListener = new FourOfficeListener();
         try {
             EasyExcel.read(dto.getMultipartFile().getInputStream(), AreaEvaluateImportDTO.class, areaEvaluateListener)
-                    .headRowNumber(2).sheet().doRead();
+                    .headRowNumber(1).sheet().doRead();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/cqut/stack/bn/service/impl/CharacteristicThingServiceImpl.java

@@ -13,6 +13,7 @@ import com.cqut.stack.bn.pojo.dto.characteristicThing.ImportCharacteristicThingD
 import com.cqut.stack.bn.pojo.dto.fourOfficeInfo.FourOfficeImportDTO;
 import com.cqut.stack.bn.pojo.entity.CharacteristicThing;
 import com.cqut.stack.bn.pojo.entity.EfficientThing;
+import com.cqut.stack.bn.pojo.enums.GovernmentServiceEnum;
 import com.cqut.stack.bn.pojo.listener.CharacteristicThingListener;
 import com.cqut.stack.bn.pojo.listener.FourOfficeListener;
 import com.cqut.stack.bn.pojo.vo.characteristicThing.GetCharacteristicThingInfoVO;
@@ -43,10 +44,7 @@ public class CharacteristicThingServiceImpl extends ServiceImpl<CharacteristicTh
     @Override
     public GetCharacteristicThingInfoVO getCharacteristicThingInfo(GetCharacteristicThingInfoDTO dto) {
         LambdaQueryWrapper<CharacteristicThing> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getAreaName()),CharacteristicThing::getDirectoryName,dto.getAreaName())
-                .like(CharacteristicThing::getStatDate,dto.getYear())
-                .orderByDesc(CharacteristicThing::getApplyCount);
-        PageHelper.startPage(1,5);
+        queryWrapper.like(ObjectUtil.isNotEmpty(dto.getYear()),CharacteristicThing::getStatDate,dto.getYear());
         List<CharacteristicThing> characteristicThingList = this.list(queryWrapper);
 
         List<String> xAxisData = new ArrayList<>();
@@ -54,7 +52,7 @@ public class CharacteristicThingServiceImpl extends ServiceImpl<CharacteristicTh
         List<Integer> processCount = new ArrayList<>();
         List<Integer> completeCount = new ArrayList<>();
         for (CharacteristicThing characteristicThing : characteristicThingList) {
-            xAxisData.add(characteristicThing.getDirectoryName());
+            xAxisData.add(GovernmentServiceEnum.DistrictEnum.getNameByCode(characteristicThing.getDistrictName()));
             applyCount.add(characteristicThing.getApplyCount());
             processCount.add(characteristicThing.getProcessCount());
             completeCount.add(characteristicThing.getCompleteCount());
@@ -74,10 +72,9 @@ public class CharacteristicThingServiceImpl extends ServiceImpl<CharacteristicTh
         // 删除所有旧数据
         characteristicThingMapper.deleteAll();
         CharacteristicThingListener characteristicThingListener = new CharacteristicThingListener();
-        FourOfficeListener fourOfficeListener = new FourOfficeListener();
         try {
             EasyExcel.read(dto.getMultipartFile().getInputStream(), CharacteristicThingImportDTO.class, characteristicThingListener)
-                    .headRowNumber(2).sheet().doRead();
+                    .headRowNumber(1).sheet().doRead();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/cqut/stack/bn/service/impl/EfficientThingServiceImpl.java

@@ -12,6 +12,7 @@ import com.cqut.stack.bn.pojo.dto.fourOfficeInfo.FourOfficeImportDTO;
 import com.cqut.stack.bn.pojo.entity.EfficientThing;
 import com.cqut.stack.bn.dao.EfficientThingMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cqut.stack.bn.pojo.enums.GovernmentServiceEnum;
 import com.cqut.stack.bn.pojo.listener.EfficientThingListener;
 import com.cqut.stack.bn.pojo.listener.FourOfficeListener;
 import com.cqut.stack.bn.pojo.vo.efficientThing.GetEfficientThingInfoVO;
@@ -42,10 +43,7 @@ public class EfficientThingServiceImpl extends ServiceImpl<EfficientThingMapper,
     @Override
     public GetEfficientThingInfoVO getEfficientThingInfo(GetEfficientThingInfoDTO dto) {
         LambdaQueryWrapper<EfficientThing> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getAreaName()),EfficientThing::getDirectoryName,dto.getAreaName())
-                .like(EfficientThing::getStatDate,dto.getYear())
-                .orderByDesc(EfficientThing::getApplyCount);
-        PageHelper.startPage(1,5);
+        queryWrapper.like(ObjectUtil.isNotEmpty(dto.getYear()),EfficientThing::getStatDate,dto.getYear());
         List<EfficientThing> efficientThingList = this.list(queryWrapper);
 
         List<String> xAxisData = new ArrayList<>();
@@ -53,7 +51,7 @@ public class EfficientThingServiceImpl extends ServiceImpl<EfficientThingMapper,
         List<Integer> processCount = new ArrayList<>();
         List<Integer> completeCount = new ArrayList<>();
         for (EfficientThing efficientThing : efficientThingList) {
-            xAxisData.add(efficientThing.getDirectoryName());
+            xAxisData.add(GovernmentServiceEnum.DistrictEnum.getNameByCode(efficientThing.getDistrictName()));
             applyCount.add(efficientThing.getApplyCount());
             processCount.add(efficientThing.getProcessCount());
             completeCount.add(efficientThing.getCompleteCount());
@@ -75,7 +73,7 @@ public class EfficientThingServiceImpl extends ServiceImpl<EfficientThingMapper,
         EfficientThingListener efficientThingListener = new EfficientThingListener();
         try {
             EasyExcel.read(dto.getMultipartFile().getInputStream(), EfficientThingImportDTO.class, efficientThingListener)
-                    .headRowNumber(2).sheet().doRead();
+                    .headRowNumber(1).sheet().doRead();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/cqut/stack/bn/service/impl/FourOfficeInfoServiceImpl.java

@@ -47,7 +47,7 @@ public class FourOfficeInfoServiceImpl extends ServiceImpl<FourOfficeInfoMapper,
     public List<FourOfficeInfo> getFourOfficeInfo(GetFourOfficeInfoDTO dto) {
         LambdaQueryWrapper<FourOfficeInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(FourOfficeInfo::getDistrictName,dto.getAreaName())
-                .like(FourOfficeInfo::getStatDate,dto.getYear());
+                .like(ObjectUtil.isNotEmpty(dto.getYear()),FourOfficeInfo::getStatDate,dto.getYear());
         return this.list(queryWrapper);
     }