Commit 99e88e15 authored by liukai's avatar liukai

修改问题

parent aa092694
......@@ -61,6 +61,15 @@ public class ApiBaseDto implements Serializable {
@ApiModelProperty("每页条数")
private Integer pageSize;
@ApiModelProperty("更新开始")
private String startMTime;
@ApiModelProperty("更新结束")
private String endMTime;
@ApiModelProperty("分类名称")
private String apiGroupName;
private List<String> apiGroupCodeList;
......@@ -167,4 +176,28 @@ public class ApiBaseDto implements Serializable {
public void setApiGroupCodeList(List<String> apiGroupCodeList) {
this.apiGroupCodeList = apiGroupCodeList;
}
public String getStartMTime() {
return startMTime;
}
public void setStartMTime(String startMTime) {
this.startMTime = startMTime;
}
public String getEndMTime() {
return endMTime;
}
public void setEndMTime(String endMTime) {
this.endMTime = endMTime;
}
public String getApiGroupName() {
return apiGroupName;
}
public void setApiGroupName(String apiGroupName) {
this.apiGroupName = apiGroupName;
}
}
......@@ -73,10 +73,12 @@
select
oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime,
oab.api_description,oab.professional_kind
oab.api_description,oab.professional_kind,oab.api_mtime,oab.api_user_name,
oab.api_group_code,oag.api_group_name
from ocp_api_base oab
LEFT JOIN ocp_api_extent oae on oab.api_code = oae.api_code
LEFT JOIN ocp_tenant_iocn oci on oab.api_code = oci.code_no
LEFT JOIN ocp_api_group oag on oab.api_group_code = oag.api_group_code
<where>
<if test="apiGroupCodeList !=null ">
and oab.api_group_code in
......@@ -104,6 +106,19 @@
<if test="keyword !=null and keyword != '' ">
and oab.api_name like CONCAT('%', #{keyword}::text,'%')
</if>
<if test="startMTime !=null ">
<![CDATA[
and oab.api_mtime >= #{startMTime}
]]>
</if>
<if test="endMTime !=null ">
<![CDATA[
and oab.api_mtime <= #{endMTime}
]]>
</if>
<if test="apiGroupName !=null and apiGroupName!=''">
and oag.api_group_name = #{apiGroupName}
</if>
</where>
order by oab.api_mtime desc
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment