更改

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 {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java

@@ -148,8 +148,8 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
             baseMapper.updateById(entity);
         }
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESHOMEAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESHOMEAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java

@@ -134,8 +134,8 @@ public class AdFeteApplyService extends MybatisBaseService<AdFeteApplyMapper, Ad
         }
         adFeteDetailService.saveDetails(list, sid);
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, OaFileEnum.ADFETEAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADFETEAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailDto;
 import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailService;
 import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailVo;
+import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo;
 import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
 import com.yxt.anrui.oa.biz.oaform.*;
 import com.yxt.anrui.oa.biz.oaform.flowable.*;
@@ -49,6 +50,7 @@ import java.util.Map;
 
 @Service
 public class AdFrockallotApplyService extends MybatisBaseService<AdFrockallotApplyMapper, AdFrockallotApply> {
+
     @Autowired
     private OaAppendixService oaAppendixService;
     @Autowired
@@ -123,8 +125,8 @@ public class AdFrockallotApplyService extends MybatisBaseService<AdFrockallotApp
         }
         adFrockallotDetailService.saveDetails(list, sid);
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, OaFileEnum.ADFROCKALLOTAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADFROCKALLOTAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 
@@ -144,6 +146,11 @@ public class AdFrockallotApplyService extends MybatisBaseService<AdFrockallotApp
         List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
         adFrockallotApplyDetailsVo.setFiles(files);
         adFrockallotApplyDetailsVo.setAppes(appes);
+        //子表附件赋值
+        for (AdFrockallotListDetailVo adFrockallotListDetailVo : adFrockallotApplyDetailsVo.getList()) {
+            List<String> detailFiles = oaAppendixService.selectByLinkSid(adFrockallotListDetailVo.getSid());
+            adFrockallotListDetailVo.setDetailFiles(detailFiles);
+        }
         //基础字段赋值
         BeanUtil.copyProperties(oaFormService.getDetails(sid), adFrockallotApplyDetailsVo);
         return rb.success().setData(adFrockallotApplyDetailsVo);

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<String> detailFiles = new ArrayList<>();
 }

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<AdFrockallotDetailMapper, AdFrockallotDetail> {
 
-	public void saveDetails(List<AdFrockallotDetailDto> list, String sid) {
-		//根据sid查询明细并删除
-		List<AdFrockallotDetail> 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<AdFrockallotDetailDto> list, String sid) {
+        //根据sid查询明细并删除
+        List<AdFrockallotDetail> 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<String> detailFiles = details.getDetailFiles();
+                saveFiles(adFrockallotDetail.getSid(), detailFiles, OaFileEnum.ADFROCKALLOTAPPLY.getAttachType(), "");
+            });
+        }
+    }
+
+    public List<AdFrockallotDetailVo> getUpdateInit(String sid) {
+        List<AdFrockallotDetailVo> adFrockallotDetailVos = baseMapper.getUpdateInit(sid);
+        for (AdFrockallotDetailVo adFrockallotDetailVo : adFrockallotDetailVos) {
+            List<String> detailFiles = oaAppendixService.selectByLinkSid(adFrockallotDetailVo.getSid());
+            adFrockallotDetailVo.setDetailFiles(detailFiles);
+        }
+        return adFrockallotDetailVos;
+    }
 
-	public List<AdFrockallotDetailVo> getUpdateInit(String sid) {
-		return baseMapper.getUpdateInit(sid);
-	}
+    // 保存文件
+    private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
+        files.removeAll(Collections.singleton(null));
+        oaAppendixService.saveFile(sid, files, attachType, fileType);
+    }
 }

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<String> detailFiles = new ArrayList<>();
 }

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<String> detailFiles = new ArrayList<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java

@@ -130,8 +130,8 @@ public class AdLeasehostApplyService extends MybatisBaseService<AdLeasehostApply
 		}
 		adLeasehostDetailService.saveDetails(list, sid);
 		// 处理附件
-		saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-		saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+		saveFiles(sid, files, OaFileEnum.ADLEASEHOSTAPPLY.getAttachType(), "图片");
+		saveFiles(sid, appes, OaFileEnum.ADLEASEHOSTAPPLY.getAttachType(), "文件");
 		return rb.success().setData(sid);
 	}
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java

@@ -136,8 +136,8 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService<AdNoex
         }
         adNoexpatriatesHostelDetailService.saveDetails(list, sid);
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, OaFileEnum.ADNOEXPATRIATESHOSTELAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADNOEXPATRIATESHOSTELAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyService.java

@@ -126,8 +126,8 @@ public class AdOffspaceApplyService extends MybatisBaseService<AdOffspaceApplyMa
         }
         adOffspaceDetailService.saveDetails(list, sid);
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, OaFileEnum.ADOFFSPACEAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADOFFSPACEAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java

@@ -134,8 +134,8 @@ public class AdPircarpulApplyService extends MybatisBaseService<AdPircarpulApply
 		}
 		adPircarpulDetailService.saveDetails(list, sid);
 		// 处理附件
-		saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-		saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+		saveFiles(sid, files, OaFileEnum.ADPIRCARPULAPPLY.getAttachType(), "图片");
+		saveFiles(sid, appes, OaFileEnum.ADPIRCARPULAPPLY.getAttachType(), "文件");
 		return rb.success().setData(sid);
 	}
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyDetailsVo.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.oa.biz.adsenpircarpulapply;
 
 
 import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo;
+import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulListDetailVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -61,5 +62,5 @@ public class AdSenpircarpulApplyDetailsVo implements Vo {
     @ApiModelProperty("附件")
     private List<String> appes = new ArrayList<>();
 
-    private List<AdLeasehostListDetailVo> list = new ArrayList<>();
+    private List<AdSenpircarpulListDetailVo> list = new ArrayList<>();
 }

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<AdSenpircarpulApplyMapper, AdSenpircarpulApply> {
+
 	@Autowired
 	private OaAppendixService oaAppendixService;
 	@Autowired
@@ -133,8 +136,8 @@ public class AdSenpircarpulApplyService extends MybatisBaseService<AdSenpircarpu
 		}
 		adSenpircarpulDetailService.saveDetails(list, sid);
 		// 处理附件
-		saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-		saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+		saveFiles(sid, files, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), "图片");
+		saveFiles(sid, appes, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), "文件");
 		return rb.success().setData(sid);
 	}
 
@@ -154,6 +157,11 @@ public class AdSenpircarpulApplyService extends MybatisBaseService<AdSenpircarpu
 		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
 		adSenpircarpulApplyDetailsVo.setFiles(files);
 		adSenpircarpulApplyDetailsVo.setAppes(appes);
+		//子表附件赋值
+		for (AdSenpircarpulListDetailVo adSenpircarpulListDetailVo : adSenpircarpulApplyDetailsVo.getList()) {
+			List<String> detailFiles = oaAppendixService.selectByLinkSid(adSenpircarpulListDetailVo.getSid());
+			adSenpircarpulListDetailVo.setDetailFiles(detailFiles);
+		}
 		//基础字段赋值
 		BeanUtil.copyProperties(oaFormService.getDetails(sid), adSenpircarpulApplyDetailsVo);
 		return rb.success().setData(adSenpircarpulApplyDetailsVo);

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) <br/>
  * File: AdSenpircarpulDetailDto.java <br/>
@@ -62,4 +65,6 @@ public class AdSenpircarpulDetailDto implements Dto {
     private FormCommon jobObj;
     private String jobKey;
     private String jobValue;
+
+    private List<String> detailFiles = new ArrayList<>();
 }

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<AdSenpircarpulDetailMapper, AdSenpircarpulDetail> {
 
+	@Autowired
+	private OaAppendixService oaAppendixService;
+
 	public void saveDetails(List<AdSenpircarpulDetailDto> list, String sid) {
 		//根据sid查询明细并删除
 		List<AdSenpircarpulDetail> list2 = baseMapper.selectByMainSid(sid);
@@ -50,11 +56,24 @@ public class AdSenpircarpulDetailService extends MybatisBaseService<AdSenpircarp
 				BeanUtil.copyProperties(details, adSenpircarpulDetail);
 				adSenpircarpulDetail.setMainSid(sid);
 				baseMapper.insert(adSenpircarpulDetail);
+				List<String> detailFiles = details.getDetailFiles();
+				saveFiles(adSenpircarpulDetail.getSid(), detailFiles, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), "");
 			});
 		}
 	}
 
 	public List<AdSenpircarpulDetailVo> getUpdateInit(String sid) {
-		return baseMapper.getUpdateInit(sid);
+		List<AdSenpircarpulDetailVo> adSenpircarpulDetailVos = baseMapper.getUpdateInit(sid);
+		for (AdSenpircarpulDetailVo adSenpircarpulDetailVo : adSenpircarpulDetailVos) {
+			List<String> detailFiles = oaAppendixService.selectByLinkSid(adSenpircarpulDetailVo.getSid());
+			adSenpircarpulDetailVo.setDetailFiles(detailFiles);
+		}
+		return adSenpircarpulDetailVos;
+	}
+
+	// 保存文件
+	private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
+		files.removeAll(Collections.singleton(null));
+		oaAppendixService.saveFile(sid, files, attachType, fileType);
 	}
 }

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) <br/>
  * File: AdSenpircarpulDetailVo.java <br/>
@@ -64,4 +67,6 @@ public class AdSenpircarpulDetailVo implements Vo {
     private FormCommon jobObj;
     private String jobKey;
     private String jobValue;
+
+    private List<String> detailFiles = new ArrayList<>();
 }

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) <br/>
  * File: AdSenpircarpulDetailVo.java <br/>
@@ -57,4 +60,6 @@ public class AdSenpircarpulListDetailVo implements Vo {
     private String deptValue;
     @ApiModelProperty("岗位")
     private String jobValue;
+
+    private List<String> detailFiles = new ArrayList<>();
 }

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", "临时私车公用附件"),