XMTT 7 ans auparavant
Parent
commit
a25e08a216

+ 6 - 10
src/main/java/com/ekexiu/portal/ware/WareDao.java

@ -1,17 +1,10 @@
1 1
package com.ekexiu.portal.ware;
2 2

3
import java.sql.Connection;
4
import java.sql.PreparedStatement;
5
import java.sql.SQLException;
6
import java.util.ArrayList;
7
import java.util.List;
8

9 3
import org.jfw.apt.annotation.DefaultValue;
10 4
import org.jfw.apt.annotation.Nullable;
11 5
import org.jfw.apt.orm.annotation.dao.Column;
12 6
import org.jfw.apt.orm.annotation.dao.DAO;
13 7
import org.jfw.apt.orm.annotation.dao.method.From;
14
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
15 8
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
16 9
import org.jfw.apt.orm.annotation.dao.method.Select;
17 10
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
@ -33,10 +26,13 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
33 26
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
34 27
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
35 28
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
36
import org.jfw.apt.web.annotation.method.SetCookie;
37 29
import org.jfw.util.PageQueryResult;
38 30

39
import com.ekexiu.portal.question.Answer;
31
import java.sql.Connection;
32
import java.sql.PreparedStatement;
33
import java.sql.SQLException;
34
import java.util.ArrayList;
35
import java.util.List;
40 36

41 37
@DAO
42 38
public abstract class WareDao {
@ -122,7 +118,7 @@ public abstract class WareDao {
122 118
	public abstract List<Ware> queryPublish(Connection con, String category, String owner, @LessThan String modifyTime, int rows) throws SQLException;
123 119

124 120
	@PageSelect
125
	@OrderBy("OrderBy STATE DESC,MODIFY_TIMDE DESC")
121
	@OrderBy("Order By STATE DESC,MODIFY_TIMDE DESC")
126 122
	@Where("(STATE='1' OR STATE ='2') AND CATEGORY='1'")
127 123
	public abstract PageQueryResult<Ware> pageQuery(Connection con,
128 124
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?" }, isAnd = false) String key,

+ 1 - 1
src/main/java/com/ekexiu/portal/ware/WareService.java

@ -539,7 +539,7 @@ public class WareService {
539 539
	 * @throws SQLException
540 540
	 */
541 541
	@Get
542
	@Path("/pg/search")
542
	@Path("/pq/search")
543 543
	public PageQueryResult<Ware> pageQuery(@JdbcConn Connection con, @Nullable String key, String pid, int pageSize, int pageNo) throws SQLException {
544 544
		if (key != null) {
545 545
			key = "%" + key + "%";