a

notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/ApprovalController.java

@@ -56,7 +56,6 @@ public class ApprovalController {
                 return ok("删除审批成功");
             }
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("删除审批失败，错误内容{}:",e.getMessage());
         }
         return ok("删除审批失败");
@@ -77,7 +76,6 @@ public class ApprovalController {
             ApprovalInformation approvalInformation1 = approvalInformationService.auditApproval(userId,approvalStatus,approvalInformation);
             return ok(approvalInformation1);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("审核审批失败，错误内容{}:",e.getMessage());
         }
         return ok("审核审批失败");
@@ -91,7 +89,6 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> pageResponse = approvalInformationService.findAllApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找自身提交的审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找自身提交的审批失败");
@@ -104,7 +101,6 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> approvalInformations = approvalInformationService.findAllAuditApproval(pageRequest);
             return ok(approvalInformations);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找所有我审核的审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找所有我审核的审批失败");
@@ -138,7 +134,6 @@ public class ApprovalController {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllSubmitWorkOverApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找所有我提交的加班审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找所有我提交的加班审批失败");
@@ -147,14 +142,13 @@ public class ApprovalController {
     @ApiOperation(value = "查找所有我审核的加班审批")
     @PostMapping("/findAllAuditWorkOverApproval")
     public ResponseEntity findAllAuditWorkOverApproval(@RequestBody PageRequestAtten pageRequest) {
-        try {
+//        try {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllAuditWorkOverApproval(pageRequest);
             return ok(pageResponse);
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("查找所有我审核的加班审批失败，错误内容{}:",e.getMessage());
-        }
-        return ok("查找所有我审核的加班审批失败");
+//        } catch (Exception e) {
+//            logger.error("查找所有我审核的加班审批失败，错误内容{}:",e.getMessage());
+//        }
+//        return ok("查找所有我审核的加班审批失败");
     }
 
     @ApiOperation(value = "申请单的选择部门")
@@ -164,7 +158,6 @@ public class ApprovalController {
             List<Department> pageResponse = approvalInformationService.findSelectDepartment();
             return ok(pageResponse);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找可选择部门失败，错误内容{}:",e.getMessage());
         }
         return ok("查找可选择部门失败");

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/request/PageRequestAtten.java

@@ -32,4 +32,12 @@ public class PageRequestAtten {
      * 访问人员id
      */
     private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java

@@ -126,8 +126,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
                         userAttenVo.setAbsenteeismDay(attendanceDetails.getAbsenteeismDay()+userAttenVo.getAbsenteeismDay());
                     }
                 }
+
                 userAttenVo.computerRealAttendanceDay();
             }
+            System.out.println(attendanceDetailsList.size());
             return userAttenVo;
         } catch (ParseException e) {
             logger.error("时间转换格式错误");

notes-attendance/src/main/java/com/zjty/tynotes/attendance/task/CardTask.java

@@ -65,7 +65,7 @@ public class CardTask {
     /**
      * 定时任务，定时获取打卡信息.计算前天的个人考勤信息情况
      */
-//    @Scheduled(cron = "0 59 23 * * ? ")
+    @Scheduled(cron = "0 59 23 * * ? ")
     public List<CardResult> getCardDetails(){
         List<User> users = pasUserDao.findAll();
         List<User> userList = new ArrayList<>();

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/controller/UserManageController.java

@@ -3,7 +3,9 @@ package com.zjty.tynotes.weekly.subject.controller;
 import com.zjty.tynotes.misc.config.AutoDocument;
 import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.entity.vo.PageRequest;
+import com.zjty.tynotes.pas.entity.vo.PageResponse;
 import com.zjty.tynotes.weekly.subject.entity.vo.Problem;
+import com.zjty.tynotes.weekly.subject.entity.vo.UserVo;
 import com.zjty.tynotes.weekly.subject.service.UserManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import java.text.ParseException;
+
 import static org.springframework.http.ResponseEntity.ok;
 
 /**
@@ -45,7 +49,15 @@ public class UserManageController {
     @ApiOperation(value = "查询人员列表", response = User.class)
     @PostMapping("/findUserList")
     public ResponseEntity findUserList(@RequestBody PageRequest pageRequest) {
-        return ok(userManageService.findUserList(pageRequest));
+        PageResponse<UserVo> userList = null;
+        try {
+            userList = userManageService.findUserList(pageRequest);
+            return ok(userList);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            logger.error("查询人员列表失败:{}",e.getMessage());
+        }
+        return ok("查询人员列表失败");
     }
 
     @ApiOperation(value = "根据权限查询可查看部门列表", response = User.class)

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/UserManageService.java

@@ -7,6 +7,7 @@ import com.zjty.tynotes.pas.entity.vo.PageResponse;
 import com.zjty.tynotes.weekly.subject.entity.vo.Problem;
 import com.zjty.tynotes.weekly.subject.entity.vo.UserVo;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -26,7 +27,7 @@ public interface UserManageService {
      * @param pageRequest
      * @return
      */
-    PageResponse<UserVo> findUserList(PageRequest pageRequest);
+    PageResponse<UserVo> findUserList(PageRequest pageRequest) throws ParseException;
 
     /**
      * 根据用户id查询可管理的部门列表

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -19,6 +19,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -81,13 +84,30 @@ public class UserManageServiceImpl implements UserManageService {
         return user;
     }
 
+    public static void main(String[] args) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        double a = 0.3333333333333333333333333333333d;
+        BigDecimal bg = new BigDecimal(a);
+        double v = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+        String format = df.format(a);
+        Number parse = null;
+        try {
+            parse = df.parse(format);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        System.out.println(parse.doubleValue());
+        System.out.println(v);
+    }
+
     /**
      * 查询人员列表
      * @param pageRequest
      * @return
      */
     @Override
-    public PageResponse<UserVo> findUserList(PageRequest pageRequest) {
+    public PageResponse<UserVo> findUserList (PageRequest pageRequest) throws ParseException {
+        DecimalFormat df = new DecimalFormat("#.00");
         List<UserVo> userVos = new ArrayList<>();
         PageResponse<UserVo> pageResponse = new PageResponse();
         String deId = pageRequest.getDeId();
@@ -155,18 +175,18 @@ public class UserManageServiceImpl implements UserManageService {
 
                     UserWorkData userWorkData = userWorkDataMap.get(user.getId());
                     if(userWorkData!=null){
-                        userVo.setAverageScore(userWorkData.getAverageScore());
+                        userVo.setAverageScore(df.parse(df.format(userWorkData.getAverageScore())).doubleValue());
                         userVo.setCompletedCount(userWorkData.getCompletedNum());
                         userVo.setWorkingCount(userWorkData.getUnCompletedNum());
-                        userVo.setAverageWorkNum(userWorkData.getAverageWorkNum());
+                        userVo.setAverageWorkNum(df.parse(df.format(userWorkData.getAverageWorkNum())).doubleValue());
                     }
                 }else{
                     UserWorkData userWorkData = internalService.personnelWorkMsg(user.getId(), pageRequest.getStartTime(), pageRequest.getEndTime());
                     if(userWorkData!=null){
-                        userVo.setAverageScore(userWorkData.getAverageScore());
+                        userVo.setAverageScore(df.parse(df.format(userWorkData.getAverageScore())).doubleValue());
                         userVo.setCompletedCount(userWorkData.getCompletedNum());
                         userVo.setWorkingCount(userWorkData.getUnCompletedNum());
-                        userVo.setAverageWorkNum(userWorkData.getAverageWorkNum());
+                        userVo.setAverageWorkNum(df.parse(df.format(userWorkData.getAverageWorkNum())).doubleValue());
                     }
                 }
                 userVos.add(userVo);