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

fix:iwork用印回传调试

Browse Source
This commit is contained in:
FCL
2026-03-12 14:20:07 +08:00
parent 8823952bad
commit 199dd7715e
4 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/constant/ReportDocConstant.java Normal file
View File

@@ -0,0 +1,8 @@
package com.zt.plat.module.qms.business.reportdoc.constant;
public class ReportDocConstant {
public static final String REPORT_DOCUMENT_BUSINESS_FILE_SOURCE_QMS = "qms.reportdoc";
public static final String REPORT_DOCUMENT_BUSINESS_FILE_SOURCE_IWORK = "iwork";
}

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

File diff suppressed because it is too large Load Diff

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

@@ -471,11 +471,15 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
String firstActivityFlag = "0"; String firstActivityFlag = "0";
if(!fieldExtensions.isEmpty()){ if(!fieldExtensions.isEmpty()){
for(int i = 0; i < fieldExtensions.size(); i++){ for(int i = 0; i < fieldExtensions.size(); i++){
JSONObject fieldExtension = fieldExtensions.getJSONObject(i); JSONObject extension = fieldExtensions.getJSONObject(i);
if(fieldExtension.getString("fieldName").equalsIgnoreCase(QmsBpmConstant.BPM_LAST_ACTIVITY_FLAG)){ String fieldName = extension.getString("fieldName");
String stringValue = extension.getString("stringValue");
if(ObjectUtils.isEmpty(stringValue))
stringValue = "";
if(fieldName.equalsIgnoreCase(QmsBpmConstant.BPM_LAST_ACTIVITY_FLAG) && stringValue.equals("1")){
lastActivityFlag = "1"; lastActivityFlag = "1";
} }
if(fieldExtension.getString("fieldName").equalsIgnoreCase(QmsBpmConstant.BPM_FIRST_ACTIVITY_FLAG)){ if(fieldName.equalsIgnoreCase(QmsBpmConstant.BPM_FIRST_ACTIVITY_FLAG) && stringValue.equals("1")){
firstActivityFlag = "1"; firstActivityFlag = "1";
} }
} }

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/rpc/config/RpcConfiguration.java
View File

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.framework.rpc.config;
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.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;
import com.zt.plat.module.system.api.iwork.IWorkIntegrationApi; import com.zt.plat.module.system.api.iwork.IWorkIntegrationApi;
@@ -13,6 +14,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration(value = "qmsRpcConfiguration", proxyBeanMethods = false) @Configuration(value = "qmsRpcConfiguration", proxyBeanMethods = false)
@EnableFeignClients(clients = {FileApi.class, SequenceApi.class, AdminUserApi.class, DeptApi.class, BpmProcessInstanceApi.class, BpmTaskApi.class, PermissionApi.class, IWorkIntegrationApi.class}) @EnableFeignClients(clients = {FileApi.class, BusinessFileApi.class, SequenceApi.class, AdminUserApi.class, DeptApi.class, BpmProcessInstanceApi.class, BpmTaskApi.class, PermissionApi.class, IWorkIntegrationApi.class})
public class RpcConfiguration { public class RpcConfiguration {
} }