Commit da75ca7f authored by tianbo's avatar tianbo

修复气瓶充装后复查没有数据时追溯页面接口报错

parent 647ae98d
...@@ -9,16 +9,22 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; ...@@ -9,16 +9,22 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFileUrlDto; import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFileUrlDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.PageParam; import com.yeejoin.amos.boot.module.cylinder.api.entity.PageParam;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*; import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderAfterCheckDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderBeforeCheckDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderCheckDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderFillingDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderInspectionDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderProduceDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTagsDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.TzCylinderTraceDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo; import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo;
import com.yeejoin.amos.boot.module.cylinder.flc.api.enums.CyclinderStatus; import com.yeejoin.amos.boot.module.cylinder.flc.api.enums.CyclinderStatus;
import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.TzCylinderMapper; import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.TzCylinderMapper;
import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService; import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ITzCylinderService;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.validation.ValidationUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
...@@ -148,6 +154,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind ...@@ -148,6 +154,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
List<TzCylinderCheckDto> tzCylinderAfterCheckDtoListResult = new ArrayList<>(); List<TzCylinderCheckDto> tzCylinderAfterCheckDtoListResult = new ArrayList<>();
TzCylinderAfterCheckDto tzcylinderAfterCheckDto = tzCylinderMapper TzCylinderAfterCheckDto tzcylinderAfterCheckDto = tzCylinderMapper
.getTzCylinderAfterCheck(tzCylinderFillingDto.getFillingCheckId()); .getTzCylinderAfterCheck(tzCylinderFillingDto.getFillingCheckId());
if (!ValidationUtil.isEmpty(tzcylinderAfterCheckDto)) {
JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderAfterCheckDto)); JSONObject obj = JSONObject.parseObject(JSONObject.toJSONString(tzcylinderAfterCheckDto));
for (String str : obj.keySet()) { for (String str : obj.keySet()) {
String explain = afterMap.get(str); String explain = afterMap.get(str);
...@@ -160,6 +167,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind ...@@ -160,6 +167,7 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
} }
tzCylinderFillingDto.setTzCylinderAfterCheckDtoList(tzCylinderAfterCheckDtoListResult); tzCylinderFillingDto.setTzCylinderAfterCheckDtoList(tzCylinderAfterCheckDtoListResult);
} }
}
if(!ValidationUtil.isEmpty(tzCylinderFillingDtoList)){ if(!ValidationUtil.isEmpty(tzCylinderFillingDtoList)){
String fillingEndTime = tzCylinderFillingDtoList.iterator().next().getFillingEndtime(); String fillingEndTime = tzCylinderFillingDtoList.iterator().next().getFillingEndtime();
......
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