update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamLifecycleLogDao.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.dto.ExamLifecycleLogDto;
 import com.keao.edu.user.entity.ExamLifecycleLog;
 import org.apache.ibatis.annotations.Param;
 
@@ -8,6 +9,6 @@ import java.util.List;
 
 public interface ExamLifecycleLogDao extends BaseDAO<Long, ExamLifecycleLog> {
 
-    List<ExamLifecycleLog> findWithExam(@Param("examId") Long examId);
+    List<ExamLifecycleLogDto> findWithExam(@Param("examId") Long examId);
 	
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamLifecycleLogDto.java

@@ -0,0 +1,20 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExamLifecycleLog;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.07.17
+ */
+public class ExamLifecycleLogDto extends ExamLifecycleLog {
+
+    private String operatorName;
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamOrganStatisticsDto.java

@@ -1,6 +1,5 @@
 package com.keao.edu.user.dto;
 
-import com.keao.edu.user.entity.ExamLifecycleLog;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 
 import java.math.BigDecimal;
@@ -13,17 +12,17 @@ import java.util.Map;
  */
 public class ExamOrganStatisticsDto extends ExamOrganizationRelation {
 
-    private List<ExamLifecycleLog> examLifecycleLogs;
+    private List<ExamLifecycleLogDto> examLifecycleLogs;
 
     private Map<String, BigDecimal> dayTransAmount;
 
     private Map<String, BigDecimal> dayPaymentAmount;
 
-    public List<ExamLifecycleLog> getExamLifecycleLogs() {
+    public List<ExamLifecycleLogDto> getExamLifecycleLogs() {
         return examLifecycleLogs;
     }
 
-    public void setExamLifecycleLogs(List<ExamLifecycleLog> examLifecycleLogs) {
+    public void setExamLifecycleLogs(List<ExamLifecycleLogDto> examLifecycleLogs) {
         this.examLifecycleLogs = examLifecycleLogs;
     }
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLifecycleLogMapper.xml

@@ -14,6 +14,10 @@
 		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
+
+	<resultMap id="ExamLifecycleLogDto" type="com.keao.edu.user.dto.ExamLifecycleLogDto" extends="ExamLifecycleLog">
+		<result column="real_name_" property="operatorName"/>
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ExamLifecycleLog" >
@@ -73,7 +77,10 @@
 		SELECT COUNT(*) FROM exam_lifecycle_log
 	</select>
 
-    <select id="findWithExam" resultMap="ExamLifecycleLog">
-		SELECT * FROM exam_lifecycle_log WHERE examination_basic_id_=#{examId} ORDER BY id_ DESC
+    <select id="findWithExam" resultMap="ExamLifecycleLogDto">
+		SELECT elo.*,su.real_name_ FROM exam_lifecycle_log elo
+		LEFT JOIN sys_user su ON  elo.operator_user_id_=su.id_
+		WHERE examination_basic_id_=#{examId}
+		ORDER BY id_ DESC
 	</select>
 </mapper>