Commit 3f1d2197 authored by 赵啸非's avatar 赵啸非

添加窗口导入导出模板

parent 82ca3b13
...@@ -60,12 +60,12 @@ public class WindowEntity extends WindowVo { ...@@ -60,12 +60,12 @@ public class WindowEntity extends WindowVo {
/** /**
* 红旗窗口 (1.是,0.否) * 红旗窗口 (1.是,0.否)
*/ */
@Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否") //@Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否")
private Integer hongqi; private Integer hongqi;
/** /**
* 无人值守(1.是) * 无人值守(1.是)
*/ */
@Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否") //@Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
private Integer duty; private Integer duty;
/** /**
* 显示内容 * 显示内容
......
...@@ -68,7 +68,7 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus ...@@ -68,7 +68,7 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
item.setHallId(windowHallEntity.getHallId()); item.setHallId(windowHallEntity.getHallId());
item.setHallName(windowHallEntity.getHallName()); item.setHallName(windowHallEntity.getHallName());
}else { }else {
log.info("windowhallEntity is null windowId:{}",item.getWindowId()); //log.info("windowhallEntity is null windowId:{}",item.getWindowId());
} }
} else { } else {
iterator.remove(); iterator.remove();
......
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