Commit 062c9181 authored by suhuiguang's avatar suhuiguang

1.新增编辑报检结果时,更设备的es下次检验日期

parent 0a274c95
...@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
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.jyjc.api.common.StringUtil; import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
...@@ -116,6 +118,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -116,6 +118,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
@Autowired @Autowired
BizEmqPublisher bizEmqPublisher; BizEmqPublisher bizEmqPublisher;
@Autowired
private ESEquipmentCategory esEquipmentCategory;
/** /**
* 检验检测单位分页查询 * 检验检测单位分页查询
*/ */
...@@ -293,9 +298,21 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR ...@@ -293,9 +298,21 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
} }
//更新使用信息表 //更新使用信息表
useInfoMapper.updateByRecord(model.getEquipUnicode(), model.getNextInspectionDate(), model.getInspectionType(), model.getApplicationNo()); useInfoMapper.updateByRecord(model.getEquipUnicode(), model.getNextInspectionDate(), model.getInspectionType(), model.getApplicationNo());
this.updateEquipNextInspectDate(model);
return model; return model;
} }
private void updateEquipNextInspectDate(JyjcInspectionResultModel model) {
if (model.getNextInspectionDate() != null) {
Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(model.getEquipUnicode());
if (optional.isPresent()) {
ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
esEquipmentCategoryDto.setNEXT_INSPECT_DATE(String.valueOf(model.getNextInspectionDate().getTime()));
esEquipmentCategory.save(esEquipmentCategoryDto);
}
}
}
private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info, JyjcInspectionResultAttachment jybgFile) { private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info, JyjcInspectionResultAttachment jybgFile) {
info.setInspectOrgName(model.getInspectionUnitName()); info.setInspectOrgName(model.getInspectionUnitName());
info.setInspectType(model.getInspectionType()); info.setInspectType(model.getInspectionType());
......
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