feat: [试验管理] 选人的地方存英文

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/select/DeptUserTreeDto.java

@@ -20,6 +20,10 @@ public class DeptUserTreeDto {
      * 名称
      */
     private String name;
+    /**
+     * 名称-英文
+     */
+    private String nameEn;
 
     public Integer getType() {
         return type;
@@ -52,4 +56,12 @@ public class DeptUserTreeDto {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java

@@ -71,6 +71,7 @@ public class StudySubjectServiceImpl extends ServiceImpl
                 info.setStudyId(exists.get(0).getStudyId());
                 info.setLeader(exists.get(0).getLeader());
                 info.setLeaderName(exists.get(0).getLeaderName());
+                info.setLeaderNameEn(exists.get(0).getLeaderNameEn());
                 info.setSelect(true);
             }else{
                 info.setSelect(false);

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyListDto">
-        SELECT s.`id`,s.`type`,s.`sn`,s.`name`,s.`leader`,s.`leader_name`,s.`status`,s.`borrow_status`,s.`create_time`,s.`dept_name` FROM `t_study` s
+        SELECT s.`id`,s.`type`,s.`sn`,s.`name`,s.`leader`,s.`leader_name`,s.`leader_name_en`,s.`status`,s.`borrow_status`,s.`create_time`,s.`dept_name` FROM `t_study` s
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}

hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -246,14 +246,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	</delete>
 
 	<select id="selectDeptAndUser" resultType="com.hxhq.business.dto.select.DeptUserTreeDto">
-		(SELECT d.dept_id AS id, d.parent_id, d.dept_name AS `name`, d.type
+		(SELECT d.dept_id AS id, d.parent_id, d.dept_name AS `name`, d.dept_name AS `nameEn`, d.type
 		FROM sys_dept d
 		WHERE d.del_flag = '0' ORDER BY d.`dept_id` DESC)
 
 		UNION ALL
 
 
-		(SELECT u.`user_id` AS id,u.`dept_id` AS parent_id,u.`nick_name` AS `name`,7 AS `type` FROM `sys_user` u
+		(SELECT u.`user_id` AS id,u.`dept_id` AS parent_id,u.`nick_name` AS `name`,u.`user_name` AS `nameEn`,7 AS `type` FROM `sys_user` u
 		WHERE u.`del_flag`='0' AND u.`user_id`&lt;>1 ORDER BY u.`user_id` DESC)
 	</select>