员工培训

coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml

@@ -36,6 +36,7 @@
         u.region_id as regionId,
         u.role_id as roleId,
         u.shop_id as shopId,
+        u.register_time as registerTime,
         s.shop_name as shopName,
         e.id as employeeTrainingId,
         e.assessment_num as assessmentNum,
@@ -45,6 +46,7 @@
         e.practical_exam_status as practicalExamStatus,
         e.practical_exam_score as practicalExamScore,
         e.assessment_status as assessmentStatus
+
         from xfsg_temp_user_detail u
         left join xfsg_employee_training e on e.xfsg_user_detail_id = u.id
         left join xfsg_shop_info s on s.id = u.shop_id
@@ -68,10 +70,10 @@
             and e.assign_flag = #{assignFlag}
         </if>
         <if test="beginTime != null and beginTime != ''">
-            and e.register_time &gt;= #{beginTime}
+            and u.register_time &gt;= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and e.register_time &lt;= #{endTime}
+            and u.register_time &lt;= #{endTime}
         </if>
         <if test="shopIdList != null and shopIdList.size() > 0">
             and u.shop_id in