diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPlanRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPlanRespVO.java
index 185e0acf..ef347f61 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPlanRespVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPlanRespVO.java
@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.resource.device.controller.vo;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@@ -34,6 +35,7 @@ public class DeviceCalibrationPlanRespVO {
@Schema(description = "审批状态", example = "2")
@ExcelProperty("审批状态")
+ @Dict(dicCode = "flow_status")
private String flowStatus;
@Schema(description = "申请标题")
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java
index 70088f81..4d37ce38 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java
@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.resource.device.controller.vo;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@@ -82,6 +83,7 @@ public class DeviceCalibrationRespVO {
@Schema(description = "检定校准状态", example = "2")
@ExcelProperty("检定校准状态")
+ @Dict(dicCode = "flow_status")
private String flowStatus;
@Schema(description = "流程实例id", example = "24905")
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckPlanRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckPlanRespVO.java
index a4a829fd..acc372a1 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckPlanRespVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckPlanRespVO.java
@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.resource.device.controller.vo;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@@ -30,6 +31,7 @@ public class DevicePeriodCheckPlanRespVO {
@Schema(description = "审批状态", example = "2")
@ExcelProperty("审批状态")
+ @Dict(dicCode = "flow_status")
private String flowStatus;
@Schema(description = "流程实例id", example = "27595")
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java
index 0a720ad2..59c2ee07 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java
@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.resource.device.controller.vo;
+import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@@ -90,6 +91,7 @@ public class DevicePeriodCheckRespVO {
@Schema(description = "审批状态", example = "2")
@ExcelProperty("审批状态")
+ @Dict(dicCode = "flow_status")
private String flowStatus;
@Schema(description = "流程实例id", example = "31647")
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
index 65e9933e..536c9022 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
@@ -112,6 +112,7 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B
data.setSpecification(rule.getStandard());
data.setCheckType(rule.getCalibrationCheckType());
data.setFrequencyRemark(rule.getFrequencyRemark());
+ data.setFlowStatus(QmsCommonConstant.NOT_START);
checkList.add(data);
}
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
index 5fd5149e..42e492a7 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
@@ -115,6 +115,7 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B
data.setCheckPersonRemark(rule.getTreatmentUser());
data.setCheckAccording(rule.getTreatmentMethod());
data.setFrequencyRemark(rule.getFrequencyRemark());
+ data.setFlowStatus(QmsCommonConstant.NOT_START);
checkList.add(data);
}
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
index 7e778956..9f9154c6 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
@@ -105,7 +105,7 @@
and c.PLN_ID = #{param.planId}
- and d.EFCT_FLG = #{param.effectiveFlag}
+ and c.EFCT_FLG = #{param.effectiveFlag}
and d.DEPT_ID = #{param.deptId}
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
index 6a5e431a..04e05d19 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
@@ -110,7 +110,7 @@
and c.PLN_ID = #{param.planId}
- and d.EFCT_FLG = #{param.effectiveFlag}
+ and c.EFCT_FLG = #{param.effectiveFlag}
and d.DEPT_ID = #{param.deptId}