Commit 7b3eb7ac authored by 刘林's avatar 刘林

fix(jg):登记证管理管道下载的汇总表的检验结论枚举未转为名称

parent 0418506c
...@@ -29,6 +29,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; ...@@ -29,6 +29,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil; import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory; import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto; import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.common.api.enums.JYJCResultEnum;
import com.yeejoin.amos.boot.module.jg.api.dto.*; import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*; import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.*; import com.yeejoin.amos.boot.module.jg.api.enums.*;
...@@ -2675,6 +2676,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2675,6 +2676,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (CollectionUtils.isNotEmpty(equipmentList)) { if (CollectionUtils.isNotEmpty(equipmentList)) {
equipmentList.forEach(map -> { equipmentList.forEach(map -> {
String record = (String) map.get("record"); String record = (String) map.get("record");
map.put("inspectConclusion", Objects.requireNonNull(JYJCResultEnum.getNameByCode(String.valueOf(map.get("inspectConclusion")))).getName());
if ((whetherToFilterStatus || this.checkEquStatusInUse(record))) { if ((whetherToFilterStatus || this.checkEquStatusInUse(record))) {
allEquipment.add(new JSONObject(map)); allEquipment.add(new JSONObject(map));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment