Commit bb4dc1de authored by 韩桐桐's avatar 韩桐桐

fix(jg):代码回滚

parent 385d7dbc
...@@ -280,17 +280,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -280,17 +280,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
return useTime <= 0; return useTime <= 0;
} }
/**
*
* 查询设备是否有检验检测信息
* @param record
* @return
*/
private Boolean whetherThereIsInspectionInformation(String record) {
IdxBizJgInspectionDetectionInfo info = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
return !ObjectUtils.isEmpty(info) && !ObjectUtils.isEmpty(info.getInspectType()) && !ObjectUtils.isEmpty(info.getInspectConclusion()) &&
!ObjectUtils.isEmpty(info.getInspectOrgCode()) && !ObjectUtils.isEmpty(info.getInspectOrgName());
}
private String getTipMsgString(String record) { private String getTipMsgString(String record) {
IdxBizJgRegisterInfo registerInfo = this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record)); IdxBizJgRegisterInfo registerInfo = this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record));
...@@ -1333,8 +1322,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1333,8 +1322,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : ""); item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : "");
item.put("CAN_EDIT", this.checkEquipIsCanEdit(item.getString("SEQUENCE_NBR"))); item.put("CAN_EDIT", this.checkEquipIsCanEdit(item.getString("SEQUENCE_NBR")));
item.put("CAN_DELETE", this.checkEquipIsCanDelete(item.getString("SEQUENCE_NBR"))); item.put("CAN_DELETE", this.checkEquipIsCanDelete(item.getString("SEQUENCE_NBR")));
// 设备有无检验检测信息
item.put("HAS_INSPECTION", this.whetherThereIsInspectionInformation(item.getString("SEQUENCE_NBR")));
} }
} }
totle = response.getInternalResponse().hits().getTotalHits().value; totle = response.getInternalResponse().hits().getTotalHits().value;
......
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