fix: 法规符合性排查流程-返回message
This commit is contained in:
+4
-3
@@ -6,6 +6,7 @@ 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.aspect.annotation.Translation;
|
import com.jero.common.aspect.annotation.Translation;
|
||||||
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.activiti.enums.ProcessTypeEnum;
|
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||||
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
||||||
import com.jero.modules.activiti.process.common.entity.TransferVO;
|
import com.jero.modules.activiti.process.common.entity.TransferVO;
|
||||||
@@ -118,7 +119,7 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
|
|||||||
if (draft != null) {
|
if (draft != null) {
|
||||||
return Result.OK(draft);
|
return Result.OK(draft);
|
||||||
}
|
}
|
||||||
return Result.OK(sccService.getHandleData(taskId));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), sccService.getHandleData(taskId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -130,7 +131,7 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
|
|||||||
@ApiOperation(value = "法规符合性排查流程-生成", notes = "法规符合性排查流程-生成")
|
@ApiOperation(value = "法规符合性排查流程-生成", notes = "法规符合性排查流程-生成")
|
||||||
@PostMapping("/generate")
|
@PostMapping("/generate")
|
||||||
public Result<String> generate(@RequestBody ProcessStandardComplianceCheck scc) throws Exception {
|
public Result<String> generate(@RequestBody ProcessStandardComplianceCheck scc) throws Exception {
|
||||||
return Result.OK(ResultCommon.OK, sccService.generate(scc));
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), sccService.generate(scc));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -202,7 +203,7 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
|
|||||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
||||||
IPage<ProcessStandardComplianceCheckDetail> pageList = sccDetailService.queryPage(processStandardComplianceCheckDetail, pageNo, pageSize);
|
IPage<ProcessStandardComplianceCheckDetail> pageList = sccDetailService.queryPage(processStandardComplianceCheckDetail, pageNo, pageSize);
|
||||||
return Result.OK(pageList);
|
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user