Browse Source

latestResultName

feature/teamB_zz_wgh
yinzuomei 3 years ago
parent
commit
065d02a126
  1. 4
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java
  2. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
  3. 6
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

4
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/EnterpriseDetailDTO.java

@ -99,6 +99,10 @@ public class EnterpriseDetailDTO implements Serializable {
*/
private String latestResult;
/**
* 最新巡查结果0:合格 1:不合格
*/
private String latestResultName;
/**
* 最新检查时间
*/

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

@ -183,6 +183,11 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode());
Map<String, String> dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
resultDto.setScaleName(dictMap.containsKey(resultDto.getScale()) ? dictMap.get(resultDto.getScale()) : StrConstant.EPMETY_STR);
if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "0".equals(enterpriseEntity.getLatestResult())) {
resultDto.setLatestResultName("合格");
} else if (StringUtils.isNotBlank(enterpriseEntity.getLatestResult()) && "1".equals(enterpriseEntity.getLatestResult())) {
resultDto.setLatestResultName("不合格");
}
return resultDto;
}

6
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

@ -52,6 +52,12 @@
ie.MOBILE,
ie.SOURCE_TYPE,
ie.LATEST_RESULT,
(
case when ie.LATEST_RESULT ='0'then '合格'
when ie.LATEST_RESULT='1' then '不合格'
else ''
end
)as latestResultName,
ie.LATEST_PATROL_TIME
FROM
ic_enterprise ie

Loading…
Cancel
Save