| @@ -757,13 +757,13 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| List<Map> successList = datalist.getList(); | List<Map> successList = datalist.getList(); | ||||
| if(successList.size() > 0) { | if(successList.size() > 0) { | ||||
| boolean allSuccess = true; | boolean allSuccess = true; | ||||
| Long cuteId = (Long)successList.get(0).get("编码"); | |||||
| String cuteId = (String)successList.get(0).get("编码"); | |||||
| try { | try { | ||||
| successList.parallelStream().forEach(reading -> { | successList.parallelStream().forEach(reading -> { | ||||
| Long id = (Long) reading.get("抄表数据编码"); | |||||
| String id = (String) reading.get("抄表数据编码"); | |||||
| WxEnergyMeterReading r = new WxEnergyMeterReading(); | WxEnergyMeterReading r = new WxEnergyMeterReading(); | ||||
| r.updateTenantInfo(user); | r.updateTenantInfo(user); | ||||
| r.setId(id); | |||||
| r.setId(Long.parseLong(id)); | |||||
| r.setPrice((String)reading.get("单价(*)")); | r.setPrice((String)reading.get("单价(*)")); | ||||
| r.setCurNumber((String)reading.get("本次抄表数")); | r.setCurNumber((String)reading.get("本次抄表数")); | ||||
| r.setUpdateBy(user.getId()); | r.setUpdateBy(user.getId()); | ||||
| @@ -775,10 +775,10 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| logger.error("导入模板失败:"+e.getMessage(),e); | logger.error("导入模板失败:"+e.getMessage(),e); | ||||
| allSuccess = false; | allSuccess = false; | ||||
| } | } | ||||
| if (null != cuteId) { | |||||
| if (StringUtils.isNotBlank(cuteId)) { | |||||
| WxEnergyReadingCalcute c= new WxEnergyReadingCalcute(); | WxEnergyReadingCalcute c= new WxEnergyReadingCalcute(); | ||||
| c.updateTenantInfo(user); | c.updateTenantInfo(user); | ||||
| c.setId(cuteId); | |||||
| c.setId(Long.parseLong(cuteId)); | |||||
| c.setIsImported(EnumYesOrNo.YES.getCode()); | c.setIsImported(EnumYesOrNo.YES.getCode()); | ||||
| c.setUpdateTime(new Date()); | c.setUpdateTime(new Date()); | ||||
| c.setUpdateBy(user.getId()); | c.setUpdateBy(user.getId()); | ||||