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

方法变更添加查询条件，检测项目及参数值保存允许为Null

Browse Source
This commit is contained in:
王兴荣
2025-12-31 16:34:02 +08:00
parent f5fc940f54
commit 227960e9b1
8 changed files with 13 additions and 7 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/business/bus/dal/dataobject/BusinessAssayParameterDataDO.java
View File

@@ -54,7 +54,7 @@ public class BusinessAssayParameterDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayProjectDataDO.java
View File

@@ -59,7 +59,7 @@ public class BusinessAssayProjectDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskParameterDataDO.java
View File

@@ -44,7 +44,7 @@ public class BusinessAssayTaskParameterDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java
View File

@@ -54,7 +54,7 @@ public class BusinessQCCoefficientParameterDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java
View File

@@ -54,7 +54,7 @@ public class BusinessQCManagementParameterDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java
View File

@@ -59,7 +59,7 @@ public class BusinessQCManagementProjectDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementSampleParameterDataDO.java
View File

@@ -44,7 +44,7 @@ public class BusinessQCManagementSampleParameterDataDO extends BusinessBaseDO {
/** /**
* 值 * 值
*/ */
@TableField("VAL") @TableField(value = "VAL", updateStrategy = FieldStrategy.ALWAYS)
private String value; private String value;
/** /**
* 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间

6
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
View File

@@ -151,6 +151,9 @@
tbatd.CFG_ASY_MTHD_ID = tcam.ID tbatd.CFG_ASY_MTHD_ID = tcam.ID
LEFT JOIN T_BSN_BSE_SMP tbbs ON LEFT JOIN T_BSN_BSE_SMP tbbs ON
tbatd.BSN_BSE_SMP_ID = tbbs.ID 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 LEFT JOIN T_CFG_BSE_SMP tcbs ON
tbbs.CFG_BSE_SMP_ID = tcbs.ID tbbs.CFG_BSE_SMP_ID = tcbs.ID
WHERE WHERE
@@ -165,6 +168,9 @@
<if test="reqVO.sampleFlowNodeTime != null and reqVO.sampleFlowNodeTime.length == 2"> <if test="reqVO.sampleFlowNodeTime != null and reqVO.sampleFlowNodeTime.length == 2">
AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]} AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]}
</if> </if>
<if test="reqVO.sampleStatus != null and reqVO.sampleStatus != ''">
AND tbssag.SMP_STS = #{reqVO.sampleStatus}
</if>
<if test="reqVO.sampleCode != null and reqVO.sampleCode != ''"> <if test="reqVO.sampleCode != null and reqVO.sampleCode != ''">
AND tbss.SMP_CD = #{reqVO.sampleCode} AND tbss.SMP_CD = #{reqVO.sampleCode}
</if> </if>