From 93e9d54bf6a5b76fe9e92dfb772579d7f3b1acd5 Mon Sep 17 00:00:00 2001 From: xia Date: Wed, 15 Jun 2022 15:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=A0=E9=99=A4=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/controller/ArchivesController.java | 8 ++++++++ .../modules/archives/service/ArchivesService.java | 2 ++ .../modules/archives/service/dto/ArchivesDTO.java | 4 +++- .../archives/service/impl/ArchivesServiceImpl.java | 14 +++++++++++--- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java index 01d6213..d8e2c10 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java @@ -52,6 +52,14 @@ public class ArchivesController { return ApiResponse.success(archivesService.edit(dto)); } + @ApiOperation("编辑档案附件") + @PostMapping("/editFile") + public ApiResponse editFile( + @Validated @RequestBody ArchivesDTO dto + ){ + return ApiResponse.success(archivesService.editFile(dto)); + } + @ApiOperation("档案删除") @PostMapping("/delete") public ApiResponse delete( diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java index 8e17eb5..03a58e4 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/ArchivesService.java @@ -12,6 +12,8 @@ public interface ArchivesService { Object doedit(String categoryId,String archivesId); //编辑档案 Object edit(ArchivesDTO dto); + //编辑档案附件 + Object editFile(ArchivesDTO dto); //档案删除进回收站 Object delete(ArchivesDTO dto); //档案回收站删除 diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/dto/ArchivesDTO.java b/archives/src/main/java/com/storeroom/modules/archives/service/dto/ArchivesDTO.java index ba147d1..e73c54d 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/dto/ArchivesDTO.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/dto/ArchivesDTO.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter public class ArchivesDTO { @@ -15,7 +17,7 @@ public class ArchivesDTO { @JSONField(name="ids") @JsonProperty("ids") - private String ids; + private List ids; @JSONField(name="categoryId") @JsonProperty("categoryId") diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java index 24d5ee7..b1067f5 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesServiceImpl.java @@ -230,12 +230,19 @@ public class ArchivesServiceImpl implements ArchivesService { return "成功更新"+result+"条数据。"; } + @Override + public Object editFile(ArchivesDTO dto) { + return null; + } + @Override @Transactional(rollbackFor = Exception.class) public Object delete(ArchivesDTO dto) { ArchivesType archivesType = archivesTypeRepository.findById(dto.getCategoryId()).get(); + List ids = dto.getIds(); String queryTable = archivesType.getEnName(); - String sql = "update " + queryTable + " set is_delete_time = '" +sdf.format(new Date())+"',is_delete_man='"+dto.getDelMan()+"' where id in ("+dto.getIds()+")"; + String sql = "update " + queryTable + " set is_delete_time = '" +sdf.format(new Date())+"',is_delete_man='"+dto.getDelMan() + +"' where id in ('"+ids.stream().map(String::valueOf).collect(Collectors.joining("','"))+"')"; int result = entityManager.createNativeQuery(sql).executeUpdate(); return result; } @@ -245,11 +252,12 @@ public class ArchivesServiceImpl implements ArchivesService { public Object completelyDelete(ArchivesDTO dto) { ArchivesType archivesType = archivesTypeRepository.findById(dto.getCategoryId()).get(); String queryTable = archivesType.getEnName(); - String sql = "delete from " +queryTable+" where id in ("+dto.getIds()+")"; + List ids = dto.getIds(); + String sql = "delete from " +queryTable+" where id in ('"+ids.stream().map(String::valueOf).collect(Collectors.joining("','"))+"')"; int result = entityManager.createNativeQuery(sql).executeUpdate(); int result1 = 0; if(ArchivesTypeEnum.inChive.getCode() == archivesType.getIsType() || ArchivesTypeEnum.files.getCode() == archivesType.getIsType()){ - String sql1 = "delete from file_" +queryTable+" where parents_id in ("+dto.getIds()+")"; + String sql1 = "delete from file_" +queryTable+" where parents_id in ('"+ids.stream().map(String::valueOf).collect(Collectors.joining("','"))+"')"; result1 = entityManager.createNativeQuery(sql1).executeUpdate(); } return result+","+result1;