Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRepairDao.java

@@ -3,10 +3,22 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.StudentRepair;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface StudentRepairDao extends com.ym.mec.common.dal.BaseDAO<Integer, StudentRepair> {
-     List<BasicUserDto> getStudents(@Param("employeeId") Integer employeeId, @Param("organIdList") String organIdList);
+     /**
+      * 获取学生列表
+      * @param params
+      * @return
+      */
+     List<BasicUserDto> getStudents(Map<String, Object> params);
+
+     /**
+      * 获取学生总数
+      * @param params
+      * @return
+      */
+     Integer getStudentsCount(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -54,6 +54,26 @@ public class EmployeeDto {
     @ApiModelProperty(value = "部门名称",required = false)
     private List<String> organNameList;
 
+    private String contactAddress;
+
+    private String postalCode;
+
+    public String getContactAddress() {
+        return contactAddress;
+    }
+
+    public void setContactAddress(String contactAddress) {
+        this.contactAddress = contactAddress;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(String postalCode) {
+        this.postalCode = postalCode;
+    }
+
     public List<String> getRoleNames() {
         return roleNames;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/RepairStudentQueryInfo.java

@@ -0,0 +1,26 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class RepairStudentQueryInfo extends QueryInfo {
+
+    private Integer employeeId;
+
+    private String organIdList;
+
+    public Integer getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(Integer employeeId) {
+        this.employeeId = employeeId;
+    }
+
+    public String getOrganIdList() {
+        return organIdList;
+    }
+
+    public void setOrganIdList(String organIdList) {
+        this.organIdList = organIdList;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRepairService.java

@@ -2,17 +2,15 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.StudentRepair;
+import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
-
-import java.util.List;
+import org.springframework.stereotype.Service;
 
 public interface StudentRepairService extends BaseService<Integer, StudentRepair> {
 
     /**
      * 根据维修技师获取相应学生列表
-     *
-     * @param employeeId
-     * @return
      */
-    List<BasicUserDto> getStudents(Integer employeeId);
+    PageInfo<BasicUserDto> getStudents(RepairStudentQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -1,16 +1,23 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.StudentRepairDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.StudentRepair;
+import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
 import com.ym.mec.biz.service.StudentRepairService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+@Service
 public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRepair> implements StudentRepairService {
 
     @Autowired
@@ -23,9 +30,19 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     }
 
     @Override
-    public List<BasicUserDto> getStudents(Integer employeeId) {
-       // 维修技师学生列表为所负责乐团学员+无乐团学员+乐团无技师学员
-
-        return null;
+    public PageInfo<BasicUserDto> getStudents(RepairStudentQueryInfo queryInfo) {
+        PageInfo<BasicUserDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<BasicUserDto> dataList = new ArrayList<>();
+        int count = studentRepairDao.getStudentsCount(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentRepairDao.getStudents(params);
+
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
     }
 }

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -174,6 +174,8 @@
         <result property="jobNature" column="job_nature_"/>
         <result property="entryDate" column="entry_date_"/>
         <result property="demissionDate" column="demission_date_"/>
+        <result property="contactAddress" column="contact_address_"/>
+        <result property="postalCode" column="postal_code_"/>
         <collection property="roleNames" ofType="string" javaType="list">
             <result column="role_name_"/>
         </collection>
@@ -190,7 +192,7 @@
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
         SELECT ue.*,o.name_ organ_name_list_,o.id_ organ_id_list_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
-        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_
+        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
         <if test="roleId != null">

mec-biz/src/main/resources/config/mybatis/StudentRepairMapper.xml

@@ -118,16 +118,37 @@
         </set>
         WHERE id_ = #{id}
     </update>
-    <select id="getStudents" resultType="com.ym.mec.biz.dal.dto.BasicUserDto">
-        SELECT username_,id_ user_id_,avatar_ head_url_,gender_
+
+    <select id="getStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+        SELECT username_ ,id_ user_id_,avatar_ head_url_,gender_
         FROM sys_user
         WHERE FIND_IN_SET(organ_id_,#{organIdList})
-          AND id_ NOT IN (
-            SELECT cssp.user_id_
-            FROM music_group mg
-                     LEFT JOIN course_schedule_student_payment cssp ON mg.id_ = cssp.music_group_id_
-            WHERE cssp.group_type_ = 'MUSIC'
-              AND mg.repair_user_id_ != #{employeeId})
+        AND user_type_ LIKE '%STUDENT%'
+        <if test="search">
+            AND (username_ LIKE #{search}'%' OR phone_ LIKE #{search}'%')
+        </if>
+        AND id_ NOT IN (
+        SELECT cssp.user_id_
+        FROM music_group mg
+        LEFT JOIN course_schedule_student_payment cssp ON mg.id_ = cssp.music_group_id_
+        WHERE cssp.group_type_ = 'MUSIC'
+        AND mg.repair_user_id_ != #{employeeId})
         <include refid="global.limit"/>
     </select>
+
+    <select id="getStudentsCount" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM sys_user
+        WHERE FIND_IN_SET(organ_id_,#{organIdList})
+        AND user_type_ LIKE '%STUDENT%'
+        <if test="search">
+            AND (username_ LIKE #{search}'%' OR phone_ LIKE #{search}'%')
+        </if>
+        AND id_ NOT IN (
+        SELECT cssp.user_id_
+        FROM music_group mg
+        LEFT JOIN course_schedule_student_payment cssp ON mg.id_ = cssp.music_group_id_
+        WHERE cssp.group_type_ = 'MUSIC'
+        AND mg.repair_user_id_ != #{employeeId}
+        )
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -5,6 +5,8 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
+import com.ym.mec.biz.service.StudentRepairService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
@@ -18,8 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Objects;
 
-@RequestMapping("eduPracticeGroup")
-@Api(tags = "陪练课服务")
+@RequestMapping("eduRepair")
+@Api(tags = "教务维修服务")
 @RestController
 public class EduRepairController extends BaseController {
 
@@ -28,20 +30,23 @@ public class EduRepairController extends BaseController {
 
     @Autowired
     private EmployeeDao employeeDao;
+    @Autowired
+    private StudentRepairService studentRepairService;
 
-    @ApiOperation("获取学生的陪练课")
+    @ApiOperation("获取学生列表")
     @GetMapping(value = "/getStudents")
-    public HttpResponseResult getStudents() {
+    public HttpResponseResult getStudents(RepairStudentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
 
         Employee employee = employeeDao.get(sysUser.getId());
-        if(Objects.isNull(employee)){
+        if (Objects.isNull(employee)) {
             return failed(HttpStatus.NOT_ACCEPTABLE, "员工信息不存在");
         }
-
-        return null;
+        queryInfo.setEmployeeId(sysUser.getId());
+        queryInfo.setOrganIdList(employee.getOrganIdList());
+        return succeed(studentRepairService.getStudents(queryInfo));
     }
 }