diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java index db00002816..2f8ff2e5df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java +++ b/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> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = finPaymentapplyDetailsBelowEveService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - FinPaymentapplyDetailsBelowEveDetailsVo vo = finPaymentapplyDetailsBelowEveService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + FinPaymentapplyDetailsBelowEveDetailsVo vo = finPaymentapplyDetailsBelowEveService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java index 0af5a32609..f54be3493c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyDto.java +++ b/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 files = new ArrayList<>(); - @ApiModelProperty("附件") + @ApiModelProperty("文件") private List appes = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java index e4512c394c..47412a1546 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesapply/AdExpatriatesApplyService.java @@ -76,6 +76,7 @@ public class AdExpatriatesApplyService extends MybatisBaseService rb = ResultBean.fireFail(); String sid = dto.getSid(); List files = dto.getFiles(); + List appes = dto.getAppes(); if (StringUtils.isBlank(sid)) { // 新建操作 @@ -100,20 +101,15 @@ public class AdExpatriatesApplyService extends MybatisBaseService files, String attachType) { - files.removeAll(Collections.singleton(null)); - oaAppendixService.saveFile(sid, files, attachType); - } - - private void saveAppes(String sid, List files, String attachType) { + // 保存文件 + private void saveFiles(String sid, List 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) { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java index 3345495899..7dc206c120 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java +++ b/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 files, String attachType,String fileType) { + public void saveFile(String sid, List files, String attachType, String fileType) { List oaAppendixList = new ArrayList<>(); if (!files.isEmpty()) { for (String file : files) { 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 a02deddfc1..441cbe1efd 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 @@ -9,8 +9,7 @@ public enum OaFileEnum { OALEAVEAPPLY("001", "请假申请附件"), OAMENDAPPLY("002", "补卡申请附件"), - ADEXPATRIATESAPPLYFLIE("003", "驻外人员认定图片"), - ADEXPATRIATESAPPLYAPPE("004", "驻外人员认定附件"), + ADEXPATRIATESAPPLY("003", "驻外人员认定附件"), ;