From 0d4fb3a18c59b89748a9d32edca74201536ee93f Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 17 二月 2025 15:18:11 +0800 Subject: [PATCH] 租户详情 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 3 - ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 2 + ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 76 ++++++++++++++++++++++++++++++++++--- ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 4 ++ 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java index be95875..5816bc3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java @@ -10,6 +10,7 @@ import com.ruoyi.system.model.TBill; import com.ruoyi.system.query.TBillQuery; import com.ruoyi.system.service.TBillService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -27,6 +28,7 @@ * @author xiaochen * @since 2025-01-17 */ +@Api(tags = "账单管理") @RestController @RequestMapping("/t-bill") public class TBillController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java index c92fc37..979451b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java @@ -228,8 +228,7 @@ @PreAuthorize("@ss.hasPermi('system:contract:delete')") @DeleteMapping(value = "/deleteContractByIds") - public R<Boolean> deleteContractByIds - (@RequestParam String ids) { + public R<Boolean> deleteContractByIds(@RequestParam String ids) { if (StringUtils.isNotEmpty(ids)){ contractService.removeBatchByIds(Arrays.asList(ids.split(","))); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java index c9f0d94..a9fdcb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java @@ -1,6 +1,9 @@ package com.ruoyi.web.controller.api; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +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; @@ -9,20 +12,29 @@ import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.WebUtils; import com.ruoyi.system.dto.TTenantDTO; +import com.ruoyi.system.export.ContractExport; import com.ruoyi.system.model.TContract; import com.ruoyi.system.model.TTenant; import com.ruoyi.system.query.TContractQuery; import com.ruoyi.system.query.TTenantQuery; +import com.ruoyi.system.service.TContractService; import com.ruoyi.system.service.TTenantService; import com.ruoyi.system.vo.TenantVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.ArrayList; import java.util.List; /** @@ -39,9 +51,11 @@ public class TTenantController { private final TTenantService tenantService; + private final TContractService contractService; @Autowired - public TTenantController(TTenantService tenantService) { + public TTenantController(TTenantService tenantService, TContractService contractService) { this.tenantService = tenantService; + this.contractService = contractService; } /** @@ -95,12 +109,12 @@ return R.ok(tenant); } -// @PreAuthorize("@ss.hasPermi('system:contract:list')") -// @ApiOperation(value = "获取合同分页列表") -// @PostMapping(value = "/contractList") -// public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) { -// return R.ok(contractService.contractList(query)); -// } + @PreAuthorize("@ss.hasPermi('system:contract:list')") + @ApiOperation(value = "获取合同分页列表") + @GetMapping(value = "/contractListByTenantId") + public R<List<TContract>> contractListByTenantId(@RequestParam String tenantId) { + return R.ok(contractService.list(Wrappers.lambdaQuery(TContract.class).eq(TContract::getTenantId, tenantId))); + } /** * 删除租户 @@ -124,5 +138,53 @@ return R.ok(tenantService.removeByIds(ids)); } + /** + * 导出 + */ + @ApiOperation(value = "导出") + @PreAuthorize("@ss.hasPermi('system:contract:export')") + @Log(title = "导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void exportOpticalInspection(@Validated @RequestBody TContractQuery query) + { + List<ContractExport> contractExports = new ArrayList<>(); + List<TContract> exportList = contractService.list(Wrappers.lambdaQuery(TContract.class).eq(TContract::getTenantId, query.getTenantId())); + for (TContract contract : exportList) { + ContractExport contractExport = new ContractExport(); + contractExport.setContractNumber(contract.getContractNumber()); + contractExport.setContractName(contract.getContractName()); + contractExport.setPartyOneName(contract.getPartyOneName()); + contractExport.setPartyTwoName(contract.getPartyTwoName()); + contractExport.setCreate_time(contract.getCreateTime()); + contractExport.setStartTime(contract.getStartTime()); + contractExport.setEndTime(contract.getEndTime()); + contractExport.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType())); + contractExport.setDeposit(contract.getDeposit()+""); + contractExport.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,contract.getStatus())); + } + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ContractExport.class, contractExports); + HttpServletResponse response = WebUtils.response(); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + ServletOutputStream outputStream = null; + try { + String fileName = URLEncoder.encode("合同列表.xls", "utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + response.setHeader("Pragma", "no-cache"); + response.setHeader("Cache-Control", "no-cache"); + outputStream = response.getOutputStream(); + workbook.write(outputStream); + } catch (IOException e) { + e.printStackTrace(); + System.err.println("合同列表信息导出失败"); + } finally { + try { + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java index 52031d9..b12fbca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.List; @Data @@ -20,4 +21,7 @@ private Integer status; @ApiModelProperty(value = "选中的行") private List<String> ids; + @NotBlank(message = "租户id不可为空") + @ApiModelProperty(value = "租户id") + private String tenantId; } -- Gitblit v1.7.1