Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

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-时间

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-时间

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-时间

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-时间

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-时间

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-时间

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-时间

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 @@
       <if test="reqVO.sampleFlowNodeTime != null and reqVO.sampleFlowNodeTime.length == 2">
             AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]}
       </if>
+      <if test="reqVO.sampleStatus != null and reqVO.sampleStatus != ''">
+            AND tbssag.SMP_STS = #{reqVO.sampleStatus}
+      </if>
       <if test="reqVO.sampleCode != null and reqVO.sampleCode != ''">
             AND tbss.SMP_CD = #{reqVO.sampleCode}
       </if>