Antiloveg лет назад: 8
Родитель
Сommit
e4a9efe4be

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java

@@ -52,7 +52,7 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 		
 		if (!StringUtils.isBlank(endDate)){
 			try {
-				eDate = DateUtils.parseDate(endDate, AFTConstants.YYYYMMDD);
+				eDate = DateUtils.addDays(DateUtils.parseDate(endDate, AFTConstants.YYYYMMDD),1);
 			} catch (ParseException e) {
 			}
 		}

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

@@ -337,7 +337,7 @@
     and c.status= #{status ,jdbcType=INTEGER}
   </if>
    <if test="cStart !=null">
-    and c.sign_date <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+    and c.sign_date <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
   </if>
    <if test="cEnd !=null">
     and c.sign_date <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
@@ -386,7 +386,7 @@
     and c.status= #{status ,jdbcType=INTEGER}
   </if>
    <if test="cStart !=null">
-    and c.sign_date <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+    and c.sign_date <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
   </if>
    <if test="cEnd !=null">
     and c.sign_date <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}

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

@@ -300,7 +300,7 @@
     	and  activity_name= #{activityName,jdbcType=VARCHAR}
     </if>
     <if test="startDate != null">
-    	and  start_date <![CDATA[ > ]]> #{startDate,jdbcType=TIMESTAMP}
+    	and  start_date <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
     </if>
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
@@ -328,7 +328,7 @@
     	and  activity_name= #{activityName,jdbcType=VARCHAR}
     </if>
     <if test="startDate != null">
-    	and  start_date <![CDATA[ > ]]> #{startDate,jdbcType=TIMESTAMP}
+    	and  start_date <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
     </if>
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}

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

@@ -323,7 +323,7 @@
     	and  activity_name= #{activityName,jdbcType=VARCHAR}
     </if>
     <if test="startDate != null">
-    	and  start_date <![CDATA[ > ]]> #{startDate,jdbcType=TIMESTAMP}
+    	and  start_date <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
     </if>
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
@@ -348,7 +348,7 @@
     	and  activity_name= #{activityName,jdbcType=VARCHAR}
     </if>
     <if test="startDate != null">
-    	and  start_date <![CDATA[ > ]]> #{startDate,jdbcType=TIMESTAMP}
+    	and  start_date <![CDATA[ >= ]]> #{startDate,jdbcType=TIMESTAMP}
     </if>
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}

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

@@ -210,7 +210,7 @@
 		and authorization_date <![CDATA[ >= ]]> #{sDate,jdbcType=TIMESTAMP}
 	</if>
 	<if test="eDate != null">
-		and authorization_date <![CDATA[ <= ]]> #{eDate,jdbcType=TIMESTAMP}
+		and authorization_date <![CDATA[ < ]]> #{eDate,jdbcType=TIMESTAMP}
 	</if>
 	order by authorization_date desc
     <if test="page_sql != null">
@@ -230,7 +230,7 @@
 		and authorization_date <![CDATA[ >= ]]> #{sDate,jdbcType=TIMESTAMP}
 	</if>
 	<if test="eDate != null">
-		and authorization_date <![CDATA[ <= ]]> #{eDate,jdbcType=TIMESTAMP}
+		and authorization_date <![CDATA[ < ]]> #{eDate,jdbcType=TIMESTAMP}
 	</if>
     </select>
     

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

@@ -180,7 +180,7 @@
 			and o.licence_province = #{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="pStart != null">
-			and p.patent_application_date <![CDATA[ > ]]>
+			and p.patent_application_date <![CDATA[ >= ]]>
 			#{pStart,jdbcType=TIMESTAMP}
 		</if>
 		<if test="pEnd">
@@ -210,7 +210,7 @@
 			and o.licence_province = #{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="pStart != null">
-			and p.patent_application_date <![CDATA[ > ]]>
+			and p.patent_application_date <![CDATA[ >= ]]>
 			#{pStart,jdbcType=TIMESTAMP}
 		</if>
 		<if test="pEnd">

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

@@ -300,7 +300,7 @@
 	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test = "pEnd != null">
 		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
@@ -335,7 +335,7 @@
 	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test = "pEnd != null">
 		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
@@ -502,7 +502,7 @@
 	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test = "pEnd != null">
 		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
@@ -549,7 +549,7 @@
 	    and u.email = #{email,jdbcType=VARCHAR}
 	</if>
 	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+		and u.create_time <![CDATA[ >= ]]> #{pStart,jdbcType=TIMESTAMP}
 	</if>
 	<if test = "pEnd != null">
 		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}

+ 2 - 2
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -75,7 +75,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 			pNo = 1;
 		}
 
-		if (pSize == null || pSize < 0) {
+		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
 
@@ -331,7 +331,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 
 		if (!StringUtils.isBlank(endDateFormattedDate)) {
 			try {
-				cEnd = DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD);
+				cEnd = DateUtils.addDays(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD),1);
 			} catch (ParseException e) {
 			}
 		}