提交: 43 - JCBLScore (svn)

Commit MetaInfo

• 修订版: 43 (tree)
• 时间: 2016-03-24 18:23:12
• 作者: ckoshien

Log Message

選手一覧の取得方法を外部SQLに変更、それに伴いロジック・画面改修

更改概述

• added: trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/TeamDate.sql
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/gameSummary/create.jsp
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/gameSummary/edit.jsp
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/GameSummaryAction.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/logic/GameSummaryLogic.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PlayerService.java
• added: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/dto/PlayerDto.java

差异

--- trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/TeamDate.sql	(nonexistent)
+++ trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/TeamDate.sql	(revision 43)
@@ -0,0 +1,15 @@
+select
+  *
+from player p
+inner join
+(SELECT
+  t.team_id as team_id,
+  t.team_name as team_name,
+  t.short_name as short_name,
+  max(game_date) as last_join_date
+ FROM team t
+  inner join result r on t.team_id=r.team_id
+  inner join game g on r.game_id=g.game_id
+group by team_id
+order by last_join_date desc) team_date
+on p.team_id=team_date.team_id;
\ No newline at end of file

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java	(revision 42)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java	(revision 43)
@@ -12,6 +12,7 @@
 import org.seasar.struts.annotation.Execute;
 
 import cx.myhome.ckoshien.dto.BattingResultDto;
+import cx.myhome.ckoshien.dto.PlayerDto;
 import cx.myhome.ckoshien.dto.TeamBattingResultDto;
 import cx.myhome.ckoshien.dto.TeamPitchingResultDto;
 import cx.myhome.ckoshien.entity.Player;
@@ -35,7 +36,7 @@
 	public PlayerForm playerForm;
 
 	public List<Team> teamList;
-	public List<Player> playerList;
+	public List<PlayerDto> playerList;
 	public Player player;
 	@Resource
 	public BattingSumService battingSumService;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/GameSummaryAction.java	(revision 42)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/GameSummaryAction.java	(revision 43)
@@ -21,6 +21,7 @@
 
 import cx.myhome.ckoshien.dto.BattingResultDto;
 import cx.myhome.ckoshien.dto.GameListDto;
+import cx.myhome.ckoshien.dto.PlayerDto;
 import cx.myhome.ckoshien.entity.BattingSum;
 import cx.myhome.ckoshien.entity.Game;
 import cx.myhome.ckoshien.entity.League;
@@ -49,7 +50,7 @@
 @Resource
 public PlayerService playerService;
 public List<Team> teamList;
-public List<Player> playerList;
+public List<PlayerDto> playerList;
 @Resource
 public GameService gameService;
 public Game game;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/logic/GameSummaryLogic.java	(revision 42)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/logic/GameSummaryLogic.java	(revision 43)
@@ -8,6 +8,7 @@
 import javax.annotation.Resource;
 
 import cx.myhome.ckoshien.dto.GameListDto;
+import cx.myhome.ckoshien.dto.PlayerDto;
 import cx.myhome.ckoshien.entity.BattingSum;
 import cx.myhome.ckoshien.entity.Game;
 import cx.myhome.ckoshien.entity.Pitching;
@@ -183,7 +184,7 @@
 		}
 	}
 
-	public BattingSum convert2BattingSum(BattingSumForm battingSumForm,BattingSum battingSum,List<Player> playerList,int i){
+	public BattingSum convert2BattingSum(BattingSumForm battingSumForm,BattingSum battingSum,List<PlayerDto> playerList,int i){
 		battingSum.playerId=Integer.parseInt(battingSumForm.playerId.get(i));
 		//空文字の場合0と解釈
 		if(battingSumForm.tpa.get(i)==""){

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PlayerService.java	(revision 42)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PlayerService.java	(revision 43)
@@ -1,11 +1,20 @@
 package cx.myhome.ckoshien.service;
 
+import cx.myhome.ckoshien.dto.BattingResultDto;
+import cx.myhome.ckoshien.dto.PlayerDto;
 import cx.myhome.ckoshien.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import javax.annotation.Generated;
 
 import static cx.myhome.ckoshien.entity.PlayerNames.*;
 import static org.seasar.extension.jdbc.operation.Operations.*;
+import static org.seasar.extension.jdbc.parameter.Parameter.date;
 
 /**
  * {@link Player}のサービスクラスです。
@@ -14,7 +23,9 @@
 @Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.ServiceModelFactoryImpl"}, date = "2014/12/09 16:58:09")
 public class PlayerService extends AbstractService<Player> {
 
-    /**
+    public List<PlayerDto> playerList;
+
+	/**
      * 識別子でエンティティを検索します。
      *
      * @param id
@@ -30,9 +41,14 @@
      *
      * @return エンティティのリスト
      */
-    public List<Player> findAllOrderById() {
-        return select().innerJoin(team()).orderBy(asc(teamId())).getResultList();
-    }
+//    public List<Player> findAllOrderById() {
+//        return select().innerJoin(team()).orderBy(asc(teamId())).getResultList();
+//    }
+    public List<PlayerDto> findAllOrderById(){
+		playerList=new ArrayList<PlayerDto>();
+		playerList=jdbcManager.selectBySqlFile(PlayerDto.class, "cx.myhome.ckoshien.sql.TeamDate.sql").getResultList();
+		return playerList;
+	}
 
 	public Player findByLoginId(String loginId) {
 		return select().where("loginId=?", loginId).getSingleResult();

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/dto/PlayerDto.java	(nonexistent)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/dto/PlayerDto.java	(revision 43)
@@ -0,0 +1,8 @@
+package cx.myhome.ckoshien.dto;
+
+import cx.myhome.ckoshien.entity.Player;
+
+public class PlayerDto extends Player{
+	public String shortName;
+
+}

Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property