|
@ -183,6 +183,9 @@ public class WlyyDeviceService {
|
|
manufacturer.setManufacturerName(device.getManufacturer());
|
|
manufacturer.setManufacturerName(device.getManufacturer());
|
|
manufacturer.setCzrq(new Date());
|
|
manufacturer.setCzrq(new Date());
|
|
deviceManufacturerDao.save(manufacturer);
|
|
deviceManufacturerDao.save(manufacturer);
|
|
|
|
}else {
|
|
|
|
device.setManufacturerCode(manufacturer.getManufacturerCode());
|
|
|
|
device.setManufacturer(manufacturer.getManufacturerName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
device.setIsGrant(0);
|
|
device.setIsGrant(0);
|
|
@ -354,8 +357,22 @@ public class WlyyDeviceService {
|
|
device.setGrantOrgCode(data);
|
|
device.setGrantOrgCode(data);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
//根据仪器名称设定绑定次数
|
|
|
|
|
|
//发放时间
|
|
dataMap.put(21, new ExcelData() {
|
|
dataMap.put(21, new ExcelData() {
|
|
|
|
@Override
|
|
|
|
public void transform(String data) {
|
|
|
|
if(StringUtils.isNotBlank(data)) {
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
try {
|
|
|
|
device.setGrantTime(simpleDateFormat.parse(data));
|
|
|
|
} catch (ParseException e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
//根据仪器名称设定绑定次数
|
|
|
|
dataMap.put(22, new ExcelData() {
|
|
@Override
|
|
@Override
|
|
public void transform(String data) {
|
|
public void transform(String data) {
|
|
if(device.getBindingCount() == null) {
|
|
if(device.getBindingCount() == null) {
|
|
@ -367,6 +384,7 @@ public class WlyyDeviceService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
return dataMap;
|
|
return dataMap;
|
|
}
|
|
}
|
|
|
|
|