Ver Fonte

时间查询去掉结束时间的=号

weifanli há 3 anos atrás
pai
commit
794639b387

+ 2 - 11
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/StudentStar.java

@@ -20,13 +20,13 @@ public class StudentStar implements Serializable {
     * 老师id 
     */
     @ApiModelProperty("老师id ")
-    @TableId(value = "teacher_id_")
+    @TableField("teacher_id_")
     private Long teacherId;
     /** 
     * 学生id 
     */
     @ApiModelProperty("学生id ")
-    @TableId(value = "student_id_")
+    @TableField("student_id_")
     private Long studentId;
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -57,13 +57,4 @@ public class StudentStar implements Serializable {
         this.createTime = createTime;
     }
 
-    @Override
-    public String toString() {
-        return "StudentStar{" +
-				"teacherId=" + teacherId +
-						",studentId='" + studentId + "'" + 
-						",createTime='" + createTime + "'" + 
-		                '}';
-    }
-	
 }

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -98,7 +98,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
         </where>
     </select>

+ 9 - 9
cooleshow-user/user-biz/src/main/resources/config/mybatis/HomeMapper.xml

@@ -33,7 +33,7 @@
 					<![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.create_time_ < #{param.endTime} ]]>
 				</if>
 			</where>
 			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
@@ -48,7 +48,7 @@
 					<![CDATA[AND t.entry_auth_date_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.entry_auth_date_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.entry_auth_date_ < #{param.endTime} ]]>
 				</if>
 			</where>
 			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
@@ -63,7 +63,7 @@
 					<![CDATA[AND t.live_date_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.live_date_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.live_date_ < #{param.endTime} ]]>
 				</if>
 			</where>
 			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
@@ -78,7 +78,7 @@
 					<![CDATA[AND t.musician_date_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.musician_date_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.musician_date_ < #{param.endTime} ]]>
 				</if>
 			</where>
 			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
@@ -88,7 +88,7 @@
 				<![CDATA[AND t.sys_day_ >= #{param.startTime} ]]>
 			</if>
 			<if test="param.endTime !=null">
-				<![CDATA[AND t.sys_day_ <= #{param.endTime} ]]>
+				<![CDATA[AND t.sys_day_ < #{param.endTime} ]]>
 			</if>
 		</where>
 		order by t.sys_day_ desc
@@ -122,7 +122,7 @@
 					<![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.create_time_ < #{param.endTime} ]]>
 				</if>
 			</where>
 			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
@@ -142,7 +142,7 @@
 					<![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.create_time_ < #{param.endTime} ]]>
 				</if>
 				group by DATE_FORMAT(t.create_time_,'%Y-%m-%d'),t.user_id_
 			) a
@@ -163,7 +163,7 @@
 					<![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
 				</if>
 				<if test="param.endTime !=null">
-					<![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+					<![CDATA[AND t.create_time_ < #{param.endTime} ]]>
 				</if>
 				group by DATE_FORMAT(t.create_time_,'%Y-%m-%d'),t.user_id_
 			) a
@@ -174,7 +174,7 @@
 				<![CDATA[AND t.sys_day_ >= #{param.startTime} ]]>
 			</if>
 			<if test="param.endTime !=null">
-				<![CDATA[AND t.sys_day_ <= #{param.endTime} ]]>
+				<![CDATA[AND t.sys_day_ < #{param.endTime} ]]>
 			</if>
 		</where>
 		order by t.sys_day_ desc

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -91,7 +91,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
         </where>
     </select>

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -66,7 +66,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
             <if test="param.authStatus !=null">
                 AND t.teacher_auth_status_ = #{param.authStatus}

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthMusicianRecordMapper.xml

@@ -61,7 +61,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
             <if test="param.authStatus !=null">
                 AND t.teacher_auth_status_ = #{param.authStatus}

+ 2 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserAccountMapper.xml

@@ -99,7 +99,7 @@
                     <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
                 </if>
                 <if test="param.endTime !=null">
-                    <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                    <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
                 </if>
                 <if test="param.userId !=null">
                     AND t.account_id_ = #{param.userId}
@@ -112,7 +112,7 @@
                 <![CDATA[AND t.sys_day_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.sys_day_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.sys_day_ < #{param.endTime} ]]>
             </if>
         </where>
         <if test="timeType != null and timeType == 'MONTH'">

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserAccountRecordMapper.xml

@@ -57,7 +57,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
         </where>
         order by t.create_time_ desc

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -132,7 +132,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
             <if test="param.userId !=null">
                 AND t.user_id_ = #{param.userId}

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserWithdrawalMapper.xml

@@ -67,7 +67,7 @@
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
-                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+                <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
             <if test="param.status !=null">
                 AND t.status_ = #{param.status}

+ 1 - 1
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -104,7 +104,7 @@ public class UserAccountController extends BaseController {
         try {
             LocalDateTime firstDay;
             LocalDateTime lastDay;
-            if (PeriodEnum.YEAR.getCode().equals(query.getTimeType())) {
+            if (PeriodEnum.YEAR.equals(query.getTimeType())) {
                 LocalDate date = LocalDate.of(Integer.parseInt(query.getDateTime()), 1, 1);
                 firstDay = LocalDateTime.of(date.with(TemporalAdjusters.firstDayOfYear()), LocalTime.MIN);
                 lastDay = LocalDateTime.of(date.with(TemporalAdjusters.lastDayOfYear()), LocalTime.MAX);