From 1485618c2fe3f71a847d744ae9e20ff5714c6120 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Wed, 4 Dec 2024 18:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RequestReportController.java | 11 ++++++++- .../controller/WorkReportController.java | 23 +++++++++++++++++-- .../mapper/holiday/RequestReportMapper.xml | 3 +++ .../mapper/holiday/WorkReportMapper.xml | 3 +++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/RequestReportController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/RequestReportController.java index 6bf226f..c4718ca 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/RequestReportController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/RequestReportController.java @@ -107,7 +107,7 @@ public class RequestReportController extends BaseController { List list = service.getWorkReportList(bean); if (list.size()>0){ Sheet departmentSheet1 = exporter.createSheet(s); - List departmentHeaders1 = Arrays.asList("序号", "姓名", "职务", "类型", "外出时间", "拟返回时间", "地点", "事由", "是否请示领导同意", "代理主持工作人员", "备注"); + List departmentHeaders1 = Arrays.asList("序号", "姓名", "职务", "类型", "外出时间", "拟返回时间", "地点", "事由", "是否请示领导同意", "代理主持工作人员", "备注","审批状态"); exporter.addHeaderRow(departmentSheet1, departmentHeaders1); List> departmentData1 = new ArrayList<>(); for (int i = 0; i < list.size(); i++){ @@ -123,6 +123,15 @@ public class RequestReportController extends BaseController { map.put("是否请示领导同意",list.get(i).getIsAgree()); map.put("代理主持工作人员",list.get(i).getHostUserId()); map.put("备注",list.get(i).getRemark()); + if (StringHelper.isNotEmpty(list.get(i).getExamineStatus())){ + if ("1".equals(list.get(i).getExamineStatus())){ + map.put("审批状态","已通过"); + } else if ("0".equals(list.get(i).getExamineStatus())){ + map.put("审批状态","待审核"); + } + } else { + map.put("审批状态",""); + } departmentData1.add(map); } exporter.addDataRows(departmentSheet1, departmentData1,departmentHeaders1); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java index 6ab6337..72dcda5 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/WorkReportController.java @@ -1,5 +1,6 @@ package com.bonus.system.holiday.controller; +import com.bonus.common.core.utils.StringHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.MultiSheetExcelExporter; import com.bonus.common.core.web.controller.BaseController; @@ -165,7 +166,7 @@ public class WorkReportController extends BaseController { // 创建第二个sheet：部门信息 Sheet departmentSheet = exporter.createSheet("轮休人员"); - List departmentHeaders = Arrays.asList("序号", "姓名", "职务", "所属部门", "申请时间", "开始时间", "结束时间", "时长（天）"); + List departmentHeaders = Arrays.asList("序号", "姓名", "职务", "所属部门", "申请时间", "开始时间", "结束时间", "时长（天）","审批状态"); exporter.addHeaderRow(departmentSheet, departmentHeaders); List> departmentData = new ArrayList<>(); for (int i = 0; i < listLeave.size(); i++) { @@ -178,13 +179,22 @@ public class WorkReportController extends BaseController { map.put("开始时间",listLeave.get(i).getStartDate()); map.put("结束时间",listLeave.get(i).getEndDate()); map.put("时长（天）",listLeave.get(i).getLeaveDuration()); + if (StringHelper.isNotEmpty(listLeave.get(i).getExamineStatus())){ + if ("1".equals(listLeave.get(i).getExamineStatus())){ + map.put("审批状态","已通过"); + } else if ("0".equals(listLeave.get(i).getExamineStatus())){ + map.put("审批状态","待审核"); + } + }else { + map.put("审批状态",""); + } departmentData.add(map); } exporter.addDataRows(departmentSheet, departmentData, departmentHeaders); // 创建第3个sheet：部门信息 Sheet departmentSheet3 = exporter.createSheet("临时外出人员"); - List departmentHeaders3 = Arrays.asList("序号", "姓名", "职务", "所属部门", "申请时间", "开始时间", "结束时间", "时长（天）"); + List departmentHeaders3 = Arrays.asList("序号", "姓名", "职务", "所属部门", "申请时间", "开始时间", "结束时间", "时长（天）","审批状态"); exporter.addHeaderRow(departmentSheet3, departmentHeaders3); List> departmentData3 = new ArrayList<>(); for (int i = 0; i < listOut.size(); i++) { @@ -197,6 +207,15 @@ public class WorkReportController extends BaseController { map.put("开始时间",listOut.get(i).getStartDate()); map.put("结束时间",listOut.get(i).getEndDate()); map.put("时长（天）",listOut.get(i).getLeaveDuration()); + if (StringHelper.isNotEmpty(listOut.get(i).getExamineStatus())){ + if ("1".equals(listOut.get(i).getExamineStatus())){ + map.put("审批状态","已通过"); + } else if ("0".equals(listOut.get(i).getExamineStatus())){ + map.put("审批状态","待审核"); + } + }else { + map.put("审批状态",""); + } departmentData3.add(map); } exporter.addDataRows(departmentSheet3, departmentData3,departmentHeaders3); diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/RequestReportMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/RequestReportMapper.xml index c3f9539..0890127 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/RequestReportMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/RequestReportMapper.xml @@ -176,6 +176,9 @@ and la.user_name like concat('%',#{userName},'%') + + and la.examine_status = #{examineStatus} + ) a where 1=1 diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/WorkReportMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/WorkReportMapper.xml index 7efa132..1a687c4 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/WorkReportMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/WorkReportMapper.xml @@ -218,6 +218,9 @@ and la.user_name like concat('%',#{userName},'%') + + + and la.examine_status = #{examineStatus} AND la.org_id = #{orgId}