|
@@ -260,7 +260,7 @@ public class MeetingPersonRecodeController {
|
|
Map<String, Object> searchParams = new HashMap<>();
|
|
Map<String, Object> searchParams = new HashMap<>();
|
|
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
List<Sort> sortList = new ArrayList<>();
|
|
- sortList.add(new Sort("create_time", "desc"));
|
|
|
|
|
|
+ sortList.add(new Sort("a.sign_time", "desc"));
|
|
|
|
|
|
if (StringUtils.isNotEmpty(meetingId)) {
|
|
if (StringUtils.isNotEmpty(meetingId)) {
|
|
searchParams.put("meetingId", meetingId);
|
|
searchParams.put("meetingId", meetingId);
|
|
@@ -678,7 +678,7 @@ public class MeetingPersonRecodeController {
|
|
titles = new String[]{"序号","姓名","工号"};
|
|
titles = new String[]{"序号","姓名","工号"};
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- titles = new String[]{"序号","姓名","工号","会前签到时间","会后签到时间"};
|
|
|
|
|
|
+ titles = new String[]{"序号","姓名","工号","签到时间"};
|
|
}
|
|
}
|
|
|
|
|
|
for (int i=0;i<titles.length;i++) {
|
|
for (int i=0;i<titles.length;i++) {
|
|
@@ -709,8 +709,7 @@ public class MeetingPersonRecodeController {
|
|
row.createCell(colIndex++).setCellValue(i+1);
|
|
row.createCell(colIndex++).setCellValue(i+1);
|
|
row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("name"),""));
|
|
row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("name"),""));
|
|
row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("jobNumber"),""));
|
|
row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("jobNumber"),""));
|
|
- row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("startTime"),""));
|
|
|
|
- row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("endTime"),""));
|
|
|
|
|
|
+ row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("sign_time"),""));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|