|
@@ -147,9 +147,11 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileEntry> implemen
|
|
|
datas[2] = item.getItemContent();
|
|
|
for (PmCheckRecordRes r : item.getCheckRecordList()) {
|
|
|
int day = r.getTaskTime().getDayOfMonth();
|
|
|
- if (r.getResult().equals("0") || r.getResult().equals("1")) {
|
|
|
+ nmMap.put(day, userNm);
|
|
|
+ if (r.getResult().equals("0")) {
|
|
|
datas[2 + day] = "√";
|
|
|
- nmMap.put(day, userNm);
|
|
|
+ }else {
|
|
|
+ datas[2 + day] = "×";
|
|
|
}
|
|
|
}
|
|
|
rs.add(datas);
|