Commit 6c9c03ea authored by hekaiwen's avatar hekaiwen

bug25219修改

考虑维保包含多个数据情况
parent 38cc221c
...@@ -184,10 +184,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -184,10 +184,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
} }
} else { } else {
//如果EQU_DEFINE是数字进行转换 //如果EQU_DEFINE是数字进行转换
String equDefineCode = objects.getJSONObject(0).getString("EQU_DEFINE"); for (int i = 0; i < objects.size(); i++) {
if(equDefineCode.chars().anyMatch(Character::isDigit)){
JSONObject firstObject = objects.getJSONObject(0); JSONObject currentObject = objects.getJSONObject(i);
firstObject.put("EQU_DEFINE", maintenanceContractMapper.getNameByEquDefine(equDefineCode)); String equDefineCode = currentObject.getString("EQU_DEFINE");
if (equDefineCode.chars().anyMatch(Character::isDigit)) {
currentObject.put("EQU_DEFINE", maintenanceContractMapper.getNameByEquDefine(equDefineCode));
}
} }
List equList = objects.toJavaList(Map.class); List equList = objects.toJavaList(Map.class);
vo.setEquipmentLists(equList); vo.setEquipmentLists(equList);
......
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