|
@@ -10902,6 +10902,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
//不一致
|
|
|
if (Math.abs(corpwxTime.getWorkHours() - report.getWorkingTime()) > 0.01) {
|
|
|
isMatch = false;
|
|
|
+ //设置人员姓名
|
|
|
+ if (corpwxTime.getName() == null) {
|
|
|
+ corpwxTime.setName(targetUser.getName());
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
@@ -10910,7 +10914,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
|
|
|
if (!isMatch) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("name", corpwxTime.getName()==null?corpwxTime.getCorpwxUserid():corpwxTime.getName());
|
|
|
+ map.put("name", corpwxTime.getName());
|
|
|
map.put("createDate", dateTimeFormatter.format(corpwxTime.getCreateDate()));
|
|
|
map.put("workHours", corpwxTime.getWorkHours());
|
|
|
map.put("reportTime", reportTime);
|