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

src/main/java/com/cqut/stack/bn/pojo/dto/hotlineAcceptance/GetCurrentAreaHotlineAcceptanceDTO.java

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

src/main/java/com/cqut/stack/bn/pojo/dto/hotlineDistrictAcceptance/GetHotlineDistrictAcceptInfoDTO.java

@@ -10,5 +10,5 @@ import java.time.LocalDate;
 @ApiModel("获取各区县办件情况入参")
 public class GetHotlineDistrictAcceptInfoDTO {
     @ApiModelProperty(value = "统计年份")
-    private Integer year = LocalDate.now().getYear();
+    private Integer year;
 }

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

@@ -13,18 +13,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * <p>
- * 
- * </p>
- *
- * @author ${author}
- * @since 2024-11-24
- */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("hotline_acceptance")
-@ApiModel(value="HotlineAcceptance对象", description="")
+@ApiModel(value="HotlineAcceptance对象")
 public class HotlineAcceptance implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -47,7 +39,7 @@ public class HotlineAcceptance implements Serializable {
 
     @ApiModelProperty(value = "统计年份")
     @TableField("stat_date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy")
     private Date statDate;
 
 

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

@@ -1,6 +1,7 @@
 package com.cqut.stack.bn.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cqut.stack.bn.pojo.dto.hotlineAcceptance.GetCurrentAreaHotlineAcceptanceDTO;
@@ -19,9 +20,8 @@ public class HotlineAcceptanceServiceImpl extends ServiceImpl<HotlineAcceptanceM
 
     @Override
     public HotlineAcceptance getCurrentAreaHotlineAcceptance(GetCurrentAreaHotlineAcceptanceDTO dto) {
-
         LambdaQueryWrapper<HotlineAcceptance> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(HotlineAcceptance::getStatDate,dto.getYear())
+        queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getYear()),HotlineAcceptance::getStatDate,dto.getYear())
                 .eq(HotlineAcceptance::getDistrictName,dto.getDistrictName());
         List<HotlineAcceptance> list = this.list(queryWrapper);
         if(CollectionUtil.isEmpty(list))

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

@@ -1,10 +1,13 @@
 package com.cqut.stack.bn.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cqut.stack.bn.pojo.dto.hotlineDailyAcceptance.DateDTO;
 import com.cqut.stack.bn.pojo.dto.workOrder.GetWorkOrderDetailDTO;
 import com.cqut.stack.bn.pojo.entity.WordOrderDetail;
 import com.cqut.stack.bn.dao.WordOrderDetailMapper;
+import com.cqut.stack.bn.pojo.entity.WorkOrderCirculation;
 import com.cqut.stack.bn.service.WordOrderDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -17,7 +20,12 @@ public class WordOrderDetailServiceImpl extends ServiceImpl<WordOrderDetailMappe
 
     @Override
     public WordOrderDetail getWorkOrderDetail(GetWorkOrderDetailDTO dto) {
-        return this.getById(dto.getId());
+        LambdaQueryWrapper<WordOrderDetail> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(WordOrderDetail::getOrderId,dto.getId());
+        List<WordOrderDetail> list = this.list(queryWrapper);
+        if(ObjectUtil.isEmpty(list))
+            return null;
+        return list.get(0);
     }
 
     @Override

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

@@ -1,6 +1,8 @@
 package com.cqut.stack.bn.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cqut.stack.bn.pojo.dto.hotlineDailyAcceptance.DateDTO;
 import com.cqut.stack.bn.pojo.dto.workOrderCirculation.GetWorkOrderCirculationDTO;
 import com.cqut.stack.bn.pojo.entity.WorkOrderCirculation;
@@ -18,7 +20,12 @@ public class WorkOrderCirculationServiceImpl extends ServiceImpl<WorkOrderCircul
 
     @Override
     public WorkOrderCirculation getWorkOrderCirculation(GetWorkOrderCirculationDTO dto) {
-        return this.getById(dto.getId());
+        LambdaQueryWrapper<WorkOrderCirculation> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(WorkOrderCirculation::getOrderId,dto.getId());
+        List<WorkOrderCirculation> list = this.list(queryWrapper);
+        if(ObjectUtil.isEmpty(list))
+            return null;
+        return list.get(0);
     }
 
     @Override

src/main/resources/mapper/AreaTransactionMapper.xml

@@ -44,7 +44,7 @@
         `area_transaction`
         <where>
             <if test="dto.year != null">
-                YEAR(stat_date) = #{dto.year}
+                YEAR(stat_date = #{dto.year}
             </if>
         </where>
         GROUP BY transaction_type