diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectAndParameterRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectAndParameterRespVO.java index ce9ac89..a989adf 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectAndParameterRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectAndParameterRespVO.java @@ -42,6 +42,10 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable { /** 结果值 **/ @Schema(description = "结果值") private String value; + + /** 符号,=、>、<、等 **/ + @Schema(description = "符号,=、>、<、等") + private String symbol; @Schema(description = "是否允许为空") private Integer isNull; 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 f69102f..8cdd51e 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 @@ -47,6 +47,11 @@ public class BusinessAssayParameterDataDO extends BusinessBaseDO { @TableField("DIC_PRM_ID") private Long dictionaryParameterId; /** + * 符号,=、>、<、等 + */ + @TableField("SMB") + private String symbol; + /** * 值 */ @TableField("VAL") 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 5be6059..a652841 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 @@ -47,6 +47,11 @@ public class BusinessQCCoefficientParameterDataDO extends BusinessBaseDO { @TableField("DIC_PRM_ID") private Long dictionaryParameterId; /** + * 符号,=、>、<、等 + */ + @TableField("SMB") + private String symbol; + /** * 值 */ @TableField("VAL") 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 88d7026..843c3d9 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 @@ -47,6 +47,11 @@ public class BusinessQCManagementParameterDataDO extends BusinessBaseDO { @TableField("DIC_PRM_ID") private Long dictionaryParameterId; /** + * 符号,=、>、<、等 + */ + @TableField("SMB") + private String symbol; + /** * 值 */ @TableField("VAL") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.java index e1c897f..68f2e52 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.java @@ -39,6 +39,7 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX projectAndParameterList2 = businessAssayProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { HashedMap newMap = SerializationUtils.clone(map); - newMap.put(ep.getName(), ep.getValue()); +// newMap.put(ep.getName(), ep.getValue()); + newMap.put("projectName", ep.getName()); + newMap.put("projectValue", ep.getValue()); if (StringUtils.isNotEmpty(ep.getFormula())) { BusinessAssayParameterDataReqVO parameterDataSearch = new BusinessAssayParameterDataReqVO(); parameterDataSearch.setBusinessAssayProjectDataId(ep.getId()); @@ -498,7 +500,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic List projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2); for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) { HashedMap newMap = SerializationUtils.clone(map); - newMap.put(ep.getName(), ep.getValue()); +// newMap.put(ep.getName(), ep.getValue()); + newMap.put("projectName", ep.getName()); + newMap.put("projectValue", ep.getValue()); if (StringUtils.isNotEmpty(ep.getFormula())) { BusinessQCManagementParameterDataReqVO parameterDataSearch = new BusinessQCManagementParameterDataReqVO(); parameterDataSearch.setBusinessQCManagementProjectDataId(ep.getId());