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:
王兴荣
2025-10-21 17:01:53 +08:00
parent 95f0a63c06 024673c75b
commit 766a749d15
7 changed files with 91 additions and 61 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.41</revision> <revision>3.0.42</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>

58
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java
View File

File diff suppressed because it is too large Load Diff

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java
View File

@@ -15,7 +15,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
public class ReportDocumentMainPageReqVO extends PageParam { public class ReportDocumentMainPageReqVO extends PageParam {
@Schema(description = "流程实例ID", example = "10765") @Schema(description = "流程实例ID", example = "10765")
private Long flowInstanceId; private String flowInstanceId;
@Schema(description = "报告类型ID", example = "2124") @Schema(description = "报告类型ID", example = "2124")
private Long reportDocumentTypeId; private Long reportDocumentTypeId;

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java
View File

@@ -19,7 +19,7 @@ public class ReportDocumentMainRespVO {
@Schema(description = "流程实例ID", example = "10765") @Schema(description = "流程实例ID", example = "10765")
@ExcelProperty("流程实例ID") @ExcelProperty("流程实例ID")
private Long flowInstanceId; private String flowInstanceId;
@Schema(description = "报告类型ID", example = "2124") @Schema(description = "报告类型ID", example = "2124")
@ExcelProperty("报告类型ID") @ExcelProperty("报告类型ID")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java
View File

@@ -15,7 +15,7 @@ public class ReportDocumentMainSaveReqVO {
private Long id; private Long id;
@Schema(description = "流程实例ID", example = "10765") @Schema(description = "流程实例ID", example = "10765")
private Long flowInstanceId; private String flowInstanceId;
@Schema(description = "报告类型ID", example = "2124") @Schema(description = "报告类型ID", example = "2124")
private Long reportDocumentTypeId; private Long reportDocumentTypeId;

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java
View File

@@ -35,7 +35,7 @@ public class ReportDocumentMainDO extends BusinessBaseDO {
* 流程实例ID * 流程实例ID
*/ */
@TableField("FLW_INSC_ID") @TableField("FLW_INSC_ID")
private Long flowInstanceId; private String flowInstanceId;
/** /**
* 报告类型ID * 报告类型ID
*/ */

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

File diff suppressed because it is too large Load Diff