补充提交

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyitemsround/ElderlyItemsRoundBatchSaveReqVO.java

@@ -2,12 +2,16 @@ package cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 长者巡房项目批量新增 Request VO")
 @Data
 public class ElderlyItemsRoundBatchSaveReqVO {
@@ -29,6 +33,10 @@ public class ElderlyItemsRoundBatchSaveReqVO {
     @Schema(description = "房间id", example = "1")
     private Long roomId;
 
+    @Schema(description = "巡房时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime roundTime;
+
     @Schema(description = "巡视记录明细", requiredMode = Schema.RequiredMode.REQUIRED)
     @Valid
     @NotEmpty(message = "records 不能为空")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyItemsRoundServiceImpl.java

@@ -82,6 +82,7 @@ public class ElderlyItemsRoundServiceImpl implements ElderlyItemsRoundService {
             record.setItems(recordReq.getItems());
             record.setVoice(recordReq.getVoice());
             record.setRemark(recordReq.getRemark());
+            record.setRoundTime(reqVO.getRoundTime());
             insertList.add(record);
         }
         return elderlyItemsRoundMapper.insertBatch(insertList);

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyItemsRoundMapper.xml

@@ -52,9 +52,11 @@
         SELECT
             eir.*,
             ei.elder_name AS elderName,
-            room.room_name AS roomName
+            CONCAT(build.build_name,'-',floor.floor_name,'-',room.room_name) AS roomName
         FROM elderly_items_round eir
         LEFT JOIN elderly_info ei ON ei.id = eir.elder_id
+        LEFT JOIN org_build build ON build.id = ei.build_id
+        LEFT JOIN org_build_floor floor ON floor.id = ei.floor_id
         LEFT JOIN org_build_room room ON room.id = ei.room_id
         WHERE eir.id = #{id}
     </select>