--update queryScore();

src/main/java/com/ekexiu/portal/dao/GrowthLogDao.java

@@ -5,9 +5,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
@@ -64,26 +62,40 @@ public abstract class GrowthLogDao {
        }
    }
	
	public Map<String, Integer> queryScore(Connection con,String professorId)throws SQLException{
	public int queryInviteScore(Connection con,String professorId)throws SQLException{
		int index = 1;
		String sql = "SELECT INVITE_PRO,SUM(SCORE) FROM GROWTH_LOG WHERE PROFESSOR_ID = ? GROUP BY INVITE_PRO ORDER BY INVITE_PRO";
		String sql = "SELECT SUM(SCORE) FROM GROWTH_LOG WHERE PROFESSOR_ID = ? AND INVITE_PRO IS NOT NULL";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(index++, professorId);
			ResultSet rs = ps.executeQuery();
			try{
				Map<String, Integer> map = new HashMap<String, Integer>();
				while(rs.next()){
					String invitePro = rs.getString(1);
					if(rs.wasNull()){
						invitePro = "myScore";
					}else{
						invitePro = "inviteScore";
					}
					Integer sum = rs.getInt(2);
					map.put(invitePro, sum);
				}
				return map;
				if(rs.next()){
                    return rs.getInt(1);
                }else{
                    return 0;
                }
			}finally{
				try{rs.close();}catch(Exception e1){}
			}
		}finally{
			try{ps.close();}catch(Exception e2){}
		}
	}
	
	public int queryMyScore(Connection con,String professorId)throws SQLException{
		int index = 1;
		String sql = "SELECT SUM(SCORE) FROM GROWTH_LOG WHERE PROFESSOR_ID = ? AND INVITE_PRO IS NULL";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(index++, professorId);
			ResultSet rs = ps.executeQuery();
			try{
				if(rs.next()){
                    return rs.getInt(1);
                }else{
                    return 0;
                }
			}finally{
				try{rs.close();}catch(Exception e1){}
			}

src/main/java/com/ekexiu/portal/service/GrowthLogService.java

@@ -5,6 +5,7 @@ import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -108,7 +109,12 @@ public class GrowthLogService {
	@Get
	@Path("/queryScore")
	public Map<String, Integer> queryScore(@JdbcConn Connection con,String professorId)throws SQLException{
		return this.growthLogDao.queryScore(con, professorId);
		int myScore = this.growthLogDao.queryMyScore(con, professorId);
		int inviteScore= this.growthLogDao.queryInviteScore(con, professorId);
		Map<String, Integer> map = new HashMap<String, Integer>();
		map.put("myScore", myScore);
		map.put("inviteScore", inviteScore);
		return map;
	}
	/**