diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java index aa24b582..0724f3cf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java @@ -194,6 +194,22 @@ public class KcTingke implements Serializable { private java.lang.String pj; + /** + * 分页 + */ + @TableField(exist = false) + private Integer pageSize; + /** + * 开始时间搜索 + */ + @TableField(exist = false) + private String startDate; + + /** + * 结束时间搜索 + */ + @TableField(exist = false) + private String endDate; // private java.lang.String tingketime; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index aabac006..22cc6d0b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -432,6 +432,7 @@ ORDER BY tk.tingketime DESC LIMIT 3 + ) tk LEFT JOIN ( SELECT @@ -454,19 +455,33 @@ ) ev ON tk.ketangbiaoid = ev.ketangbiaoid + + and tkrq >= #{startDate} + + + and tkrq #{endDate} + + - (kcmc like CONCAT('%',searchInput,'%') or skjs like CONCAT('%',searchInput,'%')) + and (kcmc like CONCAT('%',#{searchInput},'%') or skjs like CONCAT('%',#{searchInput},'%')) - score is null + and score is null - score is not null + and score is not null + + LIMIT #{pageSize} + + + LIMIT #{pageSize} + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java index 49e51282..a679f686 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java @@ -87,7 +87,9 @@ public interface SysDictMapper extends BaseMapper { @Deprecated public List queryTableDictItemsByCodeAndFilter(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("filterSql") String filterSql); - /** + List queryTableDictItemsByCodeAndFilterAndOrderBy(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("filterSql") String filterSql, @Param("orderByList") List orderByList); + + /** * 通过查询指定table的 text code 获取字典 * @param table * @param key @@ -272,4 +274,5 @@ public interface SysDictMapper extends BaseMapper { */ @InterceptorIgnore(tenantLine = "true") List getDictListByLowAppId(@Param("lowAppId") String lowAppId, @Param("tenantId") Integer tenantId); + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index d87729d2..639fbfb6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -74,7 +74,20 @@ where ${filterSql} - + + + +