guarantee-lsq 11 hónapja
szülő
commit
a52299bf01

+ 8 - 0
platform-dao/src/main/java/com/platform/dao/dto/custom/CustomFormBomDTO.java

@@ -132,4 +132,12 @@ public class CustomFormBomDTO extends BaseDTO implements Serializable {
      */
     private String keyword;
 
+    private String name;
+
+    private String formCategory; // 表单分类
+
+    private String formType; // 表单类型
+
+    private String status; // 状态
+
 }

+ 11 - 4
platform-dao/src/main/java/com/platform/dao/entity/custom/CustomFormBom.java

@@ -1,15 +1,14 @@
 package com.platform.dao.entity.custom;
 
+import com.platform.common.bean.DataScope;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.time.LocalDate;
-import lombok.experimental.Accessors;
-import com.platform.common.bean.DataScope;
-import javax.persistence.Transient;
 
 /**
  * @Description 自定义表单数据查询bom表实体类
@@ -114,4 +113,12 @@ public class CustomFormBom implements Serializable{
     @Transient
     private DataScope dataScope;
 
+    private String name;
+
+    private String formCategory; // 表单分类
+
+    private String formType; // 表单类型
+
+    private String status; // 状态
+
 }

+ 8 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/custom/CustomFormBomVO.java

@@ -104,5 +104,13 @@ public class CustomFormBomVO extends BaseVO implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    private String name;
+
+    private String formCategory; // 表单分类
+
+    private String formType; // 表单类型
+
+    private String status; // 状态
+
 
 }

+ 9 - 3
platform-dao/src/main/resources/mapper/custom/CustomFormBomMapper.xml

@@ -54,10 +54,10 @@
             and bom.data_id = #{dataId}
         </if>
         <if test="applyMan != null and applyMan != ''">
-            and bom.apply_man = #{applyMan}
+            and bom.apply_man like concat(concat('%',#{applyMan}),'%')
         </if>
         <if test="applyTimeStart != null">
-            and bom.apply_time <![CDATA[>=]]>; #{applyTimeStart}
+            and bom.apply_time <![CDATA[>=]]> #{applyTimeStart}
         </if>
         <if test="applyTimeEnd != null">
             and bom.apply_time <![CDATA[<=]]> #{applyTimeEnd}
@@ -105,7 +105,7 @@
             and bom.created_user_name = #{createdUserName}
         </if>
         <if test="createdTimeStart != null">
-            and bom.created_time <![CDATA[>=]]>; #{createdTimeStart}
+            and bom.created_time <![CDATA[>=]]> #{createdTimeStart}
         </if>
         <if test="createdTimeEnd != null">
             and bom.created_time <![CDATA[<=]]> #{createdTimeEnd}
@@ -131,6 +131,12 @@
         <if test="keyword != null and keyword != ''">
             and bom.id like concat(concat('%',#{keyword}),'%')
         </if>
+        <if test="formType != null and formType != ''">
+            and bom.form_type = #{formType}
+        </if>
+        <if test="formCategory != null and formCategory != ''">
+            and bom.form_category = #{formCategory}
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.custom.CustomFormBomDTO"
             resultType="com.platform.dao.vo.query.custom.CustomFormBomVO">