我的审批查询

src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -1351,16 +1351,16 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
                 formData.put(pk.getName(), keyValue);
                 //此时的formData 已经是剔除了子表单数据了
                 where.putAll(toSaveFormData);
-                System.out.println("insertOrUpdateFormDataByWorkflow 3.3");
+//                System.out.println("insertOrUpdateFormDataByWorkflow 3.3");
                 //如果有审计字段  默认填充值
                 putAuditEntityInsertData(where, columns);
-                System.out.println("insertOrUpdateFormDataByWorkflow 4");
+//                System.out.println("insertOrUpdateFormDataByWorkflow 4");
                 // 保存主表数据
                 Boolean result = SqlRunnerAdapter.db().dynamicInsert(tableName, where);
                 if (!result) {
                     throw new MyException("添加数据失败");
                 }
-                System.out.println("insertOrUpdateFormDataByWorkflow 5");
+//                System.out.println("insertOrUpdateFormDataByWorkflow 5");
 
                 // 保存子表数据
                 for (Map.Entry<String, List<Entity>> tableMap : childMaps.entrySet()) {

src/main/java/com/xjrsoft/module/workflow/dto/MyExaminePageDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -23,14 +24,14 @@ public class MyExaminePageDto extends PageInput {
      * 开始时间
      */
     @ApiModelProperty("开始时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startTime;
     /**
      * 结束时间
      */
     @ApiModelProperty("结束时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endTime;
     /**
      * 模板名称
      */

src/main/resources/mapper/workflow/WorkflowExtraMapper.xml

@@ -35,6 +35,15 @@
             or t.start_user_name like concat('%',#{dto.keyword}, '%')
             )
         </if>
+        <if test="dto.name != null and dto.name != ''">
+            and (t.task_name like concat('%',#{dto.name}, '%')
+            or t.process_name like concat('%',#{dto.name}, '%')
+            or t.schema_name like concat('%',#{dto.name}, '%')
+            )
+        </if>
+        <if test="dto.startTime != null and dto.endTime != null">
+            and date_format(t.start_time, '%Y-%m-%d') between #{dto.startTime} and #{dto.endTime}
+        </if>
     order by t.start_time DESC
     </select>