Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java

gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java

@@ -47,21 +47,25 @@ public class ApprovalProcessController extends BaseController {
         queryWrapper.orderByDesc("create_time");
         if (approvalProcess.getTimeType() != null) {
             if (approvalProcess.getTimeType() == 1) {
-                queryWrapper.le("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000);
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000L);
             } else if (approvalProcess.getTimeType() == 2) {
-                queryWrapper.le("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000);
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000L);
             } else if (approvalProcess.getTimeType() == 3) {
-                queryWrapper.le("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L);
             }
         }
 
+        if (approvalProcess.getProcessTitle() != null) {
+            queryWrapper.like("process_title", approvalProcess.getProcessTitle())
+                    .or().like("submitter_name", approvalProcess.getProcessTitle());
+        }
+
         if (approvalProcess.getSubmitterId() != null) {
             queryWrapper.eq("submitter_id", getLoginUser().getUserId());
         }
         List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
-
+        List<ApprovalProcess> newList = new ArrayList<>();
         for (ApprovalProcess process : list) {
-
             if (process.getMatterType() == 2) {
                 gwglLog one = gwglLogService.lambdaQuery()
                         .eq(gwglLog::getUuid, process.getUuid())
@@ -69,10 +73,53 @@ public class ApprovalProcessController extends BaseController {
                         .last("LIMIT 1")
                         .one();
                 if (one != null) {
-                    if (one.getCheckState() == 0) {
+                    if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString()))
-                        process.setApprovalStatus(0);
+                            || (one.getChecker() != null && one.getChecker().equals(getNickname()))) {
+                        if (one.getCheckState() == 0) {
+                            process.setApprovalStatus(0);
+                        } else {
+                            process.setApprovalStatus(1);
+                        }
                     } else {
-                        process.setApprovalStatus(1);
+                        continue;
+                    }
+                }
+            }
+            if (process.getMatterType() == 3) {
+                gwglLog one = gwglLogService.lambdaQuery()
+                        .eq(gwglLog::getApplyNo, process.getApprovalNo())
+                        .orderByDesc(gwglLog::getCreateTime)
+                        .last("LIMIT 1")
+                        .one();
+                if (one != null) {
+                    if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString()))
+                            || (one.getChecker() != null && one.getChecker().equals(getNickname()))) {
+                        if (one.getCheckState() == 0) {
+                            process.setApprovalStatus(0);
+                        } else {
+                            process.setApprovalStatus(1);
+                        }
+                    }else {
+                        continue;
+                    }
+                }
+            }
+            if (process.getMatterType() == 4) {
+                gwglLog one = gwglLogService.lambdaQuery()
+                        .eq(gwglLog::getApplyNo, process.getApprovalNo())
+                        .orderByDesc(gwglLog::getCreateTime)
+                        .last("LIMIT 1")
+                        .one();
+                if (one != null) {
+                    if ((one.getCheckUserId() != null && one.getCheckUserId().equals(getUserId().toString()))
+                            || (one.getChecker() != null && one.getChecker().equals(getNickname()))) {
+                        if (one.getCheckState() == 0) {
+                            process.setApprovalStatus(0);
+                        } else {
+                            process.setApprovalStatus(1);
+                        }
+                    }else {
+                        continue;
                     }
                 }
             }
@@ -120,14 +167,15 @@ public class ApprovalProcessController extends BaseController {
                 String formattedTime = localDateTime.format(formatter);
                 process.setShowTime(formattedTime);
             }
+            newList.add(process);
         }
-        return getDataTable(list);
+        return getDataTable(newList);
     }
 
     public static void main(String[] args) {
-        Long createTime = System.currentTimeMillis();
+        Long createTime = 1749279303395L;
         Instant instant = Instant.ofEpochMilli(createTime);
-       Long time = createTime - 24 * 60 * 60 * 1000 * 3;
+
 // 2. 转换为本地时区（如北京时间 UTC+8）
         LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.of("Asia/Shanghai"));
 
@@ -136,7 +184,7 @@ public class ApprovalProcessController extends BaseController {
 
 // 4. 格式化为字符串
         String formattedTime = localDateTime.format(formatter);
-        System.out.println(time);
+        System.out.println(formattedTime);
     }
 
     @ApiOperation("根据编号查")
@@ -152,17 +200,24 @@ public class ApprovalProcessController extends BaseController {
 
     @ApiOperation("根据用户id查")
     @PostMapping("/getByuserId")
-    public TableDataInfo getByuserId(ApprovalProcess approvalProcess) {
+    public TableDataInfo getByuserId(@RequestBody ApprovalProcess approvalProcess) {
-        List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
+        QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
-                .eq(ApprovalProcess::getSubmitterId, approvalProcess.getSubmitterId())
+        queryWrapper.orderByDesc("create_time");
-                .eq(approvalProcess.getApprovalStatus() != null, ApprovalProcess::getApprovalStatus, approvalProcess.getApprovalStatus())
+        if (approvalProcess.getTimeType() != null) {
-                .eq(approvalProcess.getCcName() != null, ApprovalProcess::getCcName, approvalProcess.getCcName())
+            if (approvalProcess.getTimeType() == 1) {
-                .eq(approvalProcess.getProcessTitle() != null, ApprovalProcess::getProcessTitle, approvalProcess.getProcessTitle())
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000L);
-                .eq(approvalProcess.getSubmitterName() != null, ApprovalProcess::getSubmitterName, approvalProcess.getSubmitterName())
+            } else if (approvalProcess.getTimeType() == 2) {
-                .eq(approvalProcess.getTimeType() != null, ApprovalProcess::getTimeType, approvalProcess.getTimeType())
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000L);
-                .orderByDesc(ApprovalProcess::getCreateTime)
+            } else if (approvalProcess.getTimeType() == 3) {
-                .list();
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L);
-
+            }
+        }
+        if (approvalProcess.getProcessTitle() != null) {
+            queryWrapper.like("process_title", approvalProcess.getProcessTitle())
+                    .or().like("submitter_name", approvalProcess.getProcessTitle());
+        }
+        queryWrapper.eq("submitter_id", getLoginUser().getUserId());
+        List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
         for (ApprovalProcess process : list) {
 
 //            如果创建时间为当天的时间