fix:期间核查、检定校准增加formId字段

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPageReqVO.java

@@ -74,6 +74,9 @@ public class DeviceCalibrationPageReqVO extends PageParam {
     @Schema(description = "流程实例id", example = "24905")
     private String flowInstanceId;
 
+    @Schema(description = "表单id")
+    private Long formId;
+
     @Schema(description = "作废状态")
     private Integer cancelFlag;
 

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

@@ -90,6 +90,9 @@ public class DeviceCalibrationRespVO {
     @ExcelProperty("流程实例id")
     private String flowInstanceId;
 
+    @Schema(description = "表单id")
+    private Long formId;
+
     @Schema(description = "作废状态")
     @ExcelProperty("作废状态")
     private Integer cancelFlag;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationSaveReqVO.java

@@ -68,6 +68,9 @@ public class DeviceCalibrationSaveReqVO {
     @Schema(description = "流程实例id", example = "24905")
     private String flowInstanceId;
 
+    @Schema(description = "表单id")
+    private Long formId;
+
     @Schema(description = "作废状态")
     private Integer cancelFlag;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckPageReqVO.java

@@ -78,6 +78,9 @@ public class DevicePeriodCheckPageReqVO extends PageParam {
     @Schema(description = "流程实例id", example = "31647")
     private String flowInstanceId;
 
+    @Schema(description = "表单id")
+    private Long formId;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

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

@@ -98,6 +98,10 @@ public class DevicePeriodCheckRespVO {
     @ExcelProperty("流程实例id")
     private String flowInstanceId;
 
+    @Schema(description = "表单id")
+    @ExcelProperty("表单id")
+    private Long formId;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckSaveReqVO.java

@@ -74,6 +74,9 @@ public class DevicePeriodCheckSaveReqVO {
     @Schema(description = "流程实例id", example = "31647")
     private String flowInstanceId;
 
+    @Schema(description = "表单id")
+    private Long formId;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceCalibrationDO.java

@@ -121,6 +121,9 @@ public class DeviceCalibrationDO extends BusinessBaseDO {
     */
     @TableField("FLW_INSC_ID")
     private String flowInstanceId;
+
+    @TableField("FORM_ID")
+    private Long formId;
     /**
     * 作废状态
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DevicePeriodCheckDO.java

@@ -131,6 +131,10 @@ public class DevicePeriodCheckDO extends BusinessBaseDO {
     */
     @TableField("FLW_INSC_ID")
     private String flowInstanceId;
+
+    @TableField("FORM_ID")
+    private Long formId;
+
     /**
     * 所属部门
     */

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.java

@@ -55,7 +55,7 @@ public interface DeviceCalibrationMapper extends BaseMapperX<DeviceCalibrationDO
     /*
      * 查询指定设备的最新数据
      * */
-    List<DeviceCalibrationDO> getLastDataCheckList(@Param("param") JSONObject param);
+    List<DeviceCalibrationVO> getLastDataCheckList(@Param("param") JSONObject param);
 
     IPage<DeviceCalibrationVO> queryPageList(Page<DeviceCalibrationPageReqVO> page, @Param("param") DeviceCalibrationPageReqVO param);
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.java

@@ -53,7 +53,7 @@ public interface DevicePeriodCheckMapper extends BaseMapperX<DevicePeriodCheckDO
     /*
     * 查询指定设备的最新数据
     * */
-    List<DevicePeriodCheckDO> getLastDataCheckList(@Param("param") JSONObject param);
+    List<DevicePeriodCheckVO> getLastDataCheckList(@Param("param") JSONObject param);
 
     IPage<DevicePeriodCheckVO> queryPageList(Page<DevicePeriodCheckPageReqVO> page, @Param("param") DevicePeriodCheckPageReqVO param);
 }