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

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

@@ -520,8 +520,12 @@
   </select>
   
   <select id="selectLatelyRecordYear" resultType="Integer" parameterType="java.lang.String" >
-  select Max(year)  from  org_cognizance  where state not in (8, 11, 13)
-	 and deleted_sign = 0 and uid= #{uid,jdbcType=VARCHAR} 
+     select 
+  		Max(year)  
+  	 from  org_cognizance  
+  	 where state not in (8, 11, 13)
+	 and deleted_sign = 0 
+	 and uid= #{uid,jdbcType=VARCHAR} 
 
   </select>
   

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

@@ -394,12 +394,10 @@
     	and u.email = #{email,jdbcType=VARCHAR}
     </if>
     <if test="startCreateTime !=null">
-    	and  = #{,jdbcType=VARCHAR}
-    	u.create_time <![CDATA[ >= ]]> #{startCreateTime,jdbcType=TIMESTAMP}
+    	and u.create_time <![CDATA[ >= ]]> #{startCreateTime,jdbcType=TIMESTAMP}
     </if>
      <if test="endCreateTime !=null">
-    	and  = #{,jdbcType=VARCHAR}
-    	u.create_time <![CDATA[ < ]]> #{endCreateTime,jdbcType=TIMESTAMP}
+    	and u.create_time <![CDATA[ < ]]> #{endCreateTime,jdbcType=TIMESTAMP}
     </if>
     order by u.number desc
     <if test="page_sql!=null">

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -292,7 +292,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		if (StringUtils.isNotBlank(endCreateTime)) {
 			try {
 				params.put("endCreateTime",
-						DateUtils.addDays(DateUtils.parseDate(startCreateTime, AFTConstants.YYYYMMDD), 1));
+						DateUtils.addDays(DateUtils.parseDate(endCreateTime, AFTConstants.YYYYMMDD), 1));
 			} catch (ParseException e) {
 			}
 		}