From bb102506eacc7224102ac10fd70f443d523e119f Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Mon, 3 Mar 2025 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E7=B1=BB=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E6=8A=A5=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdFeesReimbursableApplyDetailVo.java      |  2 ++
 .../AdFeesReimbursableApplyDto.java           |  2 ++
 .../AdFeesReimbursableApplyService.java       | 22 +++++++++++++++++++
 .../AdFeesReimbursableApplyVo.java            |  3 +++
 4 files changed, 29 insertions(+)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java
index 63cd5f8698..91dc6482e8 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDetailVo.java
@@ -58,4 +58,6 @@ public class AdFeesReimbursableApplyDetailVo extends OaFormCommonVo {
 
     private List<AdFeesReimbursableListDetailsVo> list = new ArrayList<>();
 
+    private Boolean isTravelCharge = false;// 费用类别是否包含差旅费
+    private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用
 }
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java
index 01bbfc38fc..30eed85960 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyDto.java
@@ -105,4 +105,6 @@ public class AdFeesReimbursableApplyDto extends OaFormDto {
 
     private List<AdFeesReimbursableDetailsDto> list = new ArrayList<>();
 
+    private Boolean isTravelCharge = false;// 费用类别是否包含差旅费
+    private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用
 }
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java
index 0960d39d3c..f39e7f580d 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyService.java
@@ -109,6 +109,12 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService<AdFeesRei
         applyVo.setIsBeyondQuotaObj(obj3);
         List<AdFeesReimbursableDetailsVo> list = adFeesReimbursableDetailsService.getUpdateInit(sid);
         list.removeAll(Collections.singleton(null));
+        if (StringUtils.isNotBlank(apply.getIsSpecialSeatKey())) {
+            applyVo.setIsTravelCharge(true);
+        }
+        if (StringUtils.isNotBlank(apply.getIsExpensiveKey())) {
+            applyVo.setIsBanquetExpense(true);
+        }
         if (!list.isEmpty()) {
             list.stream().forEach(details -> {
                 FormCommon objv1 = FormCommon.of(details.getBelongsDeptSid(), details.getBelongsDept());
@@ -131,6 +137,16 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService<AdFeesRei
     public ResultBean<String> saveOrUpdateDto(AdFeesReimbursableApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        if (!dto.getIsTravelCharge()) {
+            dto.setIsSpecialSeatKey(null);
+            dto.setIsSpecialSeatValue(null);
+            dto.setDepartureTime(null);
+            dto.setReturnTime(null);
+        }
+        if (!dto.getIsBanquetExpense()) {
+            dto.setIsExpensiveKey(null);
+            dto.setIsExpensiveValue(null);
+        }
         if (StringUtils.isBlank(sid)) {
             // 新建操作
             AdFeesReimbursableApply entity = new AdFeesReimbursableApply();
@@ -185,6 +201,12 @@ public class AdFeesReimbursableApplyService extends MybatisBaseService<AdFeesRei
         if (applyDetailVo == null) {
             return rb.setMsg("该申请不存在");
         }
+        if (StringUtils.isNotBlank(applyDetailVo.getIsSpecialSeatValue())) {
+            applyDetailVo.setIsTravelCharge(true);
+        }
+        if (StringUtils.isNotBlank(applyDetailVo.getIsExpensiveValue())) {
+            applyDetailVo.setIsBanquetExpense(true);
+        }
         List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
         List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
         applyDetailVo.setFiles(files);
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java
index 0968b819c6..fd9c4338de 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeesreimbursableapply/AdFeesReimbursableApplyVo.java
@@ -95,4 +95,7 @@ public class AdFeesReimbursableApplyVo {
     @ApiModelProperty("流程实例id")
     private String procInsId;
 
+
+    private Boolean isTravelCharge = false;// 费用类别是否包含差旅费
+    private Boolean isBanquetExpense = false;// 费用类别是否包含商务宴请费用
 }