diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 3fba744b4..1b9ee69da 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -100,6 +100,15 @@
AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId}
+
+ AND prd.is_must = #{paramsReportDetailVO.isMust}
+
+
+ AND prd.duty_territory in
+
+ #{item}
+
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
index 766c7fa43..54ccc6952 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
@@ -72,4 +72,9 @@ public class ParamsReportDetailVO {
@TableField(exist = false)
private String orderBySql;
+
+ @TableField(exist = false)
+ private String isMust;
+ @TableField(exist = false)
+ private String dutyTerritory;
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
index 767676d4c..45a01d810 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
@@ -11,13 +11,13 @@ public enum ProjectTaskPlanningNameEnum {
// ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins
ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification
- LIST_CONFIRMATION("清单发布","List Publishing"),
- LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"),
- DESIGN_DEADLINE("设计核查","Design Verification"),
- PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo value:Pre-Homo
- ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins
- VERIFY_DEADLINE("验证核查","Verification And Verification"),
- CERTIFICATION_SUBMISSION("认证提交","Certification Submission"),
+ LIST_CONFIRMATION("清单发布","List Release"),
+ LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirm"),
+ DESIGN_DEADLINE("设计核查","Design Check"),
+ PREHOMO_DEADLINE("摸底开始","Pre-Homo Starts"), // name:Pre-Homo value:Pre-Homo
+ ATTESTATION_START_TIME("认证开始","Homo Starts"),// name:认证开始 value:Certification begins
+ VERIFY_DEADLINE("验证核查","Validation Check"),
+ CERTIFICATION_SUBMISSION("认证提交","Application Submitted"),
G_ZERO("G0","G0"),
G_ONE("G1","G1"),
G_TWO("G2","G2"),
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 211482e7f..d2648473c 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -94,10 +94,10 @@
-
+
{{$t('yes')}}
-
+
{{$t('notOnlyRz')}}