diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java index a81ae678d0..1983e80168 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterprisePatrolResultDTO.java @@ -45,6 +45,11 @@ public class EnterprisePatrolResultDTO implements Serializable { */ private String result; + /** + * 检查结果【0:合格 1:不合格】 + */ + private String resultName; + /** * 隐患明细 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml index b5ccb55cbe..4c35a0eecf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterprisePatrolRecordDao.xml @@ -11,6 +11,7 @@ + @@ -26,6 +27,12 @@ r.STAFF_NAME, r.MOBILE, r.RESULT, + ( + case when r.RESULT ='0'then '合格' + when r.RESULT='1' then '不合格' + else '' + end + )as RESULT_NAME, IFNULL( r.DETAILED, '' ) AS DETAILED, r.REVIEW_TIME FROM