更改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
@@ -59,42 +60,42 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
 @RequestMapping("v1/finpaymentapplydetailsbeloweve")
 public class FinPaymentapplyDetailsBelowEveRest implements FinPaymentapplyDetailsBelowEveFeign {
 
-	@Autowired
-	private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
+    @Autowired
+    private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinPaymentapplyDetailsBelowEveVo> pv = finPaymentapplyDetailsBelowEveService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<FinPaymentapplyDetailsBelowEveVo>> listPage(@RequestBody PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinPaymentapplyDetailsBelowEveVo> pv = finPaymentapplyDetailsBelowEveService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody FinPaymentapplyDetailsBelowEveDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentapplyDetailsBelowEveService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody FinPaymentapplyDetailsBelowEveDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        finPaymentapplyDetailsBelowEveService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentapplyDetailsBelowEveService.delBySids(sids);
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        finPaymentapplyDetailsBelowEveService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinPaymentapplyDetailsBelowEveDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		FinPaymentapplyDetailsBelowEveDetailsVo vo = finPaymentapplyDetailsBelowEveService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<FinPaymentapplyDetailsBelowEveDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinPaymentapplyDetailsBelowEveDetailsVo vo = finPaymentapplyDetailsBelowEveService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java

@@ -63,6 +63,6 @@ public class AdExpatriatesApplyDto extends OaFormDto {
     private String linkFormSids;
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
-    @ApiModelProperty("附件")
+    @ApiModelProperty("文件")
     private List<String> appes = new ArrayList<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java

@@ -76,6 +76,7 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         List<String> files = dto.getFiles();
+        List<String> appes = dto.getAppes();
 
         if (StringUtils.isBlank(sid)) {
             // 新建操作
@@ -100,20 +101,15 @@ public class AdExpatriatesApplyService extends MybatisBaseService<AdExpatriatesA
             baseMapper.updateById(entity);
         }
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLYFLIE.getAttachType());
-        saveAppes(sid, files, OaFileEnum.ADEXPATRIATESAPPLYAPPE.getAttachType());
-
+        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 
-    private void saveFiles(String sid, List<String> files, String attachType) {
-        files.removeAll(Collections.singleton(null));
-        oaAppendixService.saveFile(sid, files, attachType);
-    }
-
-    private void saveAppes(String sid, List<String> files, String attachType) {
+    // 保存文件
+    private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
         files.removeAll(Collections.singleton(null));
-        oaAppendixService.saveFile(sid, files, attachType);
+        oaAppendixService.saveFile(sid, files, attachType, fileType);
     }
 
     public AdExpatriatesApplyVo fetchDetailsVoBySid(String sid) {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java

@@ -30,9 +30,6 @@ import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.imageio.ImageIO;
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -56,7 +53,7 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
 
     }
 
-    public void saveFile(String sid, List<String> files, String attachType,String fileType) {
+    public void saveFile(String sid, List<String> files, String attachType, String fileType) {
         List<OaAppendix> oaAppendixList = new ArrayList<>();
         if (!files.isEmpty()) {
             for (String file : files) {

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java

@@ -9,8 +9,7 @@ public enum OaFileEnum {
 
     OALEAVEAPPLY("001", "请假申请附件"),
     OAMENDAPPLY("002", "补卡申请附件"),
-    ADEXPATRIATESAPPLYFLIE("003", "驻外人员认定图片"),
-    ADEXPATRIATESAPPLYAPPE("004", "驻外人员认定附件"),
+    ADEXPATRIATESAPPLY("003", "驻外人员认定附件"),
     ;