From 04d2f146d27f9e4dbfb52d71b3092db764629167 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 13:47:52 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
index 3936e87..fae3037 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
@@ -19,6 +20,7 @@
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;
@@ -104,6 +106,7 @@
.in(THouse::getId, houseIds));
list.forEach(item -> {
item.setHouseName(houseList.stream().filter(house -> house.getId().equals(item.getHouseId())).findFirst().orElse(new THouse()).getHouseName());
+ item.setHouseAddress(houseList.stream().filter(house -> house.getId().equals(item.getHouseId())).findFirst().orElse(new THouse()).getHouseAddress());
});
return R.ok(list);
}
@@ -114,6 +117,12 @@
@ApiOperation(value = "添加报修信息")
@PostMapping(value = "/addFault")
public R<String> addFault(@RequestBody TFaultRepairMessageDTO dto) {
+ dto.setTenantId(tokenService.getLoginUserApplet().getUserId());
+ LocalDate now = LocalDate.now();
+ String replace = (now + "").replace("-", "");
+ int size = tFaultRepairMessageService.list(new LambdaQueryWrapper<TFaultRepairMessage>()
+ .likeRight(TFaultRepairMessage::getCreateTime, LocalDate.now())).size();
+ dto.setCode(replace.substring(2)+String.format("%03d", size+1));
tFaultRepairMessageService.save(dto);
return R.ok();
}
--
Gitblit v1.7.1