From 6a604532176c698c5b0c79810184e6b01ec6ec56 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 11 Jan 2024 10:26:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7/=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/TmTask.java | 12 ++++++++++ .../sgzb/app/controller/TmTaskController.java | 23 +++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java index 3588bc9c..061ae696 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.base.api.domain; import com.alibaba.fastjson2.annotation.JSONField; +import com.bonus.sgzb.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -54,6 +55,7 @@ public class TmTask implements Serializable { * 编号 */ @ApiModelProperty(value="编号") + @Excel(name = "领料单号",sort = 1) private String code; /** @@ -78,6 +80,7 @@ public class TmTask implements Serializable { * 工程名称 */ @ApiModelProperty(value="工程名称") + @Excel(name = "领料工程",sort = 3) private String proName; /** @@ -106,6 +109,7 @@ public class TmTask implements Serializable { * 备注 */ @ApiModelProperty(value="备注") + @Excel(name = "备注",sort = 11) private String remark; /** @@ -151,6 +155,7 @@ public class TmTask implements Serializable { @ApiModelProperty(value="往来单位id") private Long unitId; @ApiModelProperty(value="往来单位") + @Excel(name = "领料单位",sort = 2) private String unitName; @ApiModelProperty(value="工程id") @@ -166,27 +171,34 @@ public class TmTask implements Serializable { @ApiModelProperty(value="协议编号") + @Excel(name = "协议号",sort = 4) private String agreementCode; @ApiModelProperty(value="领料人") + @Excel(name = "领料人",sort = 5) private String leasePerson; @ApiModelProperty(value="领料人手机号") + @Excel(name = "联系电话",sort = 6) private String leasePhone; @ApiModelProperty(value="申请人") + @Excel(name = "申请人",sort = 7) private String applyFor; @ApiModelProperty(value="任务状态") + @Excel(name = "任务状态",sort = 9) private String taskName; @ApiModelProperty(value="审批状态id") private String examineStatusId; @ApiModelProperty(value="审批状态的备注") + @Excel(name = "审批结果",sort = 10) private String examineStatus; @ApiModelProperty(value="创建时间") + @Excel(name = "申请时间",sort = 8) private String createTimes; @ApiModelProperty(value="更新时间") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 729152e4..47e4dadf 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -8,24 +8,22 @@ import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.TmTask; -import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; +import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.common.security.annotation.Logical; -import com.bonus.sgzb.common.security.annotation.RequiresPermissions; -import com.bonus.sgzb.common.security.annotation.RequiresRoles; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; -import java.util.Set; /** * 任务表(tm_task)表控制层 @@ -284,6 +282,21 @@ public class TmTaskController extends BaseController { return AjaxResult.success(getDataTable(leaseAuditList)); } + /** + * 领料申请导出 + * 注意：备注字段到时要换 + */ + @ApiOperation("领料申请导出") + @Log(title = "领料申请导出", businessType = BusinessType.EXPORT) + @GetMapping("/applyExport") + public void applyExport(HttpServletResponse response, TmTask task) { + startPage(); + List leaseAuditList = tmTaskService.getLeaseAuditList(task); + ExcelUtil util = new ExcelUtil(TmTask.class); + util.exportExcel(response, leaseAuditList, "领料申请数据"); + } + + /** * 查询机具领料审核列表 - app *