密码验证加-

whyclxw

2025-05-28 e16302f9d475c7cc4dd18c5abf1a23cb5502e362

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

@@ -15,6 +15,7 @@
import com.whyc.pojo.WorkflowMain;
import com.whyc.util.ActionUtil;
import com.whyc.util.DateUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -50,7 +51,8 @@
                    "GJYH",
                    userId,
                    RoleEnum.ADMIN.getId(),
                    now);
                    now,
                    "P2");

            //关联上报表
            fault.setMainId(mainId);
@@ -149,8 +151,10 @@
            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());
           /* uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());*/
            uploadStartTime = ThreadLocalUtil.format(monthStart.getTime(),1);
            uploadEndTime = ThreadLocalUtil.format(monthEnd.getTime(),1);
        }else if(timeType == 2){
            //本季度
            Calendar monthStart = Calendar.getInstance();
@@ -185,8 +189,10 @@
                monthStart.set(Calendar.MONTH,9);
                monthEnd.set(Calendar.MONTH,11);
            }
            uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());
           /* uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());*/
            uploadStartTime = ThreadLocalUtil.format(monthStart.getTime(),1);
            uploadEndTime =ThreadLocalUtil.format(monthEnd.getTime(),1);
        }else if(timeType ==3){
            //年度
            Calendar monthStart = Calendar.getInstance();
@@ -206,8 +212,10 @@
            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());
            /*uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());*/
            uploadStartTime = ThreadLocalUtil.format(monthStart.getTime(),1);
            uploadEndTime = ThreadLocalUtil.format(monthEnd.getTime(),1);
        }
        upload.setUploadStartTime(uploadStartTime);
        upload.setUploadEndTime(uploadEndTime);
@@ -247,8 +255,10 @@
            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());
           /* uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());*/
            uploadStartTime = ThreadLocalUtil.format(monthStart.getTime(),1);
            uploadEndTime = ThreadLocalUtil.format(monthEnd.getTime(),1);
        }else if(timeType == 2){
            //本季度
            Calendar monthStart = Calendar.getInstance();
@@ -282,8 +292,10 @@
            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());
           /* uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());*/
            uploadStartTime = ThreadLocalUtil.format(monthStart.getTime(),1);
            uploadEndTime = ThreadLocalUtil.format(monthEnd.getTime(),1);
        }else{
            //年度
            Calendar monthStart = Calendar.getInstance();
@@ -301,8 +313,10 @@
            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());
            //uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
            //uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());
            uploadStartTime = ThreadLocalUtil.format(monthStart.getTime(),1);
            uploadEndTime =ThreadLocalUtil.format(monthEnd.getTime(),1);
        }
        upload.setUploadStartTime(uploadStartTime);
        upload.setUploadEndTime(uploadEndTime);
@@ -341,8 +355,10 @@
            instance.add(Calendar.DATE,-30);
        }

        upload.setUploadStartTime(DateUtil.YYYY_MM_DD_HH_MM_SS.format(instance.getTime()));
        upload.setUploadEndTime(DateUtil.YYYY_MM_DD_HH_MM_SS.format(now));
        /*upload.setUploadStartTime(DateUtil.YYYY_MM_DD_HH_MM_SS.format(instance.getTime()));
        upload.setUploadEndTime(DateUtil.YYYY_MM_DD_HH_MM_SS.format(now));*/
        upload.setUploadStartTime(ThreadLocalUtil.format(instance.getTime(),1));
        upload.setUploadEndTime(ThreadLocalUtil.format(now,1));
        List<FaultUpload> faultUploads = mapper.getList(userId, upload);
        //联查拆分,组装 用户名
        List<UserInf> users = userService.getAll();
@@ -372,8 +388,10 @@
        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());
        /*String uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
        String uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());*/
        String uploadStartTime =ThreadLocalUtil.format(monthStart.getTime(),1);
        String uploadEndTime = ThreadLocalUtil.format(monthEnd.getTime(),1);
        upload.setUploadStartTime(uploadStartTime);
        upload.setUploadEndTime(uploadEndTime);