|
@@ -46,8 +46,7 @@ public class TBCrmDetailController {
|
|
|
@RequestMapping(value = "/sop/import", method = RequestMethod.POST)
|
|
|
@ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })
|
|
|
public Result sopImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
|
|
|
- @ApiParam(value = "派单号", required = true) @RequestParam String crmNo,
|
|
|
- @ApiParam(value = "过程变量", required = true) @RequestParam String processVar) throws IOException {
|
|
|
+ @ApiParam(value = "派单号", required = true) @RequestParam String crmNo) throws IOException {
|
|
|
boolean lock = memoryLock.lock(SystemConstant.LOCK_CRM_DETAIL_SOP_PREFIX + crmNo, crmNo,
|
|
|
SystemConstant.LOCK_CRM_DETAIL_SOP_TIME_OUT);
|
|
|
if (!lock) {
|
|
@@ -55,7 +54,7 @@ public class TBCrmDetailController {
|
|
|
}
|
|
|
Map<String, String> map = null;
|
|
|
try {
|
|
|
- map = tbCrmDetailService.sopExcelImport(file, crmNo, processVar);
|
|
|
+ map = tbCrmDetailService.sopExcelImport(file, crmNo);
|
|
|
} catch (Exception e) {
|
|
|
log.error(SystemConstant.LOG_ERROR, e);
|
|
|
if (e instanceof ApiException) {
|