专家信息部门和职称修改为可为空，资源申请业务查询的返回值增加资源所属人信息。

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

	
	public com.ekexiu.portal.po.Operation query(java.sql.Connection con,java.lang.String operationId) throws java.sql.SQLException{
        int _m_1 = 1;
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE OPERATION_ID = ?";
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE OPERATION_ID = ?";
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,operationId);
                    professor.setName(rs.getString(12));
                    _result.setProfessor(professor);
                    resource.setResourceName(rs.getString(13));
                    Professor professor2 = new Professor();
                    professor2.setId(rs.getString(14));
                    professor2.setName(rs.getString(15));
                    resource.setProfessor(professor2);
                    _result.setResource(resource);
                    return _result;
                }else{
    }
	
	public java.util.List<com.ekexiu.portal.po.Operation> query(java.sql.Connection con) throws java.sql.SQLException{
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID";
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID";
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
        try{
            java.sql.ResultSet rs = ps.executeQuery();
                    professor.setName(rs.getString(12));
                    _obj.setProfessor(professor);
                    resource.setResourceName(rs.getString(13));
                    Professor professor2 = new Professor();
                    professor2.setId(rs.getString(14));
                    professor2.setName(rs.getString(15));
                    resource.setProfessor(professor2);
                    _obj.setResource(resource);
                    _result.add(_obj);
                }
	 */
	public java.util.List<com.ekexiu.portal.po.Operation> queryPro(java.sql.Connection con,java.lang.String demandId) throws java.sql.SQLException{
        int _m_1 = 1;
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE DEMAND_ID = ?";
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE DEMAND_ID = ?";
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,demandId);
                    professor.setName(rs.getString(12));
                    _obj.setProfessor(professor);
                    resource.setResourceName(rs.getString(13));
                    Professor professor2 = new Professor();
                    professor2.setId(rs.getString(14));
                    professor2.setName(rs.getString(15));
                    resource.setProfessor(professor2);
                    _obj.setResource(resource);
                    _result.add(_obj);
                }
	 */
	public java.util.List<com.ekexiu.portal.po.Operation> queryDem(java.sql.Connection con,java.lang.String professorId) throws java.sql.SQLException{
		int _m_1 = 1;
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE RESOURCE.PROFESSOR_ID = ?";
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE RESOURCE.PROFESSOR_ID = ?";
		java.sql.PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(_m_1++,professorId);
					professor.setName(rs.getString(12));
					_obj.setProfessor(professor);
					resource.setResourceName(rs.getString(13));
					Professor professor2 = new Professor();
                    professor2.setId(rs.getString(14));
                    professor2.setName(rs.getString(15));
                    resource.setProfessor(professor2);
					_obj.setResource(resource);
					_result.add(_obj);
				}
		}
	}
	
//	/**
//	 * 按资源ID查资源申请，返回资源所有者姓名和资源名称
//	 * @param con
//	 * @param resourceId 资源ID
//	 * @return
//	 * @throws java.sql.SQLException
//	 */
//	public java.util.List<com.ekexiu.portal.po.Operation> queryRes(java.sql.Connection con,java.lang.String resourceId) throws java.sql.SQLException{
//        int _m_1 = 1;
//        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,RESOURCE_NAME,PROFESSOR.NAME FROM OPERATION LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID LEFT JOIN PROFESSOR ON RESOURCE.PROFESSOR_ID = PROFESSOR.ID WHERE OPERATION.RESOURCE_ID = ?";
//        java.sql.PreparedStatement ps = con.prepareStatement(sql);
//        try{
//            ps.setString(_m_1++,resourceId);
//            java.sql.ResultSet rs = ps.executeQuery();
//            try{
//                java.util.List<com.ekexiu.portal.po.Operation> _result = new java.util.ArrayList<com.ekexiu.portal.po.Operation>();
//                while(rs.next()){
//                    com.ekexiu.portal.po.Operation _obj =  new com.ekexiu.portal.po.Operation();
//                    _obj.setReplyNotes(rs.getString(1));
//                    _obj.setCreateTime(rs.getString(2));
//                    _obj.setOperationId(rs.getString(3));
//                    _obj.setOperationStatus(rs.getInt(4));
//                    Professor professor = new Professor();
//                    professor.setId(rs.getString(5));
//                    _obj.setDetailDemand(rs.getString(6));
//                    _obj.setDeliverTime(rs.getString(7));
//                    Resource resource = new Resource();
//                    resource.setResourceId(rs.getString(8));
//                    _obj.setDealPrice(rs.getBigDecimal(9));
//                    _obj.setDealTime(rs.getString(10));
//                    _obj.setPayMethod(rs.getString(11));
//                    resource.setResourceName(rs.getString(12));
//                    _obj.setResource(resource);
//                    professor.setName(rs.getString(13));
//                    _obj.setProfessor(professor);
//                    _result.add(_obj);
//                }
//                return _result;
//            }finally{
//                try{rs.close();}catch(Exception _m_2){}
//            }
//        }finally{
//            try{ps.close();}catch(Exception _m_3){}
//        }
//    }
	
	/**
	 * 按资源ID查资源申请，返回资申请人姓名和资源名称
	 * @param con
	 */
	public java.util.List<com.ekexiu.portal.po.Operation> queryRes(java.sql.Connection con,java.lang.String resourceId) throws java.sql.SQLException{
		int _m_1 = 1;
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE OPERATION.RESOURCE_ID = ?";
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE OPERATION.RESOURCE_ID = ?";
		java.sql.PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(_m_1++,resourceId);
					professor.setName(rs.getString(12));
					_obj.setProfessor(professor);
					resource.setResourceName(rs.getString(13));
					Professor professor2 = new Professor();
                    professor2.setId(rs.getString(14));
                    professor2.setName(rs.getString(15));
                    resource.setProfessor(professor2);
					_obj.setResource(resource);
					_result.add(_obj);
				}
        if(_m_8){
            _result.setPageNo(1);
            sql = new StringBuilder();
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION LEFT JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID");
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION LEFT JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID LEFT JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID");
            if(_m_4.length()>0){
                sql.append(_m_4);
            }
            --pageNo;
            int _m_10 = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION LEFT JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID");
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION LEFT JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID LEFT JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID");
            if(_m_4.length()>0){
                sql.append(_m_4);
            }
                    professor.setName(rs.getString(12));
                    _obj.setProfessor(professor);
                    resource.setResourceName(rs.getString(13));
                    Professor professor2 = new Professor();
                    professor2.setId(rs.getString(14));
                    professor2.setName(rs.getString(15));
                    resource.setProfessor(professor2);
                    _obj.setResource(resource);
                    _m_11.add(_obj);
                }

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

import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
	private String payMethod;//支付方式
	private String replyNotes; //回复备注
	private String createTime;//创建时间
	private int applysquare;//申请方 0代表本人，1代表所属机构
	private Professor professor;
	private Resource resource;
	
		this.resource = resource;
	}
	
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getReplyNotes() {
		return replyNotes;
	}
		this.createTime = createTime;
	}
	
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
	public int getApplysquare() {
		return applysquare;
	}
	public void setApplysquare(int applysquare) {
		this.applysquare = applysquare;
	}
	
	@Column(DE.id_32)
	public String getOperationId() {
		return operationId;
		this.resourceId = resourceId;
	}
	
	@Column(DE.bigDecmimal_de)
	@Column(DE.BigDecmimal_de)
	public BigDecimal getDealPrice() {
		return dealPrice;
	}
		this.dealTime = dealTime;
	}
	
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getPayMethod() {
		return payMethod;
	}

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

import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
		this.operationId = operationId;
	}
	
	@Column(DE.bigDecmimal_de)
	@Column(DE.BigDecmimal_de)
	public BigDecimal getPaidMoney() {
		return paidMoney;
	}
		this.paidMoney = paidMoney;
	}
	
	@Column(DE.bigDecmimal_de)
	@Column(DE.BigDecmimal_de)
	public BigDecimal getReturnMoney() {
		return returnMoney;
	}
		this.createTime = createTime;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",nullable=true,insertable=true,renewable=false,queryable=true)
	public String getRemark() {
		return remark;
	}
		this.remark = remark;
	}
	
	@Column(DE.int_de)
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
	public int getIsonline() {
		return isonline;
	}
		this.isonline = isonline;
	}
	
	@Column(DE.int_de)
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
	public int getPayType() {
		return payType;
	}
		this.payType = payType;
	}
	
	@Column(DE.int_de)
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
	public int getPayStatus() {
		return payStatus;
	}

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

		this.industry = industry;
	}
	
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getAddress() {
		return address;
	}
	 * 机构部门
	 * @return
	 */
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getDepartment() {
		return department;
	}
	 * 职称
	 * @return
	 */
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getTitle() {
		return title;
	}

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

		this.professorId = professorId;
	}
	
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getAscription() {
		return ascription;
	}
		this.modifyTime = modifyTime;
	}
	
	@Column(DE.string_de)
	@Column(DE.String_de)
	public String getHopePayMethod() {
		return hopePayMethod;
	}