From 6dc410ec2a343cac3efce1b2483c75f9d7235062 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 15:27:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 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 a8bcb1d..6e8189f 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
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
@@ -15,23 +14,53 @@
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.bo.ProcessTaskListBO;
-import com.ruoyi.system.dto.TBillDto;
-import com.ruoyi.system.dto.TInvoiceDTO;
-import com.ruoyi.system.model.*;
-import com.ruoyi.system.query.*;
-import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.*;
+import com.ruoyi.system.model.TBanner;
+import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TCheckAcceptRecord;
+import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.TContractRentType;
+import com.ruoyi.system.model.TFaultRepairMessage;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.model.TTenant;
+import com.ruoyi.system.query.TBannerQuery;
+import com.ruoyi.system.query.TBillAppletQuery;
+import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery;
+import com.ruoyi.system.query.TExamineAppletQuery;
+import com.ruoyi.system.query.TFaultRepairMessageAppletQuery;
+import com.ruoyi.system.query.TTenantAppletQuery;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.StateProcessTemplateService;
+import com.ruoyi.system.service.TBannerService;
+import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TCheckAcceptRecordService;
+import com.ruoyi.system.service.TContractRentTypeService;
+import com.ruoyi.system.service.TContractService;
+import com.ruoyi.system.service.TFaultRepairMessageService;
+import com.ruoyi.system.service.THouseService;
+import com.ruoyi.system.service.TTenantService;
+import com.ruoyi.system.vo.ExamineVO;
+import com.ruoyi.system.vo.MyHouseVO;
+import com.ruoyi.system.vo.MyToDoVO;
+import com.ruoyi.system.vo.PayListVO;
+import com.ruoyi.system.vo.ProcessTaskListVO;
+import com.ruoyi.system.vo.TBillVO;
+import com.ruoyi.system.vo.TCheckAcceptRecordVO;
+import com.ruoyi.system.vo.TContractVO;
+import com.ruoyi.system.vo.TFaultRepairMessageVO;
+import com.ruoyi.system.vo.TenantVO;
import com.ruoyi.web.controller.tool.MyFileUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.parser.Token;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
@@ -258,6 +287,8 @@
@ApiOperation(value = "管理员-房屋验收单列表")
@PostMapping(value = "/admin/houseCheck")
public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) {
+ LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
+ query.setSysUserId(loginUserApplet.getUserId());
return R.ok(checkAcceptRecordService.pageListApplet(query));
}
@@ -307,6 +338,7 @@
tBill.setPayFeesStatus("1");
tBill.setBillType("4");
tBill.setOverDays(0);
+ tBill.setBusinessDeptId(contract.getBusinessDeptId());
tBill.setOutstandingMoney(dto.getCheckMoney());
billService.save(tBill);
return R.ok();
--
Gitblit v1.7.1