guarantee-lsq 9 сар өмнө
parent
commit
8697e659be

+ 7 - 0
platform-dao/src/main/java/com/platform/dao/dto/workflow/WorkflowTaskBomDTO.java

@@ -135,4 +135,11 @@ public class WorkflowTaskBomDTO extends BaseDTO implements Serializable {
      */
     private String keyword;
 
+    private String taskName;
+
+    private LocalDateTime taskCreatedTimeStart; // 任务创建开始时间
+    private LocalDateTime taskCreatedTimeEnd; // 任务创建结束时间
+
+    private LocalDateTime applyTimeStart; // 发起开始时间
+    private LocalDateTime applyTimeEnd; // 发起结束时间
 }

+ 15 - 0
platform-dao/src/main/resources/mapper/workflow/WorkflowTaskBomMapper.xml

@@ -106,6 +106,21 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="taskName != null and taskName != ''">
+                and task.task_name like concat(concat('%',#{taskName}),'%')
+            </if>
+            <if test="taskCreatedTimeStart != null">
+                and task.created_time <![CDATA[>=]]> #{taskCreatedTimeStart}
+            </if>
+            <if test="taskCreatedTimeEnd != null">
+                and task.created_time <![CDATA[<=]]> #{taskCreatedTimeEnd}
+            </if>
+            <if test="applyTimeStart != null">
+                and task.apply_time <![CDATA[>=]]> #{applyTimeStart}
+            </if>
+            <if test="applyTimeEnd != null">
+                and task.apply_time <![CDATA[<=]]> #{applyTimeEnd}
+            </if>
         </where>
     </select>
 </mapper>

+ 0 - 1
platform-rest/src/main/java/com/platform/rest/controller/custom/CustomFormController.java

@@ -14,7 +14,6 @@ import com.platform.dao.vo.query.custom.CustomFormVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.custom.CustomFormService;
 import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;