|
@@ -104,7 +104,7 @@ public class UseRegistrationReportOFData implements IDynamicOFData {
|
|
|
result.put("unitAddress",equipPipeDO.getUnitAddress());
|
|
result.put("unitAddress",equipPipeDO.getUnitAddress());
|
|
|
Area area = AreaUtils.getArea(equipPipeDO.getEquipDistrict());
|
|
Area area = AreaUtils.getArea(equipPipeDO.getEquipDistrict());
|
|
|
if(area != null){
|
|
if(area != null){
|
|
|
- result.put("equipDistrictName",equipPipeDO.getEquipDistrict());
|
|
|
|
|
|
|
+ result.put("equipDistrictName",area.getName());
|
|
|
}
|
|
}
|
|
|
result.put("deptName","-");
|
|
result.put("deptName","-");
|
|
|
result.put("industry","-");
|
|
result.put("industry","-");
|
|
@@ -138,7 +138,7 @@ public class UseRegistrationReportOFData implements IDynamicOFData {
|
|
|
JSONObject vo = new JSONObject();
|
|
JSONObject vo = new JSONObject();
|
|
|
//序号
|
|
//序号
|
|
|
vo.put("value1",String.valueOf(number.getAndIncrement()));
|
|
vo.put("value1",String.valueOf(number.getAndIncrement()));
|
|
|
- vo.put("value2",detailDO.getCertificateNo());
|
|
|
|
|
|
|
+ vo.put("value2",detailDO.getPipeRegCode());
|
|
|
vo.put("value3",detailDO.getPipeName());
|
|
vo.put("value3",detailDO.getPipeName());
|
|
|
vo.put("value4",detailDO.getPipeNo());
|
|
vo.put("value4",detailDO.getPipeNo());
|
|
|
vo.put("value5",detailDO.getPipeLevel());
|
|
vo.put("value5",detailDO.getPipeLevel());
|