Merge remote-tracking branch 'base-version/test' into dev
This commit is contained in:
@@ -13,7 +13,6 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
|
|||||||
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
import com.zt.plat.framework.excel.core.util.ExcelUtils;
|
||||||
import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi;
|
import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi;
|
||||||
import com.zt.plat.module.bpm.api.task.BpmTaskApi;
|
import com.zt.plat.module.bpm.api.task.BpmTaskApi;
|
||||||
import com.zt.plat.module.bpm.api.task.dto.BpmApprovalDetailReqDTO;
|
|
||||||
import com.zt.plat.module.infra.api.businessfile.BusinessFileApi;
|
import com.zt.plat.module.infra.api.businessfile.BusinessFileApi;
|
||||||
import com.zt.plat.module.infra.api.file.FileApi;
|
import com.zt.plat.module.infra.api.file.FileApi;
|
||||||
import com.zt.plat.module.system.api.dept.DeptApi;
|
import com.zt.plat.module.system.api.dept.DeptApi;
|
||||||
@@ -135,9 +134,6 @@ public class DemoContractController extends AbstractFileUploadController impleme
|
|||||||
@GetMapping("/page")
|
@GetMapping("/page")
|
||||||
@Operation(summary = "获得合同分页")
|
@Operation(summary = "获得合同分页")
|
||||||
public CommonResult<PageResult<DemoContractRespVO>> getDemoContractPage(@Valid DemoContractPageReqVO pageReqVO) {
|
public CommonResult<PageResult<DemoContractRespVO>> getDemoContractPage(@Valid DemoContractPageReqVO pageReqVO) {
|
||||||
CommonResult<FileRespDTO> file = fileApi.getFile(1968928810422521857L);
|
|
||||||
|
|
||||||
BpmApprovalDetailReqDTO reqDTO = new BpmApprovalDetailReqDTO();
|
|
||||||
Long id = IdWorker.getId();
|
Long id = IdWorker.getId();
|
||||||
System.out.println("Generated ID: " + id);
|
System.out.println("Generated ID: " + id);
|
||||||
PageResult<DemoContractDO> pageResult = demoContractService.getDemoContractPage(pageReqVO);
|
PageResult<DemoContractDO> pageResult = demoContractService.getDemoContractPage(pageReqVO);
|
||||||
|
|||||||
Reference in New Issue
Block a user