查询评价的三个接口整合成一个接口。资源表里行业和学科改为可插入。

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

@@ -1,6 +1,7 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.List;
@@ -173,7 +174,66 @@ public abstract class AssessDao {
            try{ps.close();}catch(Exception _m_4){}
        }
    }
	
	public List<Assess> queryAll(Connection con, String assessId, String resourceId, String professorId) throws SQLException {
		StringBuilder sql = new StringBuilder();
		boolean hasAssessId = null != assessId;
		boolean hasResourceId = null != resourceId;
		boolean hasProfessorId = null != professorId;
		sql.append(" SELECT ASSESS_ID,STAR_LEVEL,ASSESS.DESCP,ASSESS.OPERATION_ID,ASSESS.RESOURCE_ID,ASSESS.PROFESSOR_ID,RESOURCE_NAME,PROFESSOR.NAME FROM ASSESS INNER JOIN RESOURCE ON ASSESS.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR ON ASSESS.PROFESSOR_ID = PROFESSOR.ID ");
		if(hasAssessId){
			sql.append(" WHERE ASSESS_ID = ? ");
		}
		if(hasResourceId){
			sql.append(" WHERE ASSESS.RESOURCE_ID = ? ");
		}
		if(hasProfessorId){
			sql.append(" WHERE ASSESS.PROFESSOR_ID = ? ");
		}
		int _m_1 = 1;
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
        	if(hasAssessId){
        		ps.setString(_m_1++, assessId);
        	}
        	if(hasResourceId){
        		ps.setString(_m_1++, resourceId);
        	}
        	if(hasProfessorId){
        		ps.setString(_m_1++, professorId);
        	}
            java.sql.ResultSet rs = ps.executeQuery();
            try{
                java.util.List<com.ekexiu.portal.po.Assess> _result = new java.util.ArrayList<com.ekexiu.portal.po.Assess>();
                while(rs.next()){
                    com.ekexiu.portal.po.Assess _obj =  new com.ekexiu.portal.po.Assess();
                    _obj.setAssessId(rs.getString(1));
                    _obj.setStarLevel(rs.getInt(2));
                    java.lang.String _m_2 = rs.getString(3);
                    if(rs.wasNull()){
                        _m_2 = null;
                    }
                    _obj.setDescp(_m_2);
                    _obj.setOperationId(rs.getString(4));
                    Resource resource = new Resource();
                    resource.setResourceId(rs.getString(5));
                    Professor professor = new Professor();
                    professor.setId(rs.getString(6));
                    resource.setResourceName(rs.getString(7));
                    _obj.setResource(resource);
                    professor.setName(rs.getString(8));
                    _obj.setProfessor(professor);
                    _result.add(_obj);
                }
                return _result;
            }finally{
                try{rs.close();}catch(Exception _m_3){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_4){}
        }
	}
	
	@DeleteWith
	@From(Assess.class)
	public abstract int delete(Connection con, String assessId) throws SQLException;

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

@@ -89,7 +89,7 @@ public class Operation {
		this.demandId = demandId;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=false,renewable=false,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=false,renewable=true,queryable=true)
	public String getDetailDemand() {
		return detailDemand;
	}

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

@@ -68,7 +68,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.resourceName = resourceName;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=false,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getSubject() {
		return subject;
	}
@@ -76,7 +76,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.subject = subject;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=false,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getIndustry() {
		return industry;
	}
@@ -92,7 +92,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.supportedServices = supportedServices;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=false,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getDescp() {
		return descp;
	}
@@ -138,7 +138,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.hopePayMethod = hopePayMethod;
	}
	
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=true,queryable=true)
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
	public String getCooperationNotes() {
		return cooperationNotes;
	}

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

@@ -5,6 +5,7 @@ import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
@@ -64,6 +65,20 @@ public class AssessService {
		return this.queryPro(con, operationId);
	}
	
	@Get
	@Path("/qa")
	public List<Assess> queryAll(@JdbcConn Connection con, @Nullable String assessId, @Nullable String resourceId, @Nullable String professorId) throws SQLException {
		if(assessId != null) {
			resourceId = null;
			professorId = null;
		} else {
			if(resourceId != null) {
				professorId = null;
			}
		}
		return this.assessDao.queryAll(con, assessId, resourceId, professorId);
	}
	
	@Delete
	@Path("/{assessId}")
	public void delete(@JdbcConn(true) Connection con, String assessId) throws SQLException {