市川市追加対応

src/main/java/jp/agentec/sinaburocast/service/GiftExchangeService.java

@@ -202,12 +202,17 @@ public class GiftExchangeService extends AbstractService<GiftExchange> {
 			//toDay =SinaburoUtil.getAddDate(SinaburoUtil.stringToDateSlash(giftExchangeSearchForm.toDay),1);
 			toDay = SinaburoUtil.convertStringToTimestamp(SinaburoUtil.getNextDay(giftExchangeSearchForm.toDay),"yyyy-MM-dd");
 		}
+		
+		SimpleWhere where = new SimpleWhere().ge("applyDate", fromDay)
+				.lt("applyDate", toDay)
+				.eq("member.validFlg", SinaburoConstant.MemberValidFlg.VALID)
+				.eq("member.delFlg", SinaburoConstant.MemberDelFlg.NOT_DEL);
+		// 区分(エコボ：1、ICHICO:2)
+		if (giftExchangeSearchForm.giftType != null) {
+			where.eq("gift.giftType", giftExchangeSearchForm.giftType);
+		}
 
-		return select().innerJoin("member").innerJoin("member.prefecture").innerJoin("gift").where(new SimpleWhere()
-		.ge("applyDate", fromDay)
-		.lt("applyDate", toDay)
-		.eq("member.validFlg", SinaburoConstant.MemberValidFlg.VALID)
-		.eq("member.delFlg", SinaburoConstant.MemberDelFlg.NOT_DEL))
+		return select().innerJoin("member").innerJoin("member.prefecture").innerJoin("gift").where(where)
 		.orderBy("applyDate,memberId")
 		.getResultList();
 	}