|
|
@@ -5,9 +5,16 @@ SELECT t1.name,t1.user_name AS userName,t1.mobile,
|
|
|
(SELECT GROUP_CONCAT(a1.name) FROM xjr_department a1
|
|
|
INNER JOIN xjr_user_dept_relation a2 ON a1.id = a2.dept_id
|
|
|
WHERE a1.delete_mark = 0 AND a2.user_id = t1.id
|
|
|
-) AS deptName,t3.name AS employType,t1.credential_number AS credentialNumber,t1.email FROM xjr_user t1
|
|
|
+) AS deptName,t3.name AS employType,t1.credential_number AS credentialNumber,t1.email,
|
|
|
+t4.name AS job_state,t2.join_time,(
|
|
|
+SELECT GROUP_CONCAT(a2.name) FROM base_teacher_regular a1
|
|
|
+LEFT JOIN xjr_dictionary_detail a2 ON JSON_UNQUOTE(a1.teaching_status) LIKE CONCAT('%', a2.code, '%')
|
|
|
+AND a2.item_id = 2023000000000000020
|
|
|
+WHERE a1.user_id = t1.id
|
|
|
+) AS teaching_status FROM xjr_user t1
|
|
|
INNER JOIN base_teacher t2 ON t1.id = t2.user_id
|
|
|
LEFT JOIN xjr_dictionary_detail t3 ON t2.employ_type = t3.code
|
|
|
+LEFT JOIN xjr_dictionary_detail t4 ON t2.job_state = t4.code
|
|
|
WHERE t1.delete_mark = 0;
|
|
|
|
|
|
INSERT INTO data_expert_source(id,create_user_id,create_date,delete_mark,enabled_mark,sort_code,NAME,source_type,view_name)
|
|
|
@@ -26,4 +33,16 @@ INSERT INTO data_expert_source_field(id,create_user_id,create_date,delete_mark,e
|
|
|
VALUES
|
|
|
(1713872370,1000000000000000000,NOW(),0,1,7,1713871534,'email','邮箱','基础信息');
|
|
|
|
|
|
+INSERT INTO data_expert_source_field(id,create_user_id,create_date,delete_mark,enabled_mark,sort_code,data_expert_source_id,field_name,show_name,data_group)
|
|
|
+VALUES
|
|
|
+(1713872371,1000000000000000000,NOW(),0,1,7,1713871534,'job_state','在职状态','基础信息');
|
|
|
+
|
|
|
+INSERT INTO data_expert_source_field(id,create_user_id,create_date,delete_mark,enabled_mark,sort_code,data_expert_source_id,field_name,show_name,data_group)
|
|
|
+VALUES
|
|
|
+(1713872372,1000000000000000000,NOW(),0,1,7,1713871534,'join_time','来校时间','基础信息');
|
|
|
+
|
|
|
+INSERT INTO data_expert_source_field(id,create_user_id,create_date,delete_mark,enabled_mark,sort_code,data_expert_source_id,field_name,show_name,data_group)
|
|
|
+VALUES
|
|
|
+(1713872373,1000000000000000000,NOW(),0,1,7,1713871534,'teaching_status','任课状况','基础信息');
|
|
|
+
|
|
|
|