diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayParameterDataDO.java
index 8cdd51e..adb8cd6 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayParameterDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayParameterDataDO.java
@@ -54,7 +54,7 @@ public class BusinessAssayParameterDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java
index 3da3238..d3bcdbc 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java
@@ -59,7 +59,7 @@ public class BusinessAssayProjectDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskParameterDataDO.java
index e47bf67..04e3d4e 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskParameterDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskParameterDataDO.java
@@ -44,7 +44,7 @@ public class BusinessAssayTaskParameterDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java
index a652841..f8f06ce 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java
@@ -54,7 +54,7 @@ public class BusinessQCCoefficientParameterDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java
index 843c3d9..3bfd61b 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java
@@ -54,7 +54,7 @@ public class BusinessQCManagementParameterDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java
index c23a5b5..95eda72 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java
@@ -59,7 +59,7 @@ public class BusinessQCManagementProjectDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementSampleParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementSampleParameterDataDO.java
index c84d806..d94b4b3 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementSampleParameterDataDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementSampleParameterDataDO.java
@@ -44,7 +44,7 @@ public class BusinessQCManagementSampleParameterDataDO extends BusinessBaseDO {
/**
* 值
*/
- @TableField("VAL")
+ @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value;
/**
* 数据类型,字典表【T_DIC_BSN】string-字符串,int-整数,decimal-小数,date-日期,datetime-时间
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
index 8db0784..d4fe6b4 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
@@ -151,6 +151,9 @@
tbatd.CFG_ASY_MTHD_ID = tcam.ID
LEFT JOIN T_BSN_BSE_SMP tbbs ON
tbatd.BSN_BSE_SMP_ID = tbbs.ID
+ LEFT JOIN T_BSN_SB_SMP_ANL_GRP tbssag ON
+ tbatd.BSN_SB_SMP_ID = tbssag.BSN_SB_SMP_ID
+ AND tbatd.ASY_DEPT_ID = tbssag.ASY_DEPT_ID
LEFT JOIN T_CFG_BSE_SMP tcbs ON
tbbs.CFG_BSE_SMP_ID = tcbs.ID
WHERE
@@ -165,6 +168,9 @@
AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]}
+
+ AND tbssag.SMP_STS = #{reqVO.sampleStatus}
+
AND tbss.SMP_CD = #{reqVO.sampleCode}