edit queryAttendUser

Fancy

2025-01-09 abe0f082f328098dbd0964a821b77d0e34179e70

edit queryAttendUser

 pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java

@@ -78,9 +78,9 @@
     * */
    @GetMapping(path="queryAttendUser")
    @Log("查询人员出勤率")
    public BaseResponse<List<JSONObject>> queryAttendUser(){
        List<JSONObject> list = sv.queryAttendUser();
        return BaseResponseUtils.buildSuccess(list);
    public BaseResponse<JSONObject> queryAttendUser(){
        JSONObject obj = sv.queryAttendUser();
        return BaseResponseUtils.buildSuccess(obj);
    }
    /**
     * 任务看板  查询在产任务看板

 pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java

@@ -219,12 +219,18 @@
        List<JSONObject> list = deviceProductionLogDao.queryTopError(startDt, endDt);
        return list;
    }
    public List<JSONObject> queryAttendUser() {
    public JSONObject queryAttendUser() {
        Date startDt = Date.from(LocalDateTime.of(LocalDate.now().minusDays(2000), LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
        Date endDt = new Date();
        Date todayDt = Date.from(LocalDateTime.of(LocalDate.now(), LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
        List<JSONObject> list = assemblyWorkLastDao.queryAttendUser(startDt, endDt,todayDt);
        return list;
        if(list.size() == 0){
            JSONObject obj = new JSONObject();
            obj.set("require_attend", "0");
            obj.set("actual_attend", "0");
            return obj;
        }
        return list.get(0);
    }

    public List<JSONObject> queryStatisticWork() {