sdsd

src/main/java/com/template/common/utils/TimeExchange.java

@@ -680,8 +680,11 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) throws ParseException {
-        BigDecimal ss = new BigDecimal(0.3).divide(new BigDecimal(3),2);//.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-        System.out.println("");
+        int total = 25;
+        int pageSize = 20;
+        int restData =(total + pageSize - 1) / pageSize;
+        System.out.println("数据："+restData);
+        String sdsd ="";
     }
 }
 

src/main/java/com/template/controller/SmartAttendanceController.java

@@ -7,6 +7,8 @@ import com.seewo.open.sdk.auth.Account;
 import com.template.api.SmartAttendanceControllerAPI;
 import com.template.common.utils.TimeExchange;
 import com.template.config.SeewoConfig;
+import com.template.model.enumModel.eAttendanceStatu;
+import com.template.model.enumModel.eXwApproveStatu;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.seewo.PersonalLeaveListSchoolPeriodRecordsParam;
@@ -68,11 +70,28 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         List<SmartAttendance> attendances = new ArrayList<>();
         //如果总条数大于第二条 那说明还有第二页
         if (result.getResponseBody().getData().getTotalCount().intValue() > result.getResponseBody().getData().getTotalCount().intValue()) {
+            int totalCount = result.getResponseBody().getData().getTotalCount().intValue();
+            int pageSize = result.getResponseBody().getData().getPageSize().intValue();
+            int totalPage = (totalCount + pageSize - 1) / pageSize;
+
 
         } else {
             for (int i = 0; i < result.getResponseBody().getData().getTotalCount(); i++) {
-                SmartAttendance attendance = new SmartAttendance();
-
+                if (result.getResponseBody().getData().getResult().get(i).getLeaveStatus().intValue() == eXwApproveStatu.Passed.getValue()) {
+                    SmartAttendance attendance = new SmartAttendance();
+                    attendance.setXwuid(result.getResponseBody().getData().getResult().get(i).getUid());
+                    attendance.setUserUid(result.getResponseBody().getData().getResult().get(i).getUserUid());
+                    attendance.setXwUserName(result.getResponseBody().getData().getResult().get(i).getUserName());
+                    attendance.setReason(result.getResponseBody().getData().getResult().get(i).getReason());
+                    attendance.setStartTime(TimeExchange.StringToDate(result.getResponseBody().getData().getResult().get(i).getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                    attendance.setEndTime(TimeExchange.StringToDate(result.getResponseBody().getData().getResult().get(i).getEndTime(), "yyyy-MM-dd HH:mm:ss"));
+                    attendance.setInitiateTime(TimeExchange.StringToDate(result.getResponseBody().getData().getResult().get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                    attendance.setInitiateXwuid(result.getResponseBody().getData().getResult().get(i).getApplyUserUid());
+                    attendance.setInitiateXwname(result.getResponseBody().getData().getResult().get(i).getApplyUserName());
+                    attendance.setInitiateXwphone(result.getResponseBody().getData().getResult().get(i).getApplyUserPhone());
+                    attendance.setStatus(eAttendanceStatu.AskLeave.getValue());
+                    attendances.add(attendance);
+                }
             }
         }
         //新增请假数据

src/main/java/com/template/model/enumModel/eAttendanceStatu.java

@@ -5,30 +5,41 @@ package com.template.model.enumModel;
  * @Date: 2023/7/6 星期四 16:34
  * @Description: com.template.model.enumModel
  * @Version: 1.0
- * 账号状态
+ * 考勤状态
  */
-public enum eApproveStatu {
-    Audit(1),//待审核
-    Refused(2),//已拒绝
-    Pushed(3);//已推送
+// 准时：0
+// 迟到：1
+// 缺卡：3
+// 请假：6
+// 超时打卡：7
+public enum eAttendanceStatu {
+    OnTime(0),//准时
+    BeLate(1),//迟到
+    LackCard(3),//缺卡
+    AskLeave(6),//请假
+    ClockIn(7);//超时打卡
 
     private int value;
 
-    eApproveStatu(int value){
+    eAttendanceStatu(int value){
         this.value = value;
     }
 
     public int getValue() {
         return value;
     }
-    public static eApproveStatu valueOf(int value) {
+    public static eAttendanceStatu valueOf(int value) {
         switch (value) {
+            case 0:
+                return eAttendanceStatu.OnTime;
             case 1:
-                return eApproveStatu.Audit;
-            case 2:
-                return eApproveStatu.Refused;
+                return eAttendanceStatu.BeLate;
             case 3:
-                return eApproveStatu.Pushed;
+                return eAttendanceStatu.LackCard;
+            case 6:
+                return eAttendanceStatu.AskLeave;
+            case 7:
+                return eAttendanceStatu.ClockIn;
             default:
                 return null;
         }
@@ -36,12 +47,16 @@ public enum eApproveStatu {
 
     public static Integer integerOf(String value) {
         switch (value) {
-            case "待审核":
+            case "准时":
+                return 0;
+            case "迟到":
                 return 1;
-            case "已拒绝":
-                return 2;
-            case "已推送":
+            case "缺卡":
                 return 3;
+            case "请假":
+                return 6;
+            case "超时打卡":
+                return 7;
             default:
                 return null;
         }
@@ -49,12 +64,16 @@ public enum eApproveStatu {
 
     public static String stringOf(Integer value) {
         switch (value) {
+            case 0:
+                return "准时";
             case 1:
-                return "待审核";
-            case 2:
-                return "已拒绝";
+                return "迟到";
             case 3:
-                return "已推送";
+                return "缺卡";
+            case 6:
+                return "请假";
+            case 7:
+                return "超时打卡";
             default:
                 return null;
         }

src/main/java/com/template/model/enumModel/eXwApproveStatu.java

@@ -5,30 +5,34 @@ package com.template.model.enumModel;
  * @Date: 2023/7/6 星期四 16:34
  * @Description: com.template.model.enumModel
  * @Version: 1.0
- * 账号状态
+ * 希沃请假数据审核状态
+ * 请假审核状态：1未审核，2未通过，3已通过，4已撤销
  */
-public enum eApproveStatu {
-    Audit(1),//待审核
-    Refused(2),//已拒绝
-    Pushed(3);//已推送
+public enum eXwApproveStatu {
+    Unaudited(1),//未审核
+    Fail(2),//未通过
+    Passed(3),//已通过
+    Revoked(4);//已撤销
 
     private int value;
 
-    eApproveStatu(int value){
+    eXwApproveStatu(int value){
         this.value = value;
     }
 
     public int getValue() {
         return value;
     }
-    public static eApproveStatu valueOf(int value) {
+    public static eXwApproveStatu valueOf(int value) {
         switch (value) {
             case 1:
-                return eApproveStatu.Audit;
+                return eXwApproveStatu.Unaudited;
             case 2:
-                return eApproveStatu.Refused;
+                return eXwApproveStatu.Fail;
             case 3:
-                return eApproveStatu.Pushed;
+                return eXwApproveStatu.Passed;
+            case 4:
+                return eXwApproveStatu.Revoked;
             default:
                 return null;
         }
@@ -36,12 +40,14 @@ public enum eApproveStatu {
 
     public static Integer integerOf(String value) {
         switch (value) {
-            case "待审核":
+            case "未审核":
                 return 1;
-            case "已拒绝":
+            case "未通过":
                 return 2;
-            case "已推送":
+            case "已通过":
                 return 3;
+            case "已撤销":
+                return 4;
             default:
                 return null;
         }
@@ -50,11 +56,13 @@ public enum eApproveStatu {
     public static String stringOf(Integer value) {
         switch (value) {
             case 1:
-                return "待审核";
+                return "未审核";
             case 2:
-                return "已拒绝";
+                return "未通过";
             case 3:
-                return "已推送";
+                return "已通过";
+            case 4:
+                return "已撤销";
             default:
                 return null;
         }

src/main/java/com/template/model/pojo/SmartAttendance.java

@@ -58,6 +58,30 @@ public class SmartAttendance implements Serializable {
     @ApiModelProperty(value = "希沃用户学号")
     private String xwStudentCode;
 
+    @ApiModelProperty(value = "请假原因")
+    private String reason;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "希沃发起时间")
+    private Date initiateTime;
+
+    @ApiModelProperty(value = "希沃发起人用户ID")
+    private String initiateXwuid;
+
+    @ApiModelProperty(value = "希沃发起人名称")
+    private String initiateXwname;
+
+    @ApiModelProperty(value = "希沃发起人手机号")
+    private String initiateXwphone;
+
+    @ApiModelProperty(value = "希沃请假ID")
+    private String xwuid;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;