bug

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1408,10 +1408,15 @@ public class TaskController extends BladeController {
         StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND status = 1 AND approval_type != 4 AND contract_id = " + dto.getContractId()); //approval_type != 4 非档案的任务就是1填报资料，2工程文件，3日志资料
 
         if (StringUtils.isNotBlank(dto.getStartTimeValue()) && StringUtils.isNotBlank(dto.getEndTimeValue())) {
-            sqlString.append(" AND start_time >= ?")
-                    .append(" AND end_time <= ?");
-            params.add(dto.getStartTimeValue());
-            params.add(dto.getEndTimeValue());
+            if (dto.getStartTimeValue().equals(dto.getEndTimeValue())) {
+                sqlString.append(" AND start_time = ?");
+                params.add(dto.getStartTimeValue());
+            } else {
+                sqlString.append(" AND start_time >= ?")
+                        .append(" AND end_time <= ?");
+                params.add(dto.getStartTimeValue());
+                params.add(dto.getEndTimeValue());
+            }
         }
 
         if (StringUtils.isNotBlank(dto.getQueryValue())) {
@@ -1548,15 +1553,18 @@ public class TaskController extends BladeController {
                             for (Task task : taskList) {
                                 List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                                 for (TaskParallel taskParallel : taskParallelList) {
-                                    TaskApprovalVO approvalVO = new TaskApprovalVO();
-                                    approvalVO.setTaskId(task.getId().toString());
-                                    approvalVO.setFlag("OK");
-                                    approvalVO.setComment("重新发起电签");
-                                    approvalVO.setApprovalType(1);
-                                    approvalVO.setFormDataId(task.getFormDataId());
-                                    approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
-                                    approvalVO.setYsNickName(taskParallel.getTaskUserName());
-                                    taskApprovalVOS.add(approvalVO);
+                                    //待审批的不进行重签
+                                    if (!(new Integer(1)).equals(taskParallel.getStatus())) {
+                                        TaskApprovalVO approvalVO = new TaskApprovalVO();
+                                        approvalVO.setTaskId(task.getId().toString());
+                                        approvalVO.setFlag("OK");
+                                        approvalVO.setComment("重新发起电签");
+                                        approvalVO.setApprovalType(1);
+                                        approvalVO.setFormDataId(task.getFormDataId());
+                                        approvalVO.setParallelProcessInstanceId(taskParallel.getParallelProcessInstanceId());
+                                        approvalVO.setYsNickName(taskParallel.getTaskUserName());
+                                        taskApprovalVOS.add(approvalVO);
+                                    }
                                 }
                             }
                             long startTime_2 = System.currentTimeMillis();