feat(文档拆分): 导入拆分结果

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"; // 请选择数据

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<T> 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<T> publish(@RequestBody Map<String, Object> 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<T> revocation(@RequestBody Map<String, Object> 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<T> 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<T> 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<T> editDocumentSplitDetail(@RequestBody Map<String, Object> 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<T> editBatchDocumentSplitDetail(@RequestBody Map<String, Object> 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<T> deleteDocumentSplitDetail(@RequestBody Map<String, Object> 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<T> deleteBatchDocumentSplitDetail(@RequestBody Map<String, Object> 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<T> mergeDocumentSplitDetail(@RequestBody Map<String, Object> 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<T> 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<T> copyBatchDocumentSplitDetail(String ids) {
         documentSplitService.copyBatchDocumentSplitDetail(ids);
-        return Result.OK("批量复制成功!");
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
     /**

laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml

@@ -59,7 +59,7 @@
 
     <delete id="deleteBatchDocumentSplitDetail">
         delete from laws_document_split
-        where #{updateCondition}
+        where ${updateCondition}
     </delete>
 
     <delete id="deleteItemsValByItemId">

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<String, Object> parameter) {
         // where条件
         String updateCondition = "";
-        if (parameter.containsKey(ID)){
-            String id = (String) parameter.get(ID);
-            List<String> 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<String> list = Arrays.asList(ids.split(","));
+            updateCondition = "id in (" + "'" + String.join("','", list) + "')";
+            // 删除数据
+            documentSplitMapper.deleteBatchDocumentSplitDetail(updateCondition);
+
         }
-        // 删除数据
-        documentSplitMapper.deleteBatchDocumentSplitDetail(updateCondition);
     }
 
     @Override