From 694128f7b11bd27c2c7dd3869c3ae50926cb9b6b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 二月 2025 14:37:05 +0800
Subject: [PATCH] 小程序管理员接口
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 23e8f91..699d80c 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
@@ -7,6 +7,8 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
@@ -28,10 +30,13 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -63,6 +68,10 @@
private TCheckAcceptRecordService checkAcceptRecordService;
@Autowired
private TTenantService tenantService;
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private TContractRentTypeService contractRentTypeService;
/**
* 获取轮播图管理列表
*/
@@ -337,9 +346,51 @@
}
@ApiOperation(value = "管理员-我的审批分页列表")
@PostMapping("/listExamine")
- public R examineList(@RequestBody TExamineAppletQuery dto){
+ public R<PageInfo<ExamineVO>> examineList(@RequestBody TExamineAppletQuery dto){
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.fail(401,"登录失效");
+ }
+ SysUser sysUser = sysUserService.selectUserById(loginUser.getUserId());
+ dto.setUserName(sysUser.getUserName());
+ PageInfo<ExamineVO> pageInfo = tenantService.examineList(dto);
+ return R.ok(pageInfo);
+ }
+ @ApiOperation(value = "管理员-审批详情")
+ @GetMapping("/examineDetail")
+ public R<TContractVO> examineDetail(@RequestParam String id){
+ TContractVO res = new TContractVO();
+ TContract contract = contractService.getById(id);
+ BeanUtils.copyProperties(contract,res);
+ res.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,res.getPayType()));
+ res.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,res.getStatus()));
+ TContractRentType contractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, id).one();
+ if (contractRentType!=null){
+ BeanUtils.copyProperties(contractRentType,res);
+ }
+ TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
+ .eq(TContract::getHouseId,contract.getHouseId())
+ .eq(TContract::getStatus, 4)
+ .le(TContract::getStartTime, LocalDateTime.now())
+ .ge(TContract::getEndTime, LocalDateTime.now()));
+ THouse house = houseService.getById(contract.getHouseId());
+ if (oldContract!=null){
+ house.setTenantType(oldContract.getPayType());
+ }
+ res.setHouse(house);
+ List<TBill> list = billService.lambdaQuery()
+ .eq(TBill::getContractId, id)
+ .in(TBill::getPayFeesStatus, Arrays.asList("1,4"))
+ .list();
+ BigDecimal payMoney = new BigDecimal("0");
+ for (TBill tBill : list) {
+ payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
+ }
+ TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
+ res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
+ res.setPayMoney(payMoney);
- return R.ok();
+ return R.ok(res);
}
@ApiOperation(value = "管理员-我的审批-撤销")
@GetMapping("/cancel")
--
Gitblit v1.7.1