From 3d285bc2a61024e6e4fb805c13286243430e38e3 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 28 七月 2021 19:53:58 +0800
Subject: [PATCH] 增加PAQ模板
---
src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java | 3 +--
src/main/java/com/ots/project/tool/report/reportCalculation/request/CalculationTypeEnum.java | 2 +-
src/main/java/com/ots/common/enums/ReportTypeEnum.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ots/common/enums/ReportTypeEnum.java b/src/main/java/com/ots/common/enums/ReportTypeEnum.java
index f4fa1eb..4769791 100644
--- a/src/main/java/com/ots/common/enums/ReportTypeEnum.java
+++ b/src/main/java/com/ots/common/enums/ReportTypeEnum.java
@@ -4,7 +4,7 @@
@Getter
public enum ReportTypeEnum {
Brief("Brief", "绠�鏄撶増"), Complete("Complete", "瀹屾暣鐗�"), SAQ("SAQ", "SAQ鎶ュ憡"), RuiLin("RuiLin", "鐫块偦鎶ュ憡"), CAQ("CAQ", "CAQ鎶ュ憡"),
- JAQ("JAQ","JAQ鎶ュ憡"),MAQ("MAQ", "MAQ鎶ュ憡"),PAQ("PAQ", "PAQ鎶ュ憡");
+ JAQ("JAQ","JAQ鎶ュ憡"),MAQ("MAQ", "MAQ鎶ュ憡"),MAQV2("MAQV2", "MAQV2鎶ュ憡"),PAQ("PAQ", "PAQ鎶ュ憡");
private final String code;
private final String message;
ReportTypeEnum(String code, String message) {
diff --git a/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java b/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
index 09bef81..40b7df9 100644
--- a/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
+++ b/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
@@ -93,8 +93,7 @@
"LIBPAQGS88021", "LIBPAQGS88022", "LIBPAQGS88023", "LIBPAQGS8803", "LIBPAQGS88031",
"LIBPAQGS88032", "LIBPAQGS88033", "LIBPAQGS8804", "LIBPAQGS88041", "LIBPAQGS88042",
"LIBPAQGS88043", "LIBPAQGS8805", "LIBPAQGS88051", "LIBPAQGS88052", "LIBPAQGS88053",
- "LIBPAQGS8806", "LIBPAQGS88061", "LIBPAQGS88062", "LIBPAQGS88063"
- ;
+ "LIBPAQGS8806", "LIBPAQGS88061", "LIBPAQGS88062", "LIBPAQGS88063");
}
/**
diff --git a/src/main/java/com/ots/project/tool/report/reportCalculation/request/CalculationTypeEnum.java b/src/main/java/com/ots/project/tool/report/reportCalculation/request/CalculationTypeEnum.java
index 025ee00..7a65b89 100644
--- a/src/main/java/com/ots/project/tool/report/reportCalculation/request/CalculationTypeEnum.java
+++ b/src/main/java/com/ots/project/tool/report/reportCalculation/request/CalculationTypeEnum.java
@@ -1,5 +1,5 @@
package com.ots.project.tool.report.reportCalculation.request;
public enum CalculationTypeEnum {
- MAQ, SAQ, RUILIN, CAQ, JAQ
+ MAQ, SAQ, RUILIN, CAQ, JAQ,PAQ
}
--
Gitblit v1.9.1