fix(文档拆分): 78544
This commit is contained in:
+13
-3
@@ -206,7 +206,12 @@ public class DocumentSplitController {
|
|||||||
@PostMapping("/queryDocumentSplitDetail")
|
@PostMapping("/queryDocumentSplitDetail")
|
||||||
@RequiresPermissions("split:sarFileSplitItems:search")
|
@RequiresPermissions("split:sarFileSplitItems:search")
|
||||||
public Result<IPage<Map<String,Object>>> queryDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
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")
|
@PostMapping("/editBatchDocumentSplitDetail")
|
||||||
@RequiresPermissions("split:sarFileSplitItems:batchDelete")
|
@RequiresPermissions("split:sarFileSplitItems:batchDelete")
|
||||||
public Result<T> editBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
public Result<T> editBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
|
||||||
documentSplitService.editBatchDocumentSplitDetail(parameter);
|
try {
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
documentSplitService.editBatchDocumentSplitDetail(parameter);
|
||||||
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
||||||
|
}
|
||||||
|
catch (Exception e){
|
||||||
|
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+9
-2
@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.jero.common.api.vo.Result;
|
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.aspect.annotation.AutoLog;
|
||||||
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.common.system.base.controller.JeroController;
|
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.oss.service.IOSSFileService;
|
||||||
import com.jero.modules.split.entity.SarFileSplitInfoEO;
|
import com.jero.modules.split.entity.SarFileSplitInfoEO;
|
||||||
import com.jero.modules.split.entity.SarFileSplitItemsEO;
|
import com.jero.modules.split.entity.SarFileSplitItemsEO;
|
||||||
@@ -215,8 +218,12 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
|
|||||||
@RequestParam(value = "parameter") String parameter,
|
@RequestParam(value = "parameter") String parameter,
|
||||||
HttpServletResponse response,
|
HttpServletResponse response,
|
||||||
HttpServletRequest request) {
|
HttpServletRequest request) {
|
||||||
Map<String, Object> parameterMap = JSONObject.parseObject(parameter);
|
try {
|
||||||
fileSplitItemsEOService.exportSplitInfo(cut, idList, parameterMap, exportName, response, request);
|
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 = "文档拆分条款信息-导入拆分结果")
|
@ApiOperation(value = "文档拆分条款信息-导入拆分结果")
|
||||||
|
|||||||
Reference in New Issue
Block a user