Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git

into dev

src/main/java/com/ekexiu/portal/question/QuestionDao.java

@@ -1,9 +1,5 @@
package com.ekexiu.portal.question;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
@@ -29,6 +25,10 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public interface QuestionDao {
@@ -134,7 +134,7 @@ public interface QuestionDao {
	@LimitQuery
	@OrderBy("ORDER BY SCORE_DESC DESC")
	@Where("STATE='1'")
	List<SortedAnswwer> byQesScore(Connection con, String qid, @SqlColumn(handlerClass = StringHandler.class, value = { "(case when ballot=0 then '00000'  else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end  || ID) < ?  " })  String score, int rows) throws SQLException;
	List<SortedAnswwer> byQesScore(Connection con, String qid, @SqlColumn(handlerClass = StringHandler.class, value = { "(case when ballot=0 then '00000'  else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end || TO_CHAR(AGREE,'00000000000000000009') || ID) < ?  " })  String score, int rows) throws SQLException;
	@Insert
	int insert(Connection con,AnswerAgreeRec aar)throws SQLException;

src/main/java/com/ekexiu/portal/question/Service.java

@@ -1,21 +1,8 @@
package com.ekexiu.portal.question;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.util.SqlUtil;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -38,9 +25,21 @@ import org.jfw.util.jdbc.PreparedStatementConfig;
import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.util.SqlUtil;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@Path("/question")
public class Service {
@@ -573,10 +572,11 @@ public class Service {
	 */
	@Get
	@Path("/answer/qes/byScore")
	public List<SortedAnswwer> byQes(@JdbcConn Connection con, String qid, @DefaultValue("99999") int score, @DefaultValue("\"Z\"") String id,
	public List<SortedAnswwer> byQes(@JdbcConn Connection con, String qid, @DefaultValue("99999") int score, @DefaultValue("\"Z\"") String id,@DefaultValue("0") long agree,
			@DefaultValue("10000000") int rows) throws SQLException {
		String p = "000000" + score;
		p = p.substring(p.length() - 5) + id;
		String a = "00000000000000000000"+agree;
		p = p.substring(p.length() - 5) + a.substring(a.length()-20) + id;
		return questionDao.byQesScore(con, qid, p, rows);
	}

src/main/java/com/ekexiu/portal/question/SortedAnswwer.java

@@ -11,7 +11,7 @@ public class SortedAnswwer extends Answer {
	private transient String scoreDesc;
	
	
	@CalcColumn(nullable=false,handlerClass=StringHandler.class,column=" case when ballot=0 then '00000' else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end  || ID SCORE_DESC")
	@CalcColumn(nullable=false,handlerClass=StringHandler.class,column=" case when ballot=0 then '00000' else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end ||  TO_CHAR(AGREE,'00000000000000000009') || ID SCORE_DESC")
	public String getScoreDesc() {
		return scoreDesc;
	}