feat(watch): 手表设备导出新增用户单位和用户部门字段
This commit is contained in:
@@ -25,6 +25,10 @@ public class ToolExport {
|
|||||||
private String workNo;
|
private String workNo;
|
||||||
@Excel(name = "绑定用户")
|
@Excel(name = "绑定用户")
|
||||||
private String realName;
|
private String realName;
|
||||||
|
@Excel(name = "用户单位")
|
||||||
|
private String userOrgName;
|
||||||
|
@Excel(name = "用户部门")
|
||||||
|
private String userDeptName;
|
||||||
@Excel(name = "绑定日期", format = "yyyy-MM-dd", width = 30)
|
@Excel(name = "绑定日期", format = "yyyy-MM-dd", width = 30)
|
||||||
private Date bindDate;
|
private Date bindDate;
|
||||||
@Excel(name = "心率")
|
@Excel(name = "心率")
|
||||||
|
|||||||
+2
@@ -2214,6 +2214,8 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
|
|||||||
tool.setBindStatus("1".equals(f.getWatchStatus()) ? "已绑定" : "未绑定");
|
tool.setBindStatus("1".equals(f.getWatchStatus()) ? "已绑定" : "未绑定");
|
||||||
tool.setWorkNo(f.getWorkNo());
|
tool.setWorkNo(f.getWorkNo());
|
||||||
tool.setRealName(f.getBindRealName());
|
tool.setRealName(f.getBindRealName());
|
||||||
|
tool.setUserOrgName(f.getUserTwoOrgName());
|
||||||
|
tool.setUserDeptName(f.getUserThreeOrgName());
|
||||||
tool.setBindDate(f.getBindDate());
|
tool.setBindDate(f.getBindDate());
|
||||||
if (StrUtil.isNotBlank(f.getBindRealName())) {
|
if (StrUtil.isNotBlank(f.getBindRealName())) {
|
||||||
fillSwitch(tool, f.getSwitchList());
|
fillSwitch(tool, f.getSwitchList());
|
||||||
|
|||||||
Reference in New Issue
Block a user