--add pageQueryOrg();update queryOne();

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

@@ -43,6 +43,11 @@ public abstract class DemandDao {
	@From(Demand.class)
	public abstract int queryCountByStatus(Connection con,String demander,String demandStatus)throws SQLException, JfwBaseException;
	
	@QueryVal
	@Column(handlerClass=IntHandler.class,value="COUNT(1)")
	@From(Demand.class)
	public abstract int queryCountStatus(Connection con,String demandStatus)throws SQLException, JfwBaseException;
	
	@SelectList
	@OrderBy("ORDER BY CREATE_TIME DESC")
	public abstract List<Demand> queryByDemander(Connection con,String demander)throws SQLException;
@@ -203,7 +208,7 @@ public abstract class DemandDao {
        if(firstPage){
        	queryResult.setPageNo(1);
            sql = new StringBuilder();
            sql.append("SELECT DEMAND_ID,DEMANDER,DEMAND_AIM,DEMAND_TYPE,DEMAND_TITLE,DEMAND_CONTENT,DEMAND_STATUS,CLOSE_TIME,ORDER_KEY,CREATE_TIME FROM DEMAND");
            sql.append("SELECT DEMAND_ID,DEMANDER,DEMAND_AIM,DEMAND_TYPE,DEMAND_TITLE,DEMAND_CONTENT,DEMAND_STATUS,CLOSE_TIME,ORDER_KEY,CREATE_TIME,ORG_ID FROM DEMAND");
            if(whereSql.length()>0){
                sql.append(whereSql);
            }
@@ -224,7 +229,7 @@ public abstract class DemandDao {
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("SELECT DEMAND_ID,DEMANDER,DEMAND_AIM,DEMAND_TYPE,DEMAND_TITLE,DEMAND_CONTENT,DEMAND_STATUS,CLOSE_TIME,ORDER_KEY,CREATE_TIME FROM DEMAND");
            sql.append("SELECT DEMAND_ID,DEMANDER,DEMAND_AIM,DEMAND_TYPE,DEMAND_TITLE,DEMAND_CONTENT,DEMAND_STATUS,CLOSE_TIME,ORDER_KEY,CREATE_TIME,ORG_ID FROM DEMAND");
            if(whereSql.length()>0){
                sql.append(whereSql);
            }
@@ -266,6 +271,134 @@ public abstract class DemandDao {
                    demand.setCloseTime(closeTime);
                    demand.setOrderKey(rs.getLong(9));
                    demand.setCreateTime(rs.getString(10));
                    String orgId = rs.getString(11);
                    if(rs.wasNull()){
                    	orgId = null;
                    }
                    demand.setOrgId(orgId);
                    demands.add(demand);
                }
                return queryResult;
            }finally{
                try{rs.close();}catch(Exception e3){}
            }
        }finally{
            try{ps.close();}catch(Exception e4){}
        }
    }
	
	public PageQueryResult<Demand> pageQueryOrg(Connection con,String orgId,String demandStatus,int sortType,int pageSize,int pageNo) throws SQLException{
        int total = 0;
        PageQueryResult<Demand> queryResult = new PageQueryResult<Demand>();
        int index = 1;
        boolean hasDemandStatus = null != demandStatus;
        StringBuilder sql = new StringBuilder();
        sql.append(" WHERE ORG_ID = ? ");
        if(hasDemandStatus){
            sql.append(" AND DEMAND_STATUS = ?");
        }
        StringBuilder whereSql = sql;
        sql = new StringBuilder();
        sql.append("SELECT COUNT(1) FROM DEMAND");
        if(whereSql.length()>0){
            sql.append(whereSql);
        }
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
        	ps.setString(index++, orgId);
            if(hasDemandStatus){
                ps.setString(index++,demandStatus);
            }
            queryResult.setPageSize(pageSize);
            ResultSet rs = ps.executeQuery();
            try{
                rs.next();
                total = rs.getInt(1);
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
        queryResult.setTotal(total);
        if(0== total){
        	queryResult.setPageNo(1);
        	queryResult.setData(Collections.<Demand>emptyList());
            return queryResult;
        }
        index = 1;
        boolean firstPage = (1 == pageNo);
        if(firstPage){
        	queryResult.setPageNo(1);
            sql = new StringBuilder();
            sql.append("SELECT DEMAND_ID,DEMANDER,DEMAND_AIM,DEMAND_TYPE,DEMAND_TITLE,DEMAND_CONTENT,DEMAND_STATUS,CLOSE_TIME,ORDER_KEY,CREATE_TIME,ORG_ID FROM DEMAND");
            if(whereSql.length()>0){
                sql.append(whereSql);
            }
            sql.append(" ORDER BY CREATE_TIME");
            if(sortType == 0){
            	sql.append(" DESC ");
            }
            sql.append(" LIMIT ").append(pageSize);
        }else{
            int pageNum = total / pageSize;
            if(total % pageSize != 0){
                ++pageNum;
            }
            if(pageNo > pageNum){
                pageNo = pageNum;
            }
            queryResult.setPageNo(pageNo);
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("SELECT DEMAND_ID,DEMANDER,DEMAND_AIM,DEMAND_TYPE,DEMAND_TITLE,DEMAND_CONTENT,DEMAND_STATUS,CLOSE_TIME,ORDER_KEY,CREATE_TIME,ORG_ID FROM DEMAND");
            if(whereSql.length()>0){
                sql.append(whereSql);
            }
            sql.append(" ORDER BY CREATE_TIME");
            if(sortType == 0){
            	sql.append(" DESC ");
            }
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
        }
        ps = con.prepareStatement(sql.toString());
        try{
        	ps.setString(index++, orgId);
            if(hasDemandStatus){
                ps.setString(index++,demandStatus);
            }
            ResultSet rs = ps.executeQuery();
            try{
                List<Demand> demands = new ArrayList<Demand>();
                queryResult.setData(demands);
                int size = 0;
                while((size<pageSize) && rs.next()){
                    ++size;
                    Demand demand =  new Demand();
                    demand.setDemandId(rs.getString(1));
                    demand.setDemander(rs.getString(2));
                    demand.setDemandAim(rs.getString(3));
                    demand.setDemandType(rs.getString(4));
                    demand.setDemandTitle(rs.getString(5));
                    String demandContent = rs.getString(6);
                    if(rs.wasNull()){
                        demandContent = null;
                    }
                    demand.setDemandContent(demandContent);
                    demand.setDemandStatus(rs.getString(7));
                    String closeTime = rs.getString(8);
                    if(rs.wasNull()){
                    	closeTime = null;
                    }
                    demand.setCloseTime(closeTime);
                    demand.setOrderKey(rs.getLong(9));
                    demand.setCreateTime(rs.getString(10));
                    String orgid = rs.getString(11);
                    if(rs.wasNull()){
                    	orgid = null;
                    }
                    demand.setOrgId(orgid);
                    demands.add(demand);
                }
                return queryResult;

src/main/java/com/ekexiu/portal/po/Demand.java

@@ -7,6 +7,7 @@ import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
@Table
@@ -24,6 +25,7 @@ public class Demand implements CreateTimeSupported {
	private long orderKey;
	private String orgId;
	private EditProfessor professor;
	private EditOrganization organization;
	
	public EditProfessor getProfessor() {
		return professor;
@@ -31,6 +33,12 @@ public class Demand implements CreateTimeSupported {
	public void setProfessor(EditProfessor professor) {
		this.professor = professor;
	}
	public EditOrganization getOrganization() {
		return organization;
	}
	public void setOrganization(EditOrganization organization) {
		this.organization = organization;
	}
	@Column(DE.id_32)
	public String getDemandId() {
		return demandId;

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

@@ -36,6 +36,9 @@ public class DemandService {
	private ProfessorDao professorDao;
	@Autowrie
	private ImageService imageService;
	@Autowrie
	private OrgService orgService;
	
	public DemandDao getDemandDao() {
		return demandDao;
	}
@@ -60,6 +63,12 @@ public class DemandService {
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	public OrgService getOrgService() {
		return orgService;
	}
	public void setOrgService(OrgService orgService) {
		this.orgService = orgService;
	}
	
	@Post
	@Path
@@ -99,11 +108,14 @@ public class DemandService {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(demand.getDemander()));
		}
		demand.setProfessor(professor);
		if(demand.getOrgId() != null){
			demand.setOrganization(this.orgService.query(con, demand.getOrgId()));
		}
		return demand;
	}
	
	/**
	 * 查询发布中的需求总数
	 * 查询我发布中的需求总数
	 * @param con
	 * @param demander 发布者ID
	 * @return 返回状态发布中的需求总数
@@ -111,11 +123,17 @@ public class DemandService {
	 * @throws JfwBaseException 
	 */
	@Get
	@Path("/queryPublish")
	public int queryPublish(@JdbcConn Connection con,String demander)throws SQLException, JfwBaseException{
	@Path("/queryMyPublish")
	public int queryMyPublish(@JdbcConn Connection con,String demander)throws SQLException, JfwBaseException{
		return this.demandDao.queryCountByStatus(con, demander, "1");
	}
	
	@Get
	@Path("/queryPublish")
	public int queryPublish(@JdbcConn Connection con)throws SQLException, JfwBaseException{
		return this.demandDao.queryCountStatus(con, "1");
	}
	
	@Get
	@Path("/byDemander")
	public List<Demand> queryByDemander(@JdbcConn Connection con,String demander)throws SQLException{
@@ -147,6 +165,23 @@ public class DemandService {
		return queryResult;
	}
	
	@Get
	@Path("/pqOrg")
	public PageQueryResult<Demand> pageQueryOrg(@JdbcConn Connection con,String orgId,@Nullable String demandStatus,
			@DefaultValue("0") int sortType,@DefaultValue("5") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		PageQueryResult<Demand> queryResult = this.demandDao.pageQueryOrg(con, orgId, demandStatus, sortType, pageSize, pageNo);
		List<Demand> demands = queryResult.getData();
		for (Demand demand : demands) {
			EditProfessor professor = this.professorDao.queryBaseInfo(con, demand.getDemander());
			if(professor != null){
				professor.setHasHeadImage(this.imageService.hasProfessorImage(demand.getDemander()));
			}
			demand.setProfessor(professor);
		}
		queryResult.setData(demands);
		return queryResult;
	}
	
	@Get
	@Path("/ql")
	public List<Demand> queryByStatus(@JdbcConn Connection con,@Nullable String demandAim,@Nullable String subject,