Merge remote-tracking branch 'origin/master'

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

@@ -49,13 +49,16 @@ public class ApprovalProcessController extends BaseController {
         startPage();
         QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
         queryWrapper.orderByDesc("create_time");
-        if (approvalProcess.getTimeType() == 1) {
+        if (approvalProcess.getTimeType() != null) {
-            queryWrapper.ge("create_time", System.currentTimeMillis() - 24 * 60 * 60 * 1000);
+            if (approvalProcess.getTimeType() == 1) {
-        } else if (approvalProcess.getTimeType() == 2) {
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000);
-            queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000);
+            } else if (approvalProcess.getTimeType() == 2) {
-        } else if (approvalProcess.getTimeType() == 3) {
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000);
-            queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
+            } else if (approvalProcess.getTimeType() == 3) {
+                queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000);
+            }
         }
+
         List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
 
         for (ApprovalProcess process : list) {
@@ -135,13 +138,15 @@ public class ApprovalProcessController extends BaseController {
 
 
     @ApiOperation("根据用户id查")
-    @PostMapping("/getByuserId/{id}")
+    @PostMapping("/getByuserId")
     public TableDataInfo getByuserId(ApprovalProcess approvalProcess) {
         List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
                 .eq(ApprovalProcess::getSubmitterId, approvalProcess.getSubmitterId())
                 .eq(approvalProcess.getApprovalStatus() != null, ApprovalProcess::getApprovalStatus, approvalProcess.getApprovalStatus())
                 .eq(approvalProcess.getCcName() != null, ApprovalProcess::getCcName, approvalProcess.getCcName())
                 .eq(approvalProcess.getProcessTitle() != null, ApprovalProcess::getProcessTitle, approvalProcess.getProcessTitle())
+                .eq(approvalProcess.getSubmitterName() != null, ApprovalProcess::getSubmitterName, approvalProcess.getSubmitterName())
+                .eq(approvalProcess.getTimeType() != null, ApprovalProcess::getTimeType, approvalProcess.getTimeType())
                 .orderByDesc(ApprovalProcess::getCreateTime)
                 .list();
 
@@ -200,7 +205,7 @@ public class ApprovalProcessController extends BaseController {
     public AjaxResult getById(@PathVariable Long id) {
         ApprovalProcess byId = approvalsProcessService.getById(id);
         Integer matterType = byId.getMatterType();
-        if (matterType == 2){
+        if (matterType == 2) {
             BusinessTripApproval one = businessTripApprovalService.lambdaQuery()
                     .eq(BusinessTripApproval::getUuid, byId.getUuid())
                     .last("LIMIT 1")
@@ -208,14 +213,14 @@ public class ApprovalProcessController extends BaseController {
             one.setDestinationIdCn(byId.getBusinessTripDestination());
             return AjaxResult.success(one);
         }
-        if (matterType == 3){
+        if (matterType == 3) {
             PoliceLeaveApproval one = policeLeaveApprovalService.lambdaQuery()
                     .eq(PoliceLeaveApproval::getUuid, byId.getUuid())
                     .last("LIMIT 1")
                     .one();
             return AjaxResult.success(one);
         }
-        if (matterType == 4){
+        if (matterType == 4) {
             NonWorkingDayDrinkingReport one = nonWorkingDayDrinkingReportService.lambdaQuery()
                     .eq(NonWorkingDayDrinkingReport::getUuid, byId.getUuid())
                     .last("LIMIT 1")