From ed42efdb01c5f2304bc12b63d8d2e0a26accc04e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 19 二月 2025 09:46:06 +0800
Subject: [PATCH] 报修修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 9f3d4e5..d81c565 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -15,11 +15,10 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TBannerQuery;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery;
+import com.ruoyi.system.query.TCheckAcceptRecordQuery;
import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.MyHouseVO;
-import com.ruoyi.system.vo.MyToDoVO;
-import com.ruoyi.system.vo.PayListVO;
-import com.ruoyi.system.vo.TBillVO;
+import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.parser.Token;
@@ -27,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -57,7 +57,8 @@
@Autowired
private THouseService houseService;
-
+ @Autowired
+ private TCheckAcceptRecordService checkAcceptRecordService;
/**
* 获取轮播图管理列表
*/
@@ -102,16 +103,19 @@
List<TContract> contractList = contractService.lambdaQuery().eq(TContract::getTenantId, loginUserApplet.getUserId())
.eq(TContract::getStatus, 4).list();
List<THouse> houseList = houseService.list();
- List<TBill> bills = billService.lambdaQuery().eq(TBill::getPayFeesStatus,3).orderByDesc(TBill::getPayFeesTime).list();
+ List<TBill> bills = billService.lambdaQuery().orderByDesc(TBill::getPayableFeesTime).list();
for (TContract contract : contractList) {
THouse tHouse = houseList.stream().filter(e -> e.getId().equals(contract.getHouseId())).findFirst().orElse(null);
- TBill bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
+ TBill bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())&&e.getPayFeesStatus().equals("3")).findFirst().orElse(null);
+ if (bill==null){
+ bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
+ }
if (tHouse!=null&& bill!=null){
MyHouseVO myToDoVO = new MyHouseVO();
myToDoVO.setHouseAddress(tHouse.getHouseAddress());
myToDoVO.setMonthRent(contract.getMonthRent());
myToDoVO.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType()));
- myToDoVO.setMonth(bill.getPayFeesTime().getMonth()+"");
+ myToDoVO.setMonth(bill.getPayFeesTime()==null?bill.getPayableFeesTime().getMonth()+"月":bill.getPayFeesTime().getMonth()+"月");
myToDoVO.setHouseArea(tHouse.getHouseArea());
myToDoVO.setHouseType(tHouse.getHouseType());
myToDoVO.setEndTime(DateUtils.localDateTimeToStringYear(contract.getEndTime()));
@@ -121,6 +125,9 @@
List<TBill> billList = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).collect(Collectors.toList());
List<PayListVO> payList = new ArrayList<>();
for (TBill tBill : billList) {
+ if (tBill.getPayFeesTime()==null){
+ continue;
+ }
PayListVO payListVO = new PayListVO();
payListVO.setPayFeesTime(DateUtils.localDateTimeToStringYear(tBill.getPayFeesTime()));
payListVO.setPayFeesMoney("-"+tBill.getPayFeesMoney()+"元");
@@ -157,6 +164,39 @@
return R.ok(myToDoVO);
}
+ /**
+ * 获取验收记录管理列表
+ */
+ @ApiOperation(value = "管理员-房屋验收单列表")
+ @PostMapping(value = "/admin/houseCheck")
+ public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) {
+ return R.ok(checkAcceptRecordService.pageListApplet(query));
+ }
+ /**
+ * 查看验收记录详情
+ */
+ @ApiOperation(value = "管理员-查看验收记录详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TCheckAcceptRecordVO> getDetailById(@RequestParam String id) {
+ TCheckAcceptRecord checkAcceptRecord = checkAcceptRecordService.getById(id);
+ checkAcceptRecord.setCleanSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getCleanSituation()));
+ checkAcceptRecord.setOverallSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getOverallSituation()));
+ checkAcceptRecord.setDeviceSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getDeviceSituation()));
+ checkAcceptRecord.setFurnitureSituation(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CHECK_SITUATION,checkAcceptRecord.getFurnitureSituation()));
+ TCheckAcceptRecordVO checkAcceptRecordVO = new TCheckAcceptRecordVO();
+ BeanUtils.copyProperties(checkAcceptRecord, checkAcceptRecordVO);
+ // 查询合同信息
+ checkAcceptRecordVO.setContract(contractService.getById(checkAcceptRecord.getContractId()));
+ // 查询房屋信息
+ checkAcceptRecordVO.setHouse(houseService.getById(checkAcceptRecord.getHouseId()));
+ return R.ok(checkAcceptRecordVO);
+ }
+ @ApiOperation(value = "管理员-新增验收")
+ @GetMapping(value = "/addRecord")
+ public R<TCheckAcceptRecordVO> getDetailById(@Validated @RequestBody TCheckAcceptRecord dto) {
+
+ return R.ok();
+ }
}
--
Gitblit v1.7.1