Skip to content

Limhaneul #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
strglass91 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Limhaneul #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87faa43
dd
Sep 12, 2020
d7a9ee4
Merge remote-tracking branch 'origin/master' into limhaneul
Sep 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 4 additions & 31 deletions 0Mangro_TeamProject-0.01/src/mango/academy/db/AcademyDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import mango.connection.db.DBconnection;
import mango.member.db.MemberBean;

public class AcademyDAO extends DBconnection implements IAcademy{

@Override
Expand All @@ -19,7 +19,7 @@ public List<AcademyBean> AllAcademyList(int StartRow, int pageSize) {

try {
getConnection();
AcademyBean bean;
AcademyBean bean;
String sql =" select a.* ,ifnull(r.avgscore,0) avgscore "
+" from academy a left join (select aca_main_num,avg(review_score) avgscore"
+" from academy_review) r"
Expand Down Expand Up @@ -2123,7 +2123,7 @@ public List<AcademyBean> getSearchKeywordListAcademy(HashMap<String, Object> for
+ " group by mem_email) m on a.mem_email = m.mem_email join ( select aca_main_num , aca_keyword "
+" from academy_keyword "
+ " where aca_keyword =? "
+ " group by aca_main_num)w "
+ " group by aca_main_num) w "
+ " on a.aca_main_num = w.aca_main_num " ;

String review ="select a.* ,ifnull(r.avgscore,0) avgscore,ifnull(m.mem_profileImg,'images/etc/default_mango.png') profileimg ,ifnull(r.count,0) count "
Expand Down Expand Up @@ -2457,7 +2457,7 @@ else if(formsearch.get("main")==null &&formsearch.get("s1")!=null &&formsearch.g
else if(formsearch.get("main")!=null &&formsearch.get("s1")!=null &&formsearch.get("s2")!=null&&formsearch.get("s3")==null&&formsearch.get("s4")!=null){


where=" where a.aca_name like ? "
where=" where a.aca_name like ? "
+" and a.aca_search_addr1 =? "
+" and a.aca_search_addr2 =? "
+" and a.aca_category1 =? ";
Expand Down Expand Up @@ -3038,33 +3038,6 @@ else if(formsearch.get("main")!=null &&formsearch.get("s1")!=null &&formsearch.g


}

//등록된 학원 수
@Override
public int getRegisteredAcademyCount() {
try {
getConnection();

sql="select count(*) from academy where mem_email is not null";

pstmt=con.prepareStatement(sql);

rs=pstmt.executeQuery();

if(rs.next()){
return rs.getInt(1);
}

} catch (Exception e) {
System.out.println("getRegisteredAcademyCount()에서 예외 발생"+e);
}finally {
resourceClose();
}
return 0;
}






Expand Down