修改导出动态列

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java

@@ -9,11 +9,9 @@ import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
 import com.mortals.xhx.common.code.ErrorStatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
-import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
 import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
 import com.mortals.xhx.module.attendance.service.AttendanceClassService;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
-import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,7 +41,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
     @Autowired
     private AttendanceClassService attendanceClassService;
     @Autowired
-    private PerformAttendRecordService attendRecordService;
+    private PerformAttendRecordService performAttendRecordService;
 
     @Autowired
     private ApiWebPerformController apiWebPerformController;
@@ -140,7 +138,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                 attendSaveReq.setHappenTime(entity.getErrorDateTime());
                 attendSaveReq.setRuleCode(ruleCode);
                 attendSaveReq.setStaffId(entity.getStaffId());
-                attendRecordService.saveAttend(attendSaveReq, context);
+                performAttendRecordService.saveAttend(attendSaveReq, context);
             }
         }
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -97,7 +97,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
     @Override
     public void doExportBefore(Context context, AttendanceRecordEntity query, List<String> properties) throws AppException {
         if (!ObjectUtils.isEmpty(query.getProperties())) {
-            //通过属性转换为注解
+          /*  //通过属性转换为注解
             List<Field> tempFields = new ArrayList<>();
             tempFields.addAll(Arrays.asList(ReflectUtil.getFields(AttendanceRecordEntity.class)));
             for (Field field : tempFields) {
@@ -107,7 +107,9 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
                         properties.add(column.name());
                     }
                 }
-            }
+            }*/
+
+            properties.addAll(query.getProperties());
         }
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java

@@ -157,6 +157,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
             updateEntity.setUpdateUserId(this.getContextUserId(getContext()));
             updateEntity.setDuration(entity.getDuration());
             this.service.update(updateEntity, getContext());
+            entity.setId(recordErrorEntity.getId());
         }
 
         for (AttendanceRecordErrorEntity item : entity.getRecordErrorEntities()) {