zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'base-version/main' into test

Browse Source 
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java
This commit is contained in:
chenbowen
2025-09-28 00:40:55 +08:00
parent 6e3f6d8105 47f777d89c
commit ecd4e6a020
26 changed files with 1382 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zt-module-template/zt-module-template-server/src/main/java/com/zt/plat/module/template/controller/admin/contract/DemoContractController.java
View File

@@ -11,11 +11,12 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
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.dto.BpmApprovalDetailReqDTO;
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.dto.FileCreateReqDTO;
import com.zt.plat.module.infra.api.file.dto.FileRespDTO;
import com.zt.plat.module.system.api.dept.DeptApi;
import com.zt.plat.module.template.controller.admin.contract.vo.DemoContractPageReqVO;
@@ -116,12 +117,10 @@ public class DemoContractController extends AbstractFileUploadController impleme
public CommonResult<PageResult<DemoContractRespVO>> getDemoContractPage(@Valid DemoContractPageReqVO pageReqVO) {
CommonResult<FileRespDTO> file = fileApi.getFile(1968928810422521857L);
FileCreateReqDTO createReqDTO = new FileCreateReqDTO();
createReqDTO.setContent(file.getCheckedData().getContent());
createReqDTO.setType(file.getCheckedData().getType());
createReqDTO.setName(file.getCheckedData().getName());
createReqDTO.setDirectory(file.getCheckedData().getDirectory());
CommonResult<FileRespDTO> fileWithReturn = fileApi.createFileWithReturn(createReqDTO);
BpmApprovalDetailReqDTO reqDTO = new BpmApprovalDetailReqDTO();
reqDTO.setProcessInstanceId("acccfcf2-99b9-11f0-8536-e8808862e505");
reqDTO.setTaskId("8ba1838e-99ba-11f0-8536-e8808862e505");
bpmInsApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), reqDTO);
Long id = IdWorker.getId();
System.out.println("Generated ID: " + id);
PageResult<DemoContractDO> pageResult = demoContractService.getDemoContractPage(pageReqVO);