审批页面修改

lxw

2023-08-15 160e150009b51a39fa95d9462c3798ba28d51a09

 src/main/java/com/whyc/service/FaultUploadService.java

@@ -86,7 +86,9 @@
        Date now = new Date();
        String uploadStartTime = null;
        String uploadEndTime = null;
        if(timeType == 1){
        if(timeType == null) {
            //不操作
        }else if(timeType == 1){
            //本月
            Calendar monthStart = Calendar.getInstance();
            monthStart.setTime(now);
@@ -142,7 +144,7 @@
            }
            uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());
        }else{
        }else if(timeType ==3){
            //年度
            Calendar monthStart = Calendar.getInstance();
            monthStart.setTime(now);
@@ -184,13 +186,11 @@

    public Response groupNameCount(int timeType, int userId) {
        FaultUpload upload = new FaultUpload();
        Date now = new Date();
        String uploadStartTime = null;
        String uploadEndTime = null;
        if(timeType == 1){
            //本月
            Calendar monthStart = Calendar.getInstance();
            monthStart.setTime(now);
            //设置为1号,当前日期既为本月第一天
            monthStart.set(Calendar.DAY_OF_MONTH,1);
            monthStart.set(Calendar.HOUR_OF_DAY, 0);
@@ -198,7 +198,6 @@
            monthStart.set(Calendar.SECOND, 0);

            Calendar monthEnd = Calendar.getInstance();
            monthEnd.setTime(now);
            //设置为1号,当前日期既为本月第一天
            monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
            monthEnd.set(Calendar.HOUR_OF_DAY, 23);
@@ -210,19 +209,12 @@
        }else if(timeType == 2){
            //本季度
            Calendar monthStart = Calendar.getInstance();
            monthStart.setTime(now);
            monthStart.set(Calendar.DAY_OF_MONTH,1);
            monthStart.set(Calendar.HOUR_OF_DAY, 0);
            monthStart.set(Calendar.MINUTE, 0);
            monthStart.set(Calendar.SECOND, 0);

            Calendar monthEnd = Calendar.getInstance();
            monthEnd.setTime(now);
            //设置为1号,当前日期既为本月第一天
            monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
            monthEnd.set(Calendar.HOUR_OF_DAY, 23);
            monthEnd.set(Calendar.MINUTE, 59);
            monthEnd.set(Calendar.SECOND, 59);

            //定位是第几季度
            int i = monthStart.get(Calendar.MONTH);
@@ -241,12 +233,17 @@
                monthStart.set(Calendar.MONTH,9);
                monthEnd.set(Calendar.MONTH,11);
            }
            //设置为1号,当前日期既为本月第一天
            monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
            monthEnd.set(Calendar.HOUR_OF_DAY, 23);
            monthEnd.set(Calendar.MINUTE, 59);
            monthEnd.set(Calendar.SECOND, 59);

            uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());
        }else{
            //年度
            Calendar monthStart = Calendar.getInstance();
            monthStart.setTime(now);
            monthStart.set(Calendar.MONTH,0);
            monthStart.set(Calendar.DAY_OF_MONTH,1);
            monthStart.set(Calendar.HOUR_OF_DAY, 0);
@@ -254,7 +251,6 @@
            monthStart.set(Calendar.SECOND, 0);

            Calendar monthEnd = Calendar.getInstance();
            monthEnd.setTime(now);
            //设置为1号,当前日期既为本月第一天
            monthEnd.set(Calendar.MONTH,11);
            monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
@@ -317,6 +313,27 @@
    public Response getMyUploadStatusCount(int userId) {
        Map<String,Integer> map = new HashMap<>();
        FaultUpload upload = new FaultUpload();
        //年度
        Calendar monthStart = Calendar.getInstance();
        monthStart.set(Calendar.MONTH,0);
        monthStart.set(Calendar.DAY_OF_MONTH,1);
        monthStart.set(Calendar.HOUR_OF_DAY, 0);
        monthStart.set(Calendar.MINUTE, 0);
        monthStart.set(Calendar.SECOND, 0);

        Calendar monthEnd = Calendar.getInstance();
        //设置为1号,当前日期既为本月第一天
        monthEnd.set(Calendar.MONTH,11);
        monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
        monthEnd.set(Calendar.HOUR_OF_DAY, 23);
        monthEnd.set(Calendar.MINUTE, 59);
        monthEnd.set(Calendar.SECOND, 59);

        String uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
        String uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());
        upload.setUploadStartTime(uploadStartTime);
        upload.setUploadEndTime(uploadEndTime);

        List<FaultUpload> list = mapper.getList(userId, upload);
        List<FaultUpload> confirmedList = list.stream().filter(temp -> temp.getStatus() == 1).collect(Collectors.toList());
        List<FaultUpload> myList = list.stream().filter(temp -> temp.getUploadUserId() == userId).collect(Collectors.toList());
@@ -331,11 +348,12 @@
        return new Response().set(1,map);
    }

    public Map<String,FaultUpload> getUploadWithGroupName() {
        Map<String,FaultUpload> resMap = new HashMap<>();
    public Map<String, FaultUpload> getUploadWithGroupName(int userId) {
        Map<String, FaultUpload> resMap = new HashMap<>();

        int userId = ActionUtil.getUser().getUId().intValue();
        List<FaultUpload> list = mapper.getListWithGroupName(userId);
        //int userId = ActionUtil.getUser().getUId().intValue();
        int year = Calendar.getInstance().get(Calendar.YEAR);
        List<FaultUpload> list = mapper.getListWithGroupName(userId, year);
        Map<String, List<FaultUpload>> userListMap = list.stream().collect(Collectors.groupingBy(FaultUpload::getUploadUserName));
        Set<String> userNameSet = userListMap.keySet();
        for (String userName : userNameSet) {