Merge remote-tracking branch 'origin/master'

xuhy

2025-02-20 b9c032d96e236d9c45ca748be63a327755b82a06

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java

@@ -3,20 +3,19 @@

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;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TInvoiceDTO;
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.query.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
@@ -58,10 +57,12 @@
    private TBillService billService;
    @Autowired
    private THouseService houseService;

    @Autowired
    private TFaultRepairMessageService tFaultRepairMessageService;
    @Autowired
    private TCheckAcceptRecordService checkAcceptRecordService;

    @Autowired
    private TTenantService tenantService;
    /**
     * 获取轮播图管理列表
     */
@@ -249,7 +250,7 @@

    @ApiOperation(value = "管理员-新增验收")
    @GetMapping(value = "/addRecord")
    public R<TCheckAcceptRecordVO> getDetailById(@Validated @RequestBody TCheckAcceptRecord dto) {
    public R<TCheckAcceptRecordVO> addRecord(@Validated @RequestBody TCheckAcceptRecord dto) {
        dto.setAcceptanceTime(LocalDateTime.now());
        dto.setCheckTime(LocalDateTime.now());
        LocalDate now = LocalDate.now();
@@ -261,6 +262,98 @@
        checkAcceptRecordService.save(dto);
        return R.ok();
    }
    /**
     * 获取报修管理列表
     */
    @ApiOperation(value = "管理员-房屋维修分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TFaultRepairMessageVO>> pageList(@RequestBody TFaultRepairMessageAppletQuery query) {
        return R.ok(tFaultRepairMessageService.pageListApplet(query));
    }
    /**
     * 查看报修详情
     */
    @ApiOperation(value = "管理员-房屋维修查看详情")
    @GetMapping(value = "/getDetailByIdRepair")
    public R<TFaultRepairMessageVO> getDetailByIdRepair(@RequestParam String id) {
        TFaultRepairMessageVO faultRepairMessageVO = tFaultRepairMessageService.getDetailById(id);
        return R.ok(faultRepairMessageVO);
    }

    /**
     * 处理维修
     */
    @Log(title = "报修信息-处理维修", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "管理员-维修处理")
    @PostMapping(value = "/handle")
    public R<Boolean> handle(@Validated @RequestBody TFaultRepairMessage faultRepairMessage) {
        faultRepairMessage.setStatus(2);
        return R.ok(tFaultRepairMessageService.updateById(faultRepairMessage));
    }

    /**
     * 获取租户管理列表
     */
    @ApiOperation(value = "获取租户分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TenantVO>> pageList(@RequestBody TTenantAppletQuery query) {
        return R.ok(tenantService.pageListApplet(query));
    }
    /**
     * 租户详情-租房信息
     */
    @ApiOperation(value = "租户详情-租房信息列表")
    @GetMapping(value = "/listHouse")
    public R<List<THouse>> listHouse(@RequestParam String id) {
        List<THouse> res = tenantService.listHouse(id);
        return R.ok(res);
    }
    /**
     * 租户详情-租房信息
     */
    @ApiOperation(value = "租户详情-合同列表")
    @GetMapping(value = "/listContract")
    public R<List<TContract>> listContract(@RequestParam String id) {
        List<TContract> res = tenantService.listContract(id);
        return R.ok(res);
    }
    @ApiOperation(value = "租户详情-缴费账单列表")
    @PostMapping("/listBill")
    public R<PageInfo<TBillVO>> listBill(@RequestBody TBillAppletQuery query){
        PageInfo<TBillVO> pageInfo = tenantService.listBill(query);
        return R.ok(pageInfo);
    }
    @ApiOperation(value = "租户详情-缴费账单-账单详情")
    @PostMapping("/billDetail")
    public R<TBillVO> billDetail(String id){
        TBillVO res = new TBillVO();
        TBill bill = billService.getById(id);
        BeanUtils.copyProperties(bill, res);
        TContract contract = contractService.getById(bill.getContractId());
        THouse tHouse = houseService.getById(contract.getHouseId());
        res.setHouse(tHouse);
        return R.ok(res);
    }
    @ApiOperation(value = "管理员-我的审批分页列表")
    @PostMapping("/listExamine")
    public R examineList(@RequestBody TExamineAppletQuery dto){

        return R.ok();
    }
    @ApiOperation(value = "管理员-我的审批-撤销")
    @GetMapping("/cancel")
    public R cancel(@RequestParam String id){
        return R.ok();
    }
    @ApiOperation(value = "管理员-我的审批-审批")
    @GetMapping("/examine")
    public R examine(@RequestParam String id){

        return R.ok();
    }



}