Commit da590571 authored by tianyiming's avatar tianyiming

修改

parent 4d0f2994
......@@ -147,6 +147,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Override
public Map<String, String> createSupervisorCode(Map<String, Object> map, String record) {
String city, county, equipCategory;
EquInfoDto equInfoDto = new EquInfoDto();
if (ObjectUtils.isEmpty(record)) {
//获取对应行政区划
county = EquipmentCategoryEnum.XZQH.getCode();
......@@ -154,7 +155,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
//获取对应设备分类
equipCategory = map.get("equCategory").toString();
} else {
EquInfoDto equInfoDto = categoryOtherInfoMapper.selectEquipInfo(record);
equInfoDto = categoryOtherInfoMapper.selectEquipInfo(record);
//判断这条数据认领状态是否为已认领(6035),且是否已经有电梯96333码和监管码
//如果都满足则直接返回不做生成码操作
if (!ObjectUtils.isEmpty(equInfoDto) && "6035".equals(equInfoDto.getStatus())) {
......@@ -177,7 +178,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
String equState = EquipmentCategoryEnum.CSZT.getCode();
if (!ObjectUtils.isEmpty(record)) {
EquInfoDto equInfoDto = categoryOtherInfoMapper.selectEquipInfo(record);
String supervisorCode, elevatorCode;
//设备状态为报废,对应电梯码作废
equState = EquipmentCategoryEnum.BF.getCode().equals(equInfoDto.getEquState()) ? EquipmentCategoryEnum.WSY.getCode() : EquipmentCategoryEnum.YSY.getCode();
......
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