update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/ExamManualLedger.java

@@ -24,6 +24,8 @@ public class ExamManualLedger {
 	@ApiModelProperty(value = "考级项目编号")
 	private Long examinationBasicId;
 	
+	private ExaminationBasic examinationBasic = new ExaminationBasic();
+	
 	@ApiModelProperty(value = "转账方向")
 	private TransDirectionEnum transDirection;
 
@@ -161,6 +163,14 @@ public class ExamManualLedger {
 		return this.createTime;
 	}
 			
+	public ExaminationBasic getExaminationBasic() {
+		return examinationBasic;
+	}
+
+	public void setExaminationBasic(ExaminationBasic examinationBasic) {
+		this.examinationBasic = examinationBasic;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,5 +1,7 @@
 package com.keao.edu.user.page;
 
+import java.util.Date;
+
 import com.keao.edu.common.page.QueryInfo;
 
 /**
@@ -11,6 +13,16 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
     private Integer targetOrganId;
 
     private Integer examId;
+    
+    private String tenantId;
+    
+    private Integer organId;
+    
+    private Date startTime;
+    
+    private Date endTime;
+    
+    private String search;
 
     public Integer getTargetOrganId() {
         return targetOrganId;
@@ -27,4 +39,44 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
     public void setExamId(Integer examId) {
         this.examId = examId;
     }
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public String getSearch() {
+		return search;
+	}
+
+	public void setSearch(String search) {
+		this.search = search;
+	}
 }

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

@@ -21,6 +21,7 @@
 		<result column="create_time_" property="createTime" />
 		<association property="organization" columnPrefix="organ_" resultMap="com.keao.edu.user.dao.OrganizationDao.Organization"/>
 		<association property="operator" columnPrefix="user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
+		<result column="name_" property="examinationBasic.name" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -99,35 +100,51 @@
 
 	<sql id="queryExamManualLedgersCondition">
 		<where>
-			examination_basic_id_=#{examId}
+			<if test="examId != null">
+				AND eml.examination_basic_id_=#{examId}
+			</if>
+			<if test="tenantId != null">
+				AND eml.tenant_id_=#{tenantId}
+			</if>
 			<if test="organId!=null and organId!=0">
-				AND organ_id_=#{organId}
+				AND eml.organ_id_=#{organId}
 			</if>
 			<if test="targetOrganId!=null and targetOrganId!=-99">
-				AND target_organ_id_=#{targetOrganId}
+				AND eml.target_organ_id_=#{targetOrganId}
+			</if>
+			<if test="targetOrganId!=null and targetOrganId ==-99">
+				AND eml.target_organ_id_ IS NULL
 			</if>
-			<if test="targetOrganId!=null and targetOrganId==-99">
-				AND target_organ_id_ IS NULL
+			<if test="startTime != null">
+				AND eml.create_time_ &gt;= #{startTime}
+			</if>
+			<if test="endTime != null">
+				AND eml.create_time_ &lt;= #{endTime}
+			</if>
+			<if test="search != null">
+				AND eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%')
 			</if>
 		</where>
 	</sql>
 
 	<select id="queryExamManualLedgers" resultMap="ExamManualLedger" parameterType="map">
 		SELECT
-			eml.*,
+			eml.*,eb.name_
 			CASE WHEN o.name_ IS NOT NULL THEN o.name_ ELSE '其他' END  organ_name_,
 			su.real_name_ user_real_name_
 		FROM
 			exam_manual_ledger eml
 		LEFT JOIN organization o ON eml.target_organ_id_ = o.id_
 		LEFT JOIN sys_user su ON eml.operator_user_id_ = su.id_
+		left join examination_basic eb on eb.id_ = eml.examination_basic_id_
 		<include refid="queryExamManualLedgersCondition"/>
-		ORDER BY id_
+		ORDER BY eml.id_
 		<include refid="global.limit"/>
 	</select>
 
 	<select id="countExamManualLedgers" resultType="int">
-		SELECT COUNT(*) FROM exam_manual_ledger
+		SELECT COUNT(eml.id_) FROM exam_manual_ledger eml
+		LEFT JOIN sys_user su ON eml.operator_user_id_ = su.id_
 		<include refid="queryExamManualLedgersCondition"/>
 	</select>