--add updateConsultStatus();add queryByDemand();update queryPageBase()

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

@@ -12,10 +12,13 @@ import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Consult;
@@ -37,6 +40,10 @@ public abstract class ConsultDao {
	@Insert
	public abstract int insert(Connection con, Consult consult) throws SQLException;
	
	@UpdateWith
	@From(Consult.class)
	public abstract int updateConsultStatus(Connection con,String consultId,@Set Integer consultStatus)throws SQLException;
	
	public int updateReadStatus(Connection con,String consultId) throws SQLException{
        int _m_1 = 1;
        String sql ="UPDATE CONSULT SET READ_STATUS = 1 WHERE CONSULT_ID = ? ";
@@ -121,6 +128,36 @@ public abstract class ConsultDao {
        }
    }
	
	/**
	 * 通过需求ID和专家ID查询咨询表中是否有该专家接受需求的咨询记录
	 * @param con
	 * @param professorId 专家ID
	 * @param demandId 需求ID
	 * @return 若有记录返回咨询ID，否则返回null
	 * @throws SQLException
	 */
	public String queryDemand(Connection con,String professorId,String demandId) throws SQLException{
        int index = 1;
        String sql = "SELECT CONSULT_ID FROM CONSULT WHERE DEMAND_ID = ? AND PROFESSOR_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(index++,demandId);
            ps.setString(index++,professorId);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                    return rs.getString(1);
                }else{
                    return null;
                }
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
    }
	
	/**
	 * 查询当前用户接受咨询被评价的平均星级
	 * @param con
@@ -506,11 +543,11 @@ public abstract class ConsultDao {
		StringBuilder sql = new StringBuilder();
		sql.append(" WHERE PROFESSOR_ID = ? ");
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 2 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 3 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}
@@ -680,11 +717,11 @@ public abstract class ConsultDao {
		StringBuilder sql = new StringBuilder();
		sql.append(" WHERE CONSULT.PROFESSOR_ID = ? ");
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 2 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 3 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}
@@ -883,11 +920,11 @@ public abstract class ConsultDao {
		StringBuilder sql = new StringBuilder();
		sql.append(" WHERE CONSULTANT_ID = ? ");
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 2 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 3 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}
@@ -1056,11 +1093,11 @@ public abstract class ConsultDao {
		StringBuilder sql = new StringBuilder();
		sql.append(" WHERE CONSULT.CONSULTANT_ID = ? ");
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 2 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 3 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}
@@ -1253,9 +1290,9 @@ public abstract class ConsultDao {
	 * 按条件搜索所有咨询的接口
	 * @param con
	 * @param professorId 用户ID
	 * @param consultOrNeed 接受咨询或咨询别人的状态值，1-别人咨询我的，2-我咨询别人的,默认为0
	 * @param consultOrNeed 接受咨询或咨询别人的状态值，1-收到咨询，2-我的需求,默认为1
	 * @param consultType 咨询类型，包括技术咨询、资源咨询、其他事务
	 * @param status 查询状态 0-全部，1-进行中，2-未感谢，3-未评价，4-已完成，默认为0
	 * @param status 查询状态 0-全部，1-待回复/新咨询，2-进行中，3-已谢绝，4-已完成，默认为0
	 * @param timeType 排序类型 0-按发起时间，1-按最后回复时间，2-按完成时间，默认为0
	 * @param pageSize
	 * @param pageNo
@@ -1279,15 +1316,15 @@ public abstract class ConsultDao {
			}else if("资源咨询".equals(consultType)){
				sql.append(" AND CONSULT_TYPE = '资源咨询' ");
			}else if("其他事务".equals(consultType)){
				sql.append(" AND CONSULT_TYPE != '技术咨询' AND CONSULT_TYPE != '资源咨询' ");
				sql.append(" AND CONSULT_TYPE = '其他事务' ");
			}
		}
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 2 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
			sql.append(" AND CONSULT_STATUS = 4 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}

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

@@ -16,9 +16,11 @@ import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.ConsultDao;
import com.ekexiu.portal.dao.ConsultRejectDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.TidingsDao;
import com.ekexiu.portal.po.Consult;
import com.ekexiu.portal.po.ConsultReject;
import com.ekexiu.portal.po.Tidings;
import com.ekexiu.portal.pojo.EditProfessor;
@@ -32,6 +34,8 @@ public class ConsultService {
	private ImageService imageService;
	@Autowrie
	private TidingsDao tidingsDao;
	@Autowrie
	private ConsultRejectDao consultRejectDao;
	
	public ConsultDao getConsultDao() {
		return consultDao;
@@ -57,12 +61,27 @@ public class ConsultService {
	public void setTidingsDao(TidingsDao tidingsDao) {
		this.tidingsDao = tidingsDao;
	}
	public ConsultRejectDao getConsultRejectDao() {
		return consultRejectDao;
	}
	public void setConsultRejectDao(ConsultRejectDao consultRejectDao) {
		this.consultRejectDao = consultRejectDao;
	}
	
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Consult consult) throws SQLException {
		String consultId = StringUtil.buildUUID();
		consult.setConsultId(consultId);
		consult.setAssessStatus(0);
		consult.setThanksStatus(0);
		if(consult.getDemandId() == null){
			consult.setConsultStatus(2);
			consult.setReadStatus(0);
		}else{
			consult.setConsultStatus(0);
			consult.setReadStatus(1);
		}
		this.consultDao.insert(con, consult);
		Tidings tidings = new Tidings();
		tidings.setTidingsId(StringUtil.buildUUID());
@@ -80,6 +99,29 @@ public class ConsultService {
		this.consultDao.updateReadStatus(con, consultId);
	}
	
	@Post
	@Path("/agree")
	public void agreeConsult(@JdbcConn(true) Connection con,String consultId)throws SQLException{
		//点击确认接受咨询，更新咨询状态为进行中
		this.consultDao.updateConsultStatus(con, consultId, 0);
	}
	
	@Post
	@Path("/reject")
	public void rejectConsult(@JdbcConn(true) Connection con,String consultId,String professorId,String[] reasons)throws SQLException{
		//点击谢绝咨询，更新咨询状态为已谢绝
		this.consultDao.updateConsultStatus(con, consultId, 3);
		for (int i = 0; i < reasons.length; i++) {
			ConsultReject reject = new ConsultReject();
			reject.setRejectId(StringUtil.buildUUID());
			reject.setConsultId(consultId);
			reject.setRejector(professorId);
			reject.setSort(i+1);
			reject.setRejectReason(reasons[i]);
			this.consultRejectDao.insert(con, reject);
		}
	}
	
	@Post
	@Path("/finishTime")
	public boolean updateFinishTime(@JdbcConn(true) Connection con, String consultId, int consultStatus) throws SQLException {
@@ -118,6 +160,12 @@ public class ConsultService {
		return false;
	}
	
	@Get
	@Path("/byDemand")
	public String queryDemand(@JdbcConn Connection con, String professorId, String demandId) throws SQLException{
		return this.consultDao.queryDemand(con, professorId, demandId);
	}
	
	@Get
	@Path("/pqAssessHis")
	public PageQueryResult<Consult> queryAssessHis(@JdbcConn Connection con, String professorId,@DefaultValue("5") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
@@ -239,7 +287,7 @@ public class ConsultService {
	@Get
	@Path("/pq")
	public PageQueryResult<Consult> queryPageBase(@JdbcConn Connection con, String professorId, 
			@DefaultValue("0") int consultOrNeed, @Nullable String consultType, @DefaultValue("0") int status, 
			@DefaultValue("1") int consultOrNeed, @Nullable String consultType, @DefaultValue("0") int status, 
			@DefaultValue("1") int timeType, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryPageBase(con, professorId, consultOrNeed, consultType, status, timeType, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();