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

fix:设备微调

Browse Source
This commit is contained in:
FCL
2026-03-24 15:35:52 +08:00
parent da0ad407dc
commit 05cd6869a9
8 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPlanRespVO.java
View File

@@ -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 = "申请标题")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationRespVO.java
View File

@@ -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")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckPlanRespVO.java
View File

@@ -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")

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckRespVO.java
View File

@@ -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")

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
View File

@@ -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);
}

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
View File

@@ -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);
}

2
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
View File

@@ -105,7 +105,7 @@
and c.PLN_ID = #{param.planId}
</if>
<if test="param.effectiveFlag != null and param.effectiveFlag != ''">
and d.EFCT_FLG = #{param.effectiveFlag}
and c.EFCT_FLG = #{param.effectiveFlag}
</if>
<if test="param.deptId != null">
and d.DEPT_ID = #{param.deptId}

2
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
View File

@@ -110,7 +110,7 @@
and c.PLN_ID = #{param.planId}
</if>
<if test="param.effectiveFlag != null and param.effectiveFlag != ''">
and d.EFCT_FLG = #{param.effectiveFlag}
and c.EFCT_FLG = #{param.effectiveFlag}
</if>
<if test="param.deptId != null">
and d.DEPT_ID = #{param.deptId}