|
|
@@ -4394,7 +4394,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
String name = (String)data.get("name");
|
|
|
String departmentName = (String) data.get("departmentName");
|
|
|
String corpwxUserId = (String) data.get("corpwxUserId");
|
|
|
- String corpwxDeptId = (String) data.get("corpwxDeptId");
|
|
|
+ Integer corpwxDeptId = (Integer) data.get("corpwxDeptId");
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
String date = new SimpleDateFormat("yyyy-MM-dd").format((Date)data.get("createDate"));
|
|
|
map.put("workingTime", data.get("workingTime"));
|
|
|
@@ -4440,7 +4440,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
lastUserData.name = name;
|
|
|
lastUserData.departmentName = departmentName;
|
|
|
lastUserData.corpwxUserId = corpwxUserId;
|
|
|
- lastUserData.corpwxDeptId = corpwxDeptId;
|
|
|
+ lastUserData.corpwxDeptId = String.valueOf(corpwxDeptId);
|
|
|
lastUserData.worktimeList = new ArrayList<>();
|
|
|
lastUserData.worktimeList.add(map);
|
|
|
userMonthWorks.add(lastUserData);
|
|
|
@@ -9072,13 +9072,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
List<String> item=new ArrayList<>();
|
|
|
item.add(String.valueOf(map.get("createDate")));
|
|
|
if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
- item.add(String.valueOf(map.get("name")));
|
|
|
- item.add(String.valueOf(map.get("departmentName")));
|
|
|
- }else {
|
|
|
item.add("$userName="+String.valueOf(map.get("corpwxUserId"))+"$");
|
|
|
item.add("$departmentName="+String.valueOf(map.get("corpwxDeptId"))+"$");
|
|
|
+ }else {
|
|
|
+ item.add(String.valueOf(map.get("name")));
|
|
|
+ item.add(String.valueOf(map.get("departmentName")));
|
|
|
}
|
|
|
-
|
|
|
item.add(String.valueOf(map.get("workingTime")));
|
|
|
item.add(String.valueOf(map.get("cardTime")));
|
|
|
item.add(Integer.valueOf(String.valueOf(map.get("exceedCardTime")))==0?"否":"是");
|
Min