提交 e880d974 authored 作者: 000516's avatar 000516 提交者: Coding

打卡时间、打卡地址判断是否存在,不存在则不上传

Merge Request: 打卡时间、打卡地址判断是否存在,不存在则不上传 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/wangxiaolu-export/git/merge/189?initial=true
...@@ -162,11 +162,19 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe ...@@ -162,11 +162,19 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
rowClockData.add("0"); rowClockData.add("0");
} }
// 打卡时间 // 打卡时间
StringBuilder timeSb = new StringBuilder("上班:"); StringBuilder timeSb = new StringBuilder();
timeSb.append(this.formatDateTime(clockDo.getClockInTime())).append("、午下:") if (null != clockDo.getClockInTime()) {
.append(this.formatDateTime(clockDo.getNoonClockOutTime())).append("、午上:") timeSb.append("上班卡:").append(this.formatDateTime(clockDo.getClockInTime()));
.append(this.formatDateTime(clockDo.getNoonClockInTime())).append("、下班:") }
.append(this.formatDateTime(clockDo.getClockOutTime())); if (null != clockDo.getNoonClockOutTime()) {
timeSb.append("、午下卡:").append(this.formatDateTime(clockDo.getNoonClockOutTime()));
}
if (null != clockDo.getNoonClockInTime()) {
timeSb.append("、午上卡:").append(this.formatDateTime(clockDo.getNoonClockInTime()));
}
if (null != clockDo.getClockOutTime()) {
timeSb.append("、下班卡:").append(this.formatDateTime(clockDo.getClockOutTime()));
}
// rowClockData.add(DateUtil.formatDateTime(clockDo.getClockInTime())); // rowClockData.add(DateUtil.formatDateTime(clockDo.getClockInTime()));
// rowClockData.add(DateUtil.formatDateTime(clockDo.getNoonClockOutTime())); // rowClockData.add(DateUtil.formatDateTime(clockDo.getNoonClockOutTime()));
// rowClockData.add(DateUtil.formatDateTime(clockDo.getNoonClockInTime())); // rowClockData.add(DateUtil.formatDateTime(clockDo.getNoonClockInTime()));
...@@ -175,10 +183,18 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe ...@@ -175,10 +183,18 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
// 打卡地点 // 打卡地点
StringBuilder addrSb = new StringBuilder(); StringBuilder addrSb = new StringBuilder();
addrSb.append(clockDo.getClockInAddress()).append("、") if (null != clockDo.getClockInAddress()) {
.append(clockDo.getNoonClockOutAddress()).append("、") addrSb.append(clockDo.getClockInAddress());
.append(clockDo.getNoonClockInAddress()).append("、") }
.append(clockDo.getClockOutAddress()); if (null != clockDo.getNoonClockOutAddress()) {
addrSb.append("、").append(clockDo.getNoonClockOutAddress());
}
if (null != clockDo.getNoonClockInAddress()) {
addrSb.append("、").append(clockDo.getNoonClockInAddress());
}
if (null != clockDo.getClockOutAddress()) {
addrSb.append("、").append(clockDo.getClockOutAddress());
}
// rowClockData.add(clockDo.getClockInAddress()); // rowClockData.add(clockDo.getClockInAddress());
// rowClockData.add(clockDo.getNoonClockOutAddress()); // rowClockData.add(clockDo.getNoonClockOutAddress());
// rowClockData.add(clockDo.getNoonClockInAddress()); // rowClockData.add(clockDo.getNoonClockInAddress());
...@@ -415,7 +431,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe ...@@ -415,7 +431,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
} }
private String formatDateTime(Date date){ private String formatDateTime(Date date){
return null == date ? "0000-00-00 00:00:00" : DatePattern.NORM_DATETIME_FORMAT.format(date); return DatePattern.NORM_DATETIME_FORMAT.format(date);
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论