From 958959a91e3e1811fd9cc2c1af9e5e8cebf2a7dd Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 29 Nov 2021 12:08:58 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=AF=BC=E5=87=BA=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=A8=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/base/controller/JeroController.java    |  1 +
 .../impl/PayMeetingSituationServiceImpl.java      | 12 ++++++++++++
 .../meeting/vo/excel/CommitteeSituationExcel.java |  2 +-
 .../vo/excel/InternationalSituationExcel.java     |  2 +-
 .../jero/meeting/vo/excel/SituationBaseExcel.java | 15 +++++++++++++++
 .../com/jero/meeting/vo/excel/SituationExcel.java |  2 +-
 .../meeting/vo/excel/StandardsSituationExcel.java |  2 +-
 .../vo/excel/WorkingGroupSituationExcel.java      |  3 ++-
 8 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
index ea2afb12..8906ce09 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
@@ -95,6 +95,7 @@ public class JeroController<T, S extends IService<T>> {
         ExportParams  exportParams=new ExportParams(title, title);
         // 导出xlsx
         exportParams.setType(ExcelType.XSSF);
+        exportParams.setImageBasePath(upLoadPath);
         mv.addObject(NormalExcelConstants.PARAMS,exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, object);
         return mv;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 2ea06f7e..7be8b115 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -48,6 +48,8 @@ import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.meeting.valid.group.*;
 import com.jero.meeting.vo.*;
 import com.jero.meeting.vo.excel.*;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.payment.entity.PayPaymentRecord;
@@ -64,8 +66,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -122,6 +126,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private IPayIncomeContractService payIncomeContractService;
     @Resource
     private RolePermissionService rolePermissionService;
+    @Resource
+    private IOSSFileService ossFileService;
+
 
     private static final String[] CAN_MODIFY_LIST = new String[]{"arrivalTime", "departureTime", "checkInHotel"};
 
@@ -1344,6 +1351,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
             PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
             meetingSituation.setCompanyName(companyManagement.getCompanyName());
+            String checkFile = meetingSituation.getCheckFile();
+            if (StringUtils.isNotBlank(checkFile)) {
+                OSSFile ossFile = ossFileService.getById(checkFile);
+                meetingSituation.setCheckFile(ossFile.getUrl());
+            }
             switch (meetingType1) {
                 case MeetingCommon.STANDARD_MEETING:
                     //保存数据
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
index df951d87..b76fb4ea 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
@@ -9,7 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  * @date 2021-09-22 15:39
  */
 @Data
-public class CommitteeSituationExcel {
+public class CommitteeSituationExcel extends SituationBaseExcel {
 
     /**会议id*/
     @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
index 83d319cb..bf590429 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
@@ -9,7 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  * @date 2021-09-22 15:39
  */
 @Data
-public class InternationalSituationExcel {
+public class InternationalSituationExcel extends SituationBaseExcel {
 
     /**会议id*/
     @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java
new file mode 100644
index 00000000..dacea60c
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java
@@ -0,0 +1,15 @@
+package com.jero.meeting.vo.excel;
+
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @author liJiaRao
+ * @date 2021-11-29 10:56
+ */
+@Data
+public class SituationBaseExcel {
+    /**签到文件*/
+    @Excel(name = "手动签到", type = 2 ,width = 40 , height = 20,imageType = 3)
+    private String checkFile;
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
index 8becbe1b..a4e06806 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
@@ -9,7 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  * @date 2021-09-22 15:39
  */
 @Data
-public class SituationExcel {
+public class SituationExcel  extends SituationBaseExcel{
 
     /**会议id*/
     @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
index 408a537e..97dee4d9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
@@ -9,7 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  * @date 2021-09-22 15:40
  */
 @Data
-public class StandardsSituationExcel {
+public class StandardsSituationExcel extends SituationBaseExcel {
 
     /**会议id*/
     @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
index 3ea28903..3d1aa14e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
@@ -2,6 +2,7 @@ package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
@@ -9,7 +10,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  * @date 2021-09-22 15:40
  */
 @Data
-public class WorkingGroupSituationExcel {
+public class WorkingGroupSituationExcel extends SituationBaseExcel {
 
     /**会议id*/
     @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")