ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 78544

Browse Source
This commit is contained in:
yjz
2023-11-17 17:38:32 +08:00
parent 2c1d6f56c0
commit 20c1a4c66e
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+13 -3
View File
@@ -206,7 +206,12 @@ public class DocumentSplitController {
@PostMapping("/queryDocumentSplitDetail")
@RequiresPermissions("split:sarFileSplitItems:search")
public Result<IPage<Map<String,Object>>> queryDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
return Result.OK(documentSplitService.queryDocumentSplitDetail(parameter));
try {
IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter);
return Result.OK(data);
}catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
}
/**
@@ -269,8 +274,13 @@ public class DocumentSplitController {
@PostMapping("/editBatchDocumentSplitDetail")
@RequiresPermissions("split:sarFileSplitItems:batchDelete")
public Result<T> editBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
documentSplitService.editBatchDocumentSplitDetail(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
try {
documentSplitService.editBatchDocumentSplitDetail(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
catch (Exception e){
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
}
}
/**
laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+9 -2
View File
@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.split.entity.SarFileSplitInfoEO;
import com.jero.modules.split.entity.SarFileSplitItemsEO;
@@ -215,8 +218,12 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@RequestParam(value = "parameter") String parameter,
HttpServletResponse response,
HttpServletRequest request) {
Map<String, Object> parameterMap = JSONObject.parseObject(parameter);
fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request);
try {
Map<String, Object> parameterMap = JSONObject.parseObject(parameter);
fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request);
}catch (Exception e){
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR));
}
}
@ApiOperation(value = "文档拆分条款信息-导入拆分结果")