diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 2b42728e..3c979c31 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -24,6 +24,7 @@ public class ResultCommon { public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条 public static final String SUCCESSFULLY_CLEARED = "successfully.cleared"; // 清除成功 + public static final String SUCCESSFULLY_DELETED = "successfully.deleted"; // 删除成功 public static final String SUCCESSFULLY_DELETED_IN_BULK = "successfully.deleted.in.bulk"; // 批量删除成功 public static final String CANNOT_DUPLICATE_FAVORITES = "cannot.duplicate.favorites"; // 不能重复收藏 public static final String PLEASE_SELECT_DATA = "please.select.data"; // 请选择数据 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index af4280ed..6070865d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -5,7 +5,6 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; -import com.jero.modules.laws.documenttool.common.DocumentSplitCommon; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; @@ -98,7 +97,7 @@ public class DocumentSplitController { @PostMapping(value = "/split") public Result split(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { documentSplitService.add(sarFileSplitInfoEO); - return Result.OK("操作成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -112,7 +111,7 @@ public class DocumentSplitController { @PostMapping(value = "/publish") public Result publish(@RequestBody Map parameter) { documentSplitService.publish(parameter); - return Result.OK("发布成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -126,7 +125,7 @@ public class DocumentSplitController { @PostMapping(value = "/revocation") public Result revocation(@RequestBody Map parameter) { documentSplitService.revocation(parameter); - return Result.OK("撤回成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -139,7 +138,7 @@ public class DocumentSplitController { @PostMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { sarFileSplitInfoService.deleteById(id); - return Result.OK(DocumentSplitCommon.MEG_DEL); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED)); } /** @@ -152,7 +151,7 @@ public class DocumentSplitController { @PostMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK(DocumentSplitCommon.MEG_DEL_BATCH); + return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); } /** @@ -213,7 +212,7 @@ public class DocumentSplitController { @PostMapping("/editDocumentSplitDetail") public Result editDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.editDocumentSplitDetail(parameter); - return Result.OK("编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -226,7 +225,7 @@ public class DocumentSplitController { @PostMapping("/editBatchDocumentSplitDetail") public Result editBatchDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.editBatchDocumentSplitDetail(parameter); - return Result.OK("批量编辑成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -239,7 +238,7 @@ public class DocumentSplitController { @PostMapping(value = "/deleteDocumentSplitDetail") public Result deleteDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.deleteDocumentSplitDetail(parameter); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -252,7 +251,7 @@ public class DocumentSplitController { @PostMapping(value = "/deleteBatchDocumentSplitDetail") public Result deleteBatchDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.deleteBatchDocumentSplitDetail(parameter); - return Result.OK("批量删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -265,7 +264,7 @@ public class DocumentSplitController { @PostMapping("/mergeDocumentSplitDetail") public Result mergeDocumentSplitDetail(@RequestBody Map parameter) { documentSplitService.mergeDocumentSplitDetail(parameter); - return Result.OK("合并成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -278,7 +277,7 @@ public class DocumentSplitController { @GetMapping("/copyDocumentSplitDetail") public Result copyDocumentSplitDetail(String id) { documentSplitService.copyDocumentSplitDetail(id); - return Result.OK("复制成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -291,7 +290,7 @@ public class DocumentSplitController { @GetMapping("/copyBatchDocumentSplitDetail") public Result copyBatchDocumentSplitDetail(String ids) { documentSplitService.copyBatchDocumentSplitDetail(ids); - return Result.OK("批量复制成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 58c76374..7922f828 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -59,7 +59,7 @@ delete from laws_document_split - where #{updateCondition} + where ${updateCondition} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index a1256a70..d24d7fd9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -526,16 +526,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { public void deleteBatchDocumentSplitDetail(Map parameter) { // where条件 String updateCondition = ""; - if (parameter.containsKey(ID)){ - String id = (String) parameter.get(ID); - List list = Arrays.asList(id.split(",")); - updateCondition = "id in " + "'" + String.join(",", list) + "'"; - }else { - String infoId = (String) parameter.get(INFO_ID); - updateCondition = "info_id = " + "'" + infoId + "'"; + if (parameter.containsKey(IDS)){ + String ids = (String) parameter.get(IDS); + List list = Arrays.asList(ids.split(",")); + updateCondition = "id in (" + "'" + String.join("','", list) + "')"; + // 删除数据 + documentSplitMapper.deleteBatchDocumentSplitDetail(updateCondition); + } - // 删除数据 - documentSplitMapper.deleteBatchDocumentSplitDetail(updateCondition); } @Override diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 285665a0..302daf17 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -18,6 +18,7 @@ message.no.permission=No data operation permission message.select.data=Please select data successfully.cleared=successfully cleared +successfully.deleted=successfully deleted successfully.deleted.in.bulk=successfully deleted in bulk cannot.duplicate.favorites=cannot duplicate favorites please.select.data=please select data diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 7489612b..da12b370 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -19,6 +19,7 @@ es.rmr.setQuality.overTen=Please select up to 10 successfully.cleared=successfully cleared +successfully.deleted=successfully deleted successfully.deleted.in.bulk=successfully deleted in bulk cannot.duplicate.favorites=cannot duplicate favorites please.select.data=please select data diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index c2c25fa0..35c8671a 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -18,6 +18,7 @@ message.no.permission=\u6CA1\u6709\u6570\u636E\u64CD\u4F5C\u6743\u9650 message.select.data=\u8BF7\u9009\u62E9\u6570\u636E successfully.cleared=\u6E05\u9664\u6210\u529F +successfully.deleted=\u5220\u9664\u6210\u529F successfully.deleted.in.bulk=\u6279\u91CF\u5220\u9664\u6210\u529F cannot.duplicate.favorites=\u4E0D\u80FD\u91CD\u590D\u6536\u85CF please.select.data=\u8BF7\u9009\u62E9\u6570\u636E