|
@@ -1402,6 +1402,22 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
if (StrUtil.isNotBlank(userSignDetail.getResult())) {
|
|
if (StrUtil.isNotBlank(userSignDetail.getResult())) {
|
|
userSignDetail.setResultName(UserSignResultEnum.resolve(userSignDetail.getResult()).getName());
|
|
userSignDetail.setResultName(UserSignResultEnum.resolve(userSignDetail.getResult()).getName());
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // 医院打卡, 兼容历史字段department
|
|
|
|
+ if ("1".equals(userSign.getSignEntType())) {
|
|
|
|
+ if (CollUtil.isEmpty(userSignDetail.getDetail()) && ArrayUtil.isNotEmpty(userSignDetail.getDepartment())) {
|
|
|
|
+ List<Map<String, Object>> detail = new ArrayList<>();
|
|
|
|
+ for (String dep : userSignDetail.getDepartment()) {
|
|
|
|
+ Map<String, Object> detailMap = new HashMap<>();
|
|
|
|
+ detailMap.put("departmentName", dep);
|
|
|
|
+ detailMap.put("fileUrl", new String[0]);
|
|
|
|
+ detail.add(detailMap);
|
|
|
|
+ }
|
|
|
|
+ userSignDetail.setDetail(detail);
|
|
|
|
+ }
|
|
|
|
+ userSignDetail.setDepartment(null);
|
|
|
|
+ }
|
|
|
|
+
|
|
userSign.setUserSignDetail(userSignDetail);
|
|
userSign.setUserSignDetail(userSignDetail);
|
|
}
|
|
}
|
|
wmUserSignList.add(userSign);
|
|
wmUserSignList.add(userSign);
|