From 6f97a42dccaedb7a8950feac205080e63d8be439 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 二月 2025 14:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 9ea04c2..cc86304 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;
@@ -13,12 +14,9 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
-
+import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;
@@ -60,9 +58,9 @@
* 获取维修物品二级结构
*/
@ApiOperation(value = "获取维修物品二级结构")
- @PostMapping(value = "/getItemList")
- public R<List<TItemTypeVO>> getItemList() {
- List<TItemTypeVO> itemTypes = itemTypeService.getItemList();
+ @GetMapping(value = "/getItemList")
+ public R<List<TItemTypeVO>> getItemList(@RequestParam(required = false) String itemName) {
+ List<TItemTypeVO> itemTypes = itemTypeService.getItemList(itemName);
List<TItem> items = itemService.list();
itemTypes.forEach(itemType -> {
itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId())).collect(Collectors.toList()));
@@ -91,8 +89,7 @@
@PostMapping(value = "/getConcatByTenantId")
public R<List<TContract>> getConcatByTenantId() {
-// Long userId = tokenService.getLoginUser().getUserId();
- String tenantId = "1881967035070177281";
+ String tenantId = tokenService.getLoginUserApplet().getUserId();
// 查询合同信息
List<TContract> list = contractService.list(Wrappers.lambdaQuery(TContract.class)
.eq(TContract::getTenantId, tenantId)
@@ -105,6 +102,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);
}
@@ -115,6 +113,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