|
@@ -2494,7 +2494,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
|
|
|
}
|
|
|
Object object1 = entrust.get("specification_model");
|
|
|
if (object1 != null) {
|
|
|
- resultMap.put("specificationModel", object1);
|
|
|
+ resultMap.put(TrialTableDataInfo.TrialTableElementEnum.SPECIFICATION_MODEL.getKey(), object1);
|
|
|
}
|
|
|
}
|
|
|
if (record.getBaseInfo() != null && !record.getBaseInfo().isEmpty()) {
|
|
@@ -2502,10 +2502,10 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
|
|
|
TrialSeleInspectionRecordBaseInfoDTO baseInfoDTO = JSON.parseObject(record.getBaseInfo(), TrialSeleInspectionRecordBaseInfoDTO.class);
|
|
|
if (baseInfoDTO != null) {
|
|
|
if (StringUtil.hasText(baseInfoDTO.getEntrustNo())) {
|
|
|
- resultMap.put("entrustNo",baseInfoDTO.getEntrustNo());
|
|
|
+ resultMap.put(TrialTableDataInfo.TrialTableElementEnum.ENTRUST_NO.getKey(), baseInfoDTO.getEntrustNo());
|
|
|
}
|
|
|
if (StringUtil.hasText(baseInfoDTO.getProjectPosition())) {
|
|
|
- resultMap.put("projectPosition",baseInfoDTO.getProjectPosition());
|
|
|
+ resultMap.put(TrialTableDataInfo.TrialTableElementEnum.PROJECT_POSITION.getKey(), baseInfoDTO.getProjectPosition());
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|