diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java index 53d8b5558..a18c0b785 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java @@ -98,4 +98,13 @@ public class EleEpdPqdVO implements Serializable { @ApiModelProperty(value = "参数缺省值") private String defaultValue; + @ApiModelProperty(value = "限值名称") + private String limitName; + + @ApiModelProperty(value = "限值表名") + private String limitTable; + + @ApiModelProperty(value = "超标判断方式") + private String formula; + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml index e89df2db1..ceb62f318 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml @@ -31,7 +31,10 @@ ele_epd_pqd.strlen , ele_epd_pqd.default_value defaultValue, ele_epd_pqd.resources_id resourcesId, - ele_epd_pqd.status + ele_epd_pqd.status, + ele_epd_pqd.limit_name limitName, + ele_epd_pqd.limit_table limitTable, + ele_epd_pqd.formula formula from ele_epd_pqd ele_epd_pqd left join diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java index 134b2f2f4..7f2985a6b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java @@ -97,9 +97,6 @@ public class EleEpdPqdServiceImpl extends ServiceImpl