yonge преди 5 години
родител
ревизия
c54415c552

+ 3 - 3
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/page/ExamManualLedgerQueryInfo.java

@@ -12,7 +12,7 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
 
     private Integer targetOrganId;
 
-    private Integer examId;
+    private String examId;
     
     private String tenantId;
     
@@ -32,11 +32,11 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
         this.targetOrganId = targetOrganId;
     }
 
-    public Integer getExamId() {
+    public String getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(String examId) {
         this.examId = examId;
     }
 

+ 2 - 2
edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -101,7 +101,7 @@
 	<sql id="queryExamManualLedgersCondition">
 		<where>
 			<if test="examId != null">
-				AND eml.examination_basic_id_=#{examId}
+				AND (eml.examination_basic_id_ like concat('%',#{examId},'%') or eb.name_ like concat('%',#{examId},'%'))
 			</if>
 			<if test="tenantId != null">
 				AND eml.tenant_id_=#{tenantId}
@@ -122,7 +122,7 @@
 				AND eml.create_time_ &lt;= #{endTime}
 			</if>
 			<if test="search != null">
-				AND eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%')
+				AND (eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%'))
 			</if>
 		</where>
 	</sql>