Преглед изворни кода

宿管值班管理,解决查询不出数据的问题

dzx пре 1 година
родитељ
комит
eb87d4b842

+ 1 - 0
src/main/java/com/xjrsoft/module/room/controller/RoomValueWeekController.java

@@ -51,6 +51,7 @@ public class RoomValueWeekController {
     @ApiOperation(value="宿管值班管理列表(分页)")
     @SaCheckPermission("roomvalueweek:detail")
     public RT<PageOutput<RoomValueWeekPageVo>> page(@Valid RoomValueWeekPageDto dto){
+        roomValueWeekService.updateNumberPeople();
         PageOutput<RoomValueWeekPageVo> pageOutput = roomValueWeekService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         return RT.ok(pageOutput);
     }

+ 4 - 2
src/main/java/com/xjrsoft/module/room/service/impl/RoomValueWeekServiceImpl.java

@@ -24,8 +24,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -128,9 +130,9 @@ public class RoomValueWeekServiceImpl extends MPJBaseServiceImpl<RoomValueWeekMa
     @Override
     public PageOutput<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto) {
         List<RoomValueWeekItemVo> itemList = roomValueWeekRoomValueWeekItemMapper.getItemList(dto);
-        List<Long> weekIds = new ArrayList<>();
+        Set<Long> weekIds = new HashSet<>();
         for (RoomValueWeekItemVo itemVo : itemList) {
-            weekIds.add(itemVo.getId());
+            weekIds.add(itemVo.getRoomValueWeekId());
         }
 
         IPage<RoomValueWeek> roomValueWeekIPage = roomValueWeekRoomValueWeekMapper.selectPage(ConventPage.getPage(dto),

+ 4 - 2
src/main/java/com/xjrsoft/module/room/vo/RoomValueWeekPageVo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
+
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -44,14 +46,14 @@ public class RoomValueWeekPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("开始时间")
     @ApiModelProperty("开始时间")
-    private Date startTime;
+    private LocalDate startTime;
     /**
     * 结束时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("结束时间")
     @ApiModelProperty("结束时间")
-    private Date endTime;
+    private LocalDate endTime;
 
     /**
      * 结束时间

+ 0 - 1
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1901,7 +1901,6 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
-}
     /**
      * 查寝记录
      * @throws IOException