Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/req/TimeReq.java

+package com.mortals.xhx.busiz.dingtalk.req;
+
+/**
+ * @author ZYW
+ * @date 2023-07-13 20:11
+ */
+
+public class TimeReq {
+    String startTime;
+    String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -170,7 +170,7 @@ public class DingMessageController {
                                             switch (jsonArray.get(3).toString()){
                                                 case "halfDay":
                                                 case "day":
-                                                    leaveRecordEntity.setDuration((int) (Float.parseFloat(jsonArray.get(2).toString())*60*60*9)); //天转换成秒 一天工作时间9小时
+                                                    leaveRecordEntity.setDuration((int) (Float.parseFloat(jsonArray.get(2).toString())*60*60*8)); //天转换成秒 一天工作时间9小时
                                                     leaveRecordEntity.setSourceDingTime(jsonArray.get(2).toString()+"天");
                                                     break;
                                                 default:  //除了按天和半天计算的假期  其余都是按小时返回
@@ -638,7 +638,7 @@ public class DingMessageController {
      * @return
      */
     private float converMillsToDays(long milliseconds){
-        float days = ((float) milliseconds) / (60*60*9);
+        float days = ((float) milliseconds) / (60*60*8);
         return days;
     }
 

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

 package com.mortals.xhx.module.attendance.web;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
@@ -38,6 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -91,6 +94,23 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         super.init(model, context);
     }
 
+    @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) {
+                if (field.isAnnotationPresent(Excel.class)) {
+                    Excel column = field.getAnnotation(Excel.class);
+                    if (column != null && query.getProperties().contains(field.getName())) {
+                        properties.add(column.name());
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public void doExportAfter(Context context, List<AttendanceRecordEntity> list) throws AppException {
         ArrayList<AttendanceRecordEntity> attendanceRecordEntities = new ArrayList<>();
@@ -130,25 +150,25 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         attendanceExportRecordEntity.setFilePath(filePath);
         if (query.getIdList() != null) {
             List<Long> idList = query.getIdList();
-            attendanceExportRecordEntity.setRecordIdList(idList.stream().map(i->i.toString()).collect(Collectors.joining(",")));
+            attendanceExportRecordEntity.setRecordIdList(idList.stream().map(i -> i.toString()).collect(Collectors.joining(",")));
         }
         if (query.getAttendanceDateStart() != null) {
             String attendanceDate = query.getAttendanceDateStart() + "~" + query.getAttendanceDateEnd();
             attendanceExportRecordEntity.setAttendanceDate(attendanceDate);
         }
-        if(!ObjectUtils.isEmpty(query.getAttendanceGroupId())){
+        if (!ObjectUtils.isEmpty(query.getAttendanceGroupId())) {
             AttendanceGroupEntity attendanceGroupEntity = groupService.get(query.getAttendanceGroupId());
-            attendanceExportRecordEntity.setGroupName(attendanceGroupEntity==null?"":attendanceGroupEntity.getGroupName());
+            attendanceExportRecordEntity.setGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());
         }
 
-        if(!ObjectUtils.isEmpty(query.getDeptId())){
+        if (!ObjectUtils.isEmpty(query.getDeptId())) {
             DeptEntity deptEntity = deptService.get(query.getDeptId(), context);
-            attendanceExportRecordEntity.setDeptName(deptEntity==null?"":deptEntity.getDeptName());
+            attendanceExportRecordEntity.setDeptName(deptEntity == null ? "" : deptEntity.getDeptName());
         }
 
-        if(!ObjectUtils.isEmpty(query.getClassId())){
+        if (!ObjectUtils.isEmpty(query.getClassId())) {
             AttendanceClassEntity attendanceClassEntity = classService.get(query.getClassId(), context);
-            attendanceExportRecordEntity.setClassName(attendanceClassEntity==null?"":attendanceClassEntity.getClassName());
+            attendanceExportRecordEntity.setClassName(attendanceClassEntity == null ? "" : attendanceClassEntity.getClassName());
         }
         attendanceExportRecordEntity.setCreateUserId(context.getUser().getId());
         attendanceExportRecordEntity.setCreateTime(new Date());
@@ -171,7 +191,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             query.setOrderColList(Arrays.asList(new OrderCol("attendanceDate", OrderCol.DESCENDING), new OrderCol("staffName", OrderCol.DESCENDING)));
         } else {
             query.getOrderColList().add(new OrderCol("attendanceDate", OrderCol.DESCENDING));
-           // query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
+            // query.getOrderColList().add(new OrderCol("staffName", OrderCol.DESCENDING));
         }
 
         super.doListBefore(query, model, context);