行政类费用报销

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;// 费用类别是否包含商务宴请费用
 }

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;// 费用类别是否包含商务宴请费用
 }

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);

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;// 费用类别是否包含商务宴请费用
 }