From 42ec7fc228b35d298a68d8043cc52b33f3f032e5 Mon Sep 17 00:00:00 2001 From: wxr Date: Fri, 10 Oct 2025 20:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/controller/vo/BusinessAssayTaskPageReqVO.java | 3 --- .../business/bus/controller/vo/BusinessAssayTaskRespVO.java | 4 ---- .../bus/controller/vo/BusinessAssayTaskSaveReqVO.java | 4 ---- .../qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java | 5 ----- .../qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java | 1 - .../sample/entrust/SampleEntrustGenSampleDataCmp.java | 2 -- .../module/qms/core/liteflow/parser/QmsXmlFlowELParser.java | 2 +- 7 files changed, 1 insertion(+), 20 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java index 3f1738a..d921401 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java @@ -59,9 +59,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", example = "1") private String taskStatus; - @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", example = "1") - private String synchronousStatus; - @Schema(description = "标样业务ID", example = "11493") private Long standardSampleId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java index d0cb666..cdbf2a4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java @@ -70,10 +70,6 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交") private String taskStatus; - @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步") - private String synchronousStatus; - @Schema(description = "标样业务ID", example = "11493") @ExcelProperty("标样业务ID") private Long standardSampleId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java index 64a5afa..423cba5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java @@ -64,10 +64,6 @@ public class BusinessAssayTaskSaveReqVO { @NotEmpty(message = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交不能为空") private String taskStatus; - @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotEmpty(message = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步不能为空") - private String synchronousStatus; - @Schema(description = "标样业务ID", example = "11493") private Long standardSampleId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java index 1500570..71dd0f2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java @@ -107,11 +107,6 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("TSK_STS") private String taskStatus; /** - * 同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步 - */ - @TableField("SYNC_STS") - private String synchronousStatus; - /** * 标样业务ID */ @TableField("STD_SMP_ID") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java index 30c5cff..aa756a1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java @@ -40,7 +40,6 @@ public interface BusinessAssayTaskMapper extends BaseMapperX