Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.com.portal.git

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

@@ -68,7 +68,7 @@ public abstract class PayHistoryDao {
	
	public List<PayHistory> queryDetail(Connection con,String operationId) throws SQLException{
        int _m_1 = 1;
        String sql = "SELECT PAY_HISTORY_ID,PAY_HISTORY.OPERATION_ID,PAID_MONEY,RETURN_MONEY,REMARK,ISONLINE,PAY_TYPE,PAY_HISTORY.CREATE_TIME,OPERATION.DEAL_PRICE,OPERATION.CREATE_TIME,PAY_HISTORY.PROFESSOR_ID,PROFESSOR.NAME FROM PAY_HISTORY LEFT JOIN OPERATION ON PAY_HISTORY.OPERATION_ID = OPERATION.OPERATION_ID LEFT JOIN PROFESSOR ON PAY_HISTORY.PROFESSOR_ID = PROFESSOR.ID WHERE PAY_HISTORY.OPERATION_ID = ?";
        String sql = "SELECT PAY_HISTORY_ID,PAY_HISTORY.OPERATION_ID,PAID_MONEY,RETURN_MONEY,REMARK,ISONLINE,PAY_TYPE,PAY_STATUS,PAY_HISTORY.CREATE_TIME,OPERATION.DEAL_PRICE,OPERATION.CREATE_TIME,PAY_HISTORY.PROFESSOR_ID,PROFESSOR.NAME FROM PAY_HISTORY LEFT JOIN OPERATION ON PAY_HISTORY.OPERATION_ID = OPERATION.OPERATION_ID LEFT JOIN PROFESSOR ON PAY_HISTORY.PROFESSOR_ID = PROFESSOR.ID WHERE PAY_HISTORY.OPERATION_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,operationId);
@@ -89,13 +89,14 @@ public abstract class PayHistoryDao {
                    _obj.setRemark(_m_2);
                    _obj.setIsonline(rs.getInt(6));
                    _obj.setPayType(rs.getInt(7));
                    _obj.setCreateTime(rs.getString(8));
                    operation.setDealPrice(rs.getBigDecimal(9));
                    operation.setCreateTime(rs.getString(10));
                    _obj.setPayStatus(rs.getShort(8));
                    _obj.setCreateTime(rs.getString(9));
                    operation.setDealPrice(rs.getBigDecimal(10));
                    operation.setCreateTime(rs.getString(11));
                    _obj.setOperation(operation);
                    Professor professor = new Professor();
                    professor.setId(rs.getString(11));
                    professor.setName(rs.getString(12));
                    professor.setId(rs.getString(12));
                    professor.setName(rs.getString(13));
                    _obj.setProfessor(professor);
                    _result.add(_obj);
                }

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

@@ -99,7 +99,7 @@ public class Operation implements CreateTimeSupported {
		this.demandId = demandId;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=false,renewable=true,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getDetailDemand() {
		return detailDemand;
	}
@@ -107,7 +107,7 @@ public class Operation implements CreateTimeSupported {
		this.detailDemand = detailDemand;
	}
	
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(8)", insertable = true, nullable = false, queryable = true, renewable = true)
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(8)",insertable=true,nullable=true,queryable=true,renewable=true)
	public String getDeliverTime() {
		return deliverTime;
	}
@@ -131,7 +131,7 @@ public class Operation implements CreateTimeSupported {
		this.dealPrice = dealPrice;
	}
	
	@Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", insertable = false, nullable = true, queryable = true, renewable = true)
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(14)",insertable=false,nullable=true,queryable=true,renewable=true)
	public String getDealTime() {
		return dealTime;
	}

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

@@ -536,9 +536,6 @@ public class SysService {
		User user = this.userDao.query(con, userid);
		if (null == user)
			return false;
		user = this.userDao.queryByEmailOrMobilePhone(con, mail);
		if (null != user)
			return false;
		StateCode<String, String> sc = new StateCode<String, String>();
		sc.setKey(userid);