From 7b1f94a7ab01c2eaefa956f0b80a44d105d9bf46 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Feb 2025 10:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/oa/api/AdOffSpaceApplyRest.java | 2 +- .../AdExpatriatesHomeApplyService.java | 4 +- .../biz/adfeteapply/AdFeteApplyService.java | 4 +- .../AdFrockallotApplyService.java | 11 +++- .../AdFrockallotDetailDto.java | 4 ++ .../AdFrockallotDetailService.java | 64 ++++++++++++------- .../AdFrockallotDetailVo.java | 4 ++ .../AdFrockallotListDetailVo.java | 4 ++ .../AdLeasehostApplyService.java | 4 +- .../AdNoexpatriatesHostelApplyService.java | 4 +- .../AdOffspaceApplyService.java | 4 +- .../AdPircarpulApplyService.java | 4 +- .../AdSenpircarpulApplyDetailsVo.java | 3 +- .../AdSenpircarpulApplyService.java | 12 +++- .../AdSenpircarpulDetailDto.java | 5 ++ .../AdSenpircarpulDetailService.java | 21 +++++- .../AdSenpircarpulDetailVo.java | 5 ++ .../AdSenpircarpulListDetailVo.java | 5 ++ .../yxt/anrui/oa/feign/file/OaFileEnum.java | 2 +- 19 files changed, 124 insertions(+), 42 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java index bf0b3b5f51..87362785b4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java @@ -40,7 +40,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -@Api(tags = "宿舍租赁申请") +@Api(tags = "办公场地租赁申请") @RestController @RequestMapping("v1/officeSpaceRentalapply") public class AdOffSpaceApplyRest { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java index b440900edf..c0bc29409d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java @@ -148,8 +148,8 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService { + @Autowired private OaAppendixService oaAppendixService; @Autowired @@ -123,8 +125,8 @@ public class AdFrockallotApplyService extends MybatisBaseService appes = oaAppendixService.selectByLinkSid(sid, "文件"); adFrockallotApplyDetailsVo.setFiles(files); adFrockallotApplyDetailsVo.setAppes(appes); + //子表附件赋值 + for (AdFrockallotListDetailVo adFrockallotListDetailVo : adFrockallotApplyDetailsVo.getList()) { + List detailFiles = oaAppendixService.selectByLinkSid(adFrockallotListDetailVo.getSid()); + adFrockallotListDetailVo.setDetailFiles(detailFiles); + } //基础字段赋值 BeanUtil.copyProperties(oaFormService.getDetails(sid), adFrockallotApplyDetailsVo); return rb.success().setData(adFrockallotApplyDetailsVo); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java index 4750539d04..b1ca013404 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Data @@ -43,4 +45,6 @@ public class AdFrockallotDetailDto implements Dto { private BigDecimal expectCost; // 预计费用 @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 + + private List detailFiles = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java index 8454db38bb..dc9ac69509 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java @@ -26,35 +26,55 @@ package com.yxt.anrui.oa.biz.adfrockallotdetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.Collections; import java.util.List; @Service public class AdFrockallotDetailService extends MybatisBaseService { - public void saveDetails(List list, String sid) { - //根据sid查询明细并删除 - List list2 = baseMapper.selectByMainSid(sid); - list2.removeAll(Collections.singleton(null)); - if (!list2.isEmpty()) { - list2.stream().forEach(v -> { - deleteBySid(v.getSid()); - }); - } - list.removeAll(Collections.singleton(null)); - if (!list.isEmpty()) { - list.stream().forEach(details -> { - AdFrockallotDetail adFrockallotDetail = new AdFrockallotDetail(); - BeanUtil.copyProperties(details, adFrockallotDetail); - adFrockallotDetail.setMainSid(sid); - baseMapper.insert(adFrockallotDetail); - }); - } - } + @Autowired + private OaAppendixService oaAppendixService; + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdFrockallotDetail adFrockallotDetail = new AdFrockallotDetail(); + BeanUtil.copyProperties(details, adFrockallotDetail); + adFrockallotDetail.setMainSid(sid); + baseMapper.insert(adFrockallotDetail); + List detailFiles = details.getDetailFiles(); + saveFiles(adFrockallotDetail.getSid(), detailFiles, OaFileEnum.ADFROCKALLOTAPPLY.getAttachType(), ""); + }); + } + } + + public List getUpdateInit(String sid) { + List adFrockallotDetailVos = baseMapper.getUpdateInit(sid); + for (AdFrockallotDetailVo adFrockallotDetailVo : adFrockallotDetailVos) { + List detailFiles = oaAppendixService.selectByLinkSid(adFrockallotDetailVo.getSid()); + adFrockallotDetailVo.setDetailFiles(detailFiles); + } + return adFrockallotDetailVos; + } - public List getUpdateInit(String sid) { - return baseMapper.getUpdateInit(sid); - } + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java index 27171062aa..42b18f112a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Data @@ -45,4 +47,6 @@ public class AdFrockallotDetailVo implements Vo { private BigDecimal expectCost; // 预计费用 @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java index b5a5ff1ba5..880c358f73 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java @@ -30,6 +30,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Data @ApiModel(value = "工装订制配发列表 视图数据对象", description = "工装订制配发列表 视图数据对象") @@ -41,4 +43,6 @@ public class AdFrockallotListDetailVo implements Vo { private BigDecimal expectCost; // 预计费用 @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java index 7641aecd10..e5577c7b0c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java @@ -130,8 +130,8 @@ public class AdLeasehostApplyService extends MybatisBaseService appes = new ArrayList<>(); - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java index 8b6ad73b9b..1922c50887 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java @@ -26,9 +26,11 @@ package com.yxt.anrui.oa.biz.adsenpircarpulapply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo; import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulDetailDto; import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulDetailService; import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulDetailVo; +import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulListDetailVo; import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; import com.yxt.anrui.oa.biz.oaform.*; import com.yxt.anrui.oa.biz.oaform.flowable.*; @@ -48,6 +50,7 @@ import java.util.Map; @Service public class AdSenpircarpulApplyService extends MybatisBaseService { + @Autowired private OaAppendixService oaAppendixService; @Autowired @@ -133,8 +136,8 @@ public class AdSenpircarpulApplyService extends MybatisBaseService appes = oaAppendixService.selectByLinkSid(sid, "文件"); adSenpircarpulApplyDetailsVo.setFiles(files); adSenpircarpulApplyDetailsVo.setAppes(appes); + //子表附件赋值 + for (AdSenpircarpulListDetailVo adSenpircarpulListDetailVo : adSenpircarpulApplyDetailsVo.getList()) { + List detailFiles = oaAppendixService.selectByLinkSid(adSenpircarpulListDetailVo.getSid()); + adSenpircarpulListDetailVo.setDetailFiles(detailFiles); + } //基础字段赋值 BeanUtil.copyProperties(oaFormService.getDetails(sid), adSenpircarpulApplyDetailsVo); return rb.success().setData(adSenpircarpulApplyDetailsVo); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java index 5547f3932e..6087eebc56 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java @@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-oa(1)
* File: AdSenpircarpulDetailDto.java
@@ -62,4 +65,6 @@ public class AdSenpircarpulDetailDto implements Dto { private FormCommon jobObj; private String jobKey; private String jobValue; + + private List detailFiles = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java index 0c3dafe176..0430ab682d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java @@ -26,7 +26,10 @@ package com.yxt.anrui.oa.biz.adsenpircarpuldetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; @@ -34,6 +37,9 @@ import java.util.List; @Service public class AdSenpircarpulDetailService extends MybatisBaseService { + @Autowired + private OaAppendixService oaAppendixService; + public void saveDetails(List list, String sid) { //根据sid查询明细并删除 List list2 = baseMapper.selectByMainSid(sid); @@ -50,11 +56,24 @@ public class AdSenpircarpulDetailService extends MybatisBaseService detailFiles = details.getDetailFiles(); + saveFiles(adSenpircarpulDetail.getSid(), detailFiles, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), ""); }); } } public List getUpdateInit(String sid) { - return baseMapper.getUpdateInit(sid); + List adSenpircarpulDetailVos = baseMapper.getUpdateInit(sid); + for (AdSenpircarpulDetailVo adSenpircarpulDetailVo : adSenpircarpulDetailVos) { + List detailFiles = oaAppendixService.selectByLinkSid(adSenpircarpulDetailVo.getSid()); + adSenpircarpulDetailVo.setDetailFiles(detailFiles); + } + return adSenpircarpulDetailVos; + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java index e38ce4fc28..0a70a25db4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java @@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-oa(1)
* File: AdSenpircarpulDetailVo.java
@@ -64,4 +67,6 @@ public class AdSenpircarpulDetailVo implements Vo { private FormCommon jobObj; private String jobKey; private String jobValue; + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java index 56432fdcbe..88da4d166c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-oa(1)
* File: AdSenpircarpulDetailVo.java
@@ -57,4 +60,6 @@ public class AdSenpircarpulListDetailVo implements Vo { private String deptValue; @ApiModelProperty("岗位") private String jobValue; + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java index a11a677c09..34cb963872 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java @@ -17,7 +17,7 @@ public enum OaFileEnum { GROUPSYSTEMAPPLY("008", "集团制度会签附件"), ADEXPATRIATESHOMEAPPLY("009", "驻外人员探亲附件"), ADNOEXPATRIATESHOSTELAPPLY("010", "非驻外人员申请宿舍附件"), - ADOFFICESPACERENTALAPPLY("011", "宿舍租赁附件"), + ADLEASEHOSTAPPLY("011", "宿舍租赁附件"), ADOFFSPACEAPPLY("012", "办公场地租赁附件"), ADFROCKALLOTAPPLY("013", "工装订制配发附件"), ADPIRCARPULAPPLY("014", "临时私车公用附件"),