修改bug
This commit is contained in:
parent
d2a7168c41
commit
a5f174eac9
|
@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
@ -67,7 +69,8 @@ public class XxhbtkxxController extends JeecgController<Xxhbtkxx, IXxhbtkxxServi
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<Xxhbtkxx> queryWrapper = QueryGenerator.initQueryWrapper(xxhbtkxx, req.getParameterMap());
|
QueryWrapper<Xxhbtkxx> queryWrapper = QueryGenerator.initQueryWrapper("a",xxhbtkxx, req.getParameterMap());
|
||||||
|
queryWrapper.eq(StringUtils.isNotBlank(xxhbtkxx.getXqxn()),"b.title",xxhbtkxx.getXqxn());
|
||||||
Page<Xxhbtkxx> page = new Page<Xxhbtkxx>(pageNo, pageSize);
|
Page<Xxhbtkxx> page = new Page<Xxhbtkxx>(pageNo, pageSize);
|
||||||
IPage<Xxhbtkxx> pageList = xxhbtkxxService.page(page, queryWrapper);
|
IPage<Xxhbtkxx> pageList = xxhbtkxxService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|
|
@ -136,4 +136,7 @@ public class Xxhbtkxx implements Serializable {
|
||||||
private java.lang.String tklx;
|
private java.lang.String tklx;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Integer mysqlnum;
|
private Integer mysqlnum;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String xqxn;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,4 +17,12 @@
|
||||||
<select id="getSumnum" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
|
<select id="getSumnum" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
|
||||||
select count(*) as mysqlnum from xxhbtkxx
|
select count(*) as mysqlnum from xxhbtkxx
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
<select id="selectPage" resultType="org.jeecg.modules.kc.grab.imports.entity.Xxhbtkxx">
|
||||||
|
select a.*,b.title as xqxn from xxhbtkxx a
|
||||||
|
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ <= b.end_time +''
|
||||||
|
${ew.customSqlSegment}
|
||||||
|
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
Loading…
Reference in New Issue