Browse Source

线上bug修复

zouxuan 2 years ago
parent
commit
edeb1440de

+ 15 - 5
mec-biz/src/main/java/com/ym/mec/biz/dal/page/ConvertLogQueryInfo.java

@@ -6,7 +6,9 @@ public class ConvertLogQueryInfo extends QueryInfo {
 
     private String operator;
 
-    private String operatorDate;
+    private String operatorStartDate;
+
+    private String operatorEndDate;
 
     private String musicGroupId;
 
@@ -18,12 +20,20 @@ public class ConvertLogQueryInfo extends QueryInfo {
         this.operator = operator;
     }
 
-    public String getOperatorDate() {
-        return operatorDate;
+    public String getOperatorStartDate() {
+        return operatorStartDate;
+    }
+
+    public void setOperatorStartDate(String operatorStartDate) {
+        this.operatorStartDate = operatorStartDate;
+    }
+
+    public String getOperatorEndDate() {
+        return operatorEndDate;
     }
 
-    public void setOperatorDate(String operatorDate) {
-        this.operatorDate = operatorDate;
+    public void setOperatorEndDate(String operatorEndDate) {
+        this.operatorEndDate = operatorEndDate;
     }
 
     public String getMusicGroupId() {

+ 4 - 4
mec-biz/src/main/resources/config/mybatis/CourseConvertLogMapper.xml

@@ -60,8 +60,8 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
-			<if test="className != null and className != ''">
-				AND ccl.old_class_name_ = #{className}
+			<if test="search != null and search != ''">
+				AND ccl.old_class_name_ = #{search}
 			</if>
 			<if test="musicGroupId != null and musicGroupId != ''">
 				AND ccl.music_group_id_ = #{musicGroupId}
@@ -69,8 +69,8 @@
 			<if test="operator != null and operator != ''">
 				AND operator_name_ LIKE CONCAT('%',#{operator},'%')
 			</if>
-			<if test="operatorDate != null and operatorDate != ''">
-				AND DATE_FORMAT(ccl.create_time_,'%Y-%m-%d') = #{operatorDate}
+			<if test="operatorStartDate != null and operatorStartDate != ''">
+				AND DATE_FORMAT(ccl.create_time_,'%Y-%m-%d') BETWEEN #{operatorStartDate} AND #{operatorEndDate}
 			</if>
 		</where>
 	</sql>