zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

Browse Source
This commit is contained in:
王兴荣
2026-01-04 17:35:15 +08:00
parent 0a9348cd60 520e5a9add
commit e179cbdd0d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -17,7 +17,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url> <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties> <properties>
<revision>3.0.45</revision> <revision>3.0.46</revision>
<!-- Maven 相关 --> <!-- Maven 相关 -->
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java
View File

@@ -84,7 +84,8 @@ public class ReportDocumentAssistService {
} }
ReportDocumentFileDO docFile = generatePdf(entity); ReportDocumentFileDO docFile = generatePdf(entity);
if(createIworkWorkflowFlag){ if(createIworkWorkflowFlag){
createIWorkflow(entity, docFile); CommonResult<IWorkOperationRespDTO> iworkkResult = createIWorkflow(entity, docFile);
log.error("iworkkResult: " + JSONObject.toJSONString(iworkkResult));
} }
} }
@@ -94,6 +95,7 @@ public class ReportDocumentAssistService {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
IWorkWorkflowCreateReqDTO dto = new IWorkWorkflowCreateReqDTO(); IWorkWorkflowCreateReqDTO dto = new IWorkWorkflowCreateReqDTO();
dto.setOperatorUserId(String.valueOf(loginUser.getId()));
dto.setJbr(String.valueOf(loginUser.getId())); dto.setJbr(String.valueOf(loginUser.getId()));
dto.setYybm(String.valueOf(loginUser.getVisitDeptId())); dto.setYybm(String.valueOf(loginUser.getVisitDeptId()));
dto.setFb(String.valueOf(loginUser.getVisitCompanyId())); dto.setFb(String.valueOf(loginUser.getVisitCompanyId()));