Antiloveg 8 years ago
parent
commit
667da916ab

+ 2 - 2
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -158,7 +158,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pNo = 1;
 		}
 
-		if (pSize == null || pSize < 0) {
+		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage",
@@ -184,7 +184,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 		if (!StringUtils.isBlank(releaseDateEndDate)) {
 			try {
-				rEnd = DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD);
+				rEnd = DateUtils.addDays(DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD),1);
 			} catch (ParseException e) {
 			}
 		}

+ 2 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -860,7 +860,7 @@
        and	release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
-	   and release_date <![CDATA[ <= ]]> #{rEnd,jdbcType=TIMESTAMP}
+	   and  release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
@@ -901,7 +901,7 @@
        and	release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
-	   and release_date <![CDATA[ <= ]]> #{rEnd,jdbcType=TIMESTAMP}
+	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}

+ 4 - 4
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -827,13 +827,13 @@
 	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="vEnd != null">
-	   and d.validity_period <![CDATA[ <= ]]> #{vEnd,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rStart != null">
        and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
-	   and d.release_date <![CDATA[ <= ]]> #{rEnd,jdbcType=TIMESTAMP}
+	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
   	order by d.serial_number desc
   	<if test="page_sql!=null">
@@ -871,13 +871,13 @@
 	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="vEnd != null">
-	   and d.validity_period <![CDATA[ <= ]]> #{vEnd,jdbcType=TIMESTAMP}
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rStart != null">
        and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test="rEnd != null">
-	   and  d.release_date <![CDATA[ <= ]]> #{rEnd,jdbcType=TIMESTAMP}
+	   and  d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
   </select>
   

+ 2 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -401,7 +401,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 		if (!StringUtils.isBlank(validityPeriodEndDate)) {
 			try {
-				vEnd = DateUtils.parseDate(validityPeriodEndDate, AFTConstants.YYYYMMDD);
+				vEnd = DateUtils.addDays(DateUtils.parseDate(validityPeriodEndDate, AFTConstants.YYYYMMDD),1);
 			} catch (ParseException e) {
 			}
 		}
@@ -415,7 +415,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 		if (!StringUtils.isBlank(releaseDateEndDate)) {
 			try {
-				rEnd = DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD);
+				rEnd = DateUtils.addDays(DateUtils.parseDate(releaseDateEndDate, AFTConstants.YYYYMMDD),1);
 			} catch (ParseException e) {
 			}
 		}