update

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -24,17 +24,12 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysRole">
-		SELECT * FROM sys_role ORDER BY id_
+		SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY upate_time_ DESC
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysRole" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_)
         VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId})
     </insert>
@@ -72,13 +67,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysRole" parameterType="map">
-        SELECT * FROM sys_role ORDER BY id_
+        SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY update_time_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role
+		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0
 	</select>
 
     <select id="findRoleByUserId" resultMap="SysRole">

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

@@ -17,9 +17,20 @@ public class StudentManageQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团ID")
     private String musicGroupId;
 
+    @ApiModelProperty(value = "学生姓名")
+    private String studentName;
+
     @ApiModelProperty(value = "状态（在读、请假、退学）",required = false)
     private ClassGroupStudentStatusEnum studentStatus;
 
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
     public ClassGroupStudentStatusEnum getStudentStatus() {
         return studentStatus;
     }

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

@@ -1,11 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
-import io.swagger.annotations.ApiModelProperty;
-
-import com.ym.mec.auth.api.enums.UserLockFlag;
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class TeacherQueryInfo extends QueryInfo {
 
@@ -16,13 +12,13 @@ public class TeacherQueryInfo extends QueryInfo {
     private Integer organId;
 
     @ApiModelProperty(value = "教师工作性质")
-    private JobNatureEnum jobNature;
+    private String jobNature;
 
     @ApiModelProperty(value = "是否试用期")
-    private YesOrNoEnum isProbationPeriod;
+    private String isProbationPeriod;
 
     @ApiModelProperty(value = "账号状态")
-    private UserLockFlag lockFlag;
+    private String lockFlag;
 
     public Integer getSubjectId() {
         return subjectId;
@@ -40,27 +36,27 @@ public class TeacherQueryInfo extends QueryInfo {
         this.organId = organId;
     }
 
-    public JobNatureEnum getJobNature() {
+    public String getJobNature() {
         return jobNature;
     }
 
-    public void setJobNature(JobNatureEnum jobNature) {
+    public void setJobNature(String jobNature) {
         this.jobNature = jobNature;
     }
 
-    public YesOrNoEnum getIsProbationPeriod() {
+    public String getIsProbationPeriod() {
         return isProbationPeriod;
     }
 
-    public void setIsProbationPeriod(YesOrNoEnum isProbationPeriod) {
+    public void setIsProbationPeriod(String isProbationPeriod) {
         this.isProbationPeriod = isProbationPeriod;
     }
 
-    public UserLockFlag getLockFlag() {
+    public String getLockFlag() {
         return lockFlag;
     }
 
-    public void setLockFlag(UserLockFlag lockFlag) {
+    public void setLockFlag(String lockFlag) {
         this.lockFlag = lockFlag;
     }
 }

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

@@ -59,8 +59,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public void add(Employee employee){
 		SysUser user = sysUserFeignService.queryUserByMobile(employee.getPhone());
 		if(user != null){
-            user.setUserType(SysUserType.SYSTEM);
-			teacherDao.updateUser(user);
+			employee.setUserType(SysUserType.SYSTEM);
+			teacherDao.updateUser(employee);
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null || employee1.getId() == null){
 				employee.setUserId(user.getId());

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

@@ -2,12 +2,12 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.StudentManageDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dao.VipGroupDao;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.page.*;
-import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
 import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
@@ -43,7 +43,7 @@ public class StudentManageServiceImpl implements StudentManageService {
         SysUser user = sysUserFeignService.queryUserInfo();
         PageInfo<StudentManageListDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         queryInfo.setOrganId(user.getOrganId());
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
 
         List<StudentManageListDto> dataList = null;

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

@@ -66,6 +66,9 @@
         <if test="organId != null">
             AND su.organ_id_=#{organId}
         </if>
+        <if test="studentName != null and studentName != ''">
+            AND su.real_name_ LIKE CONCAT('%',#{studentName},'%')
+        </if>
         <include refid="global.limit"/>
     </select>
 
@@ -84,6 +87,9 @@
         <if test="organId != null">
             AND su.organ_id_=#{organId}
         </if>
+        <if test="studentName != null and studentName != ''">
+            AND su.real_name_ LIKE CONCAT('%',#{studentName},'%')
+        </if>
     </select>
     <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
         SELECT su.real_name_,su.gender_,su.birthdate_,sr.parents_name_,su.id_ user_id_,

mec-teacher/src/main/java/com/ym/mec/teacher/controller/DemoGroupController.java

@@ -50,10 +50,4 @@ public class DemoGroupController extends BaseController {
         return succeed(demoGroupService.update(demoGroup));
     }
 
-    @ApiOperation(value = "获取教师试听课安排列表")
-    @GetMapping("/findTeacherDemoGroups")
-    public Object findTeacherDemoGroups(TeacherManageDemoGroupQueryInfo queryInfo){
-        return succeed(demoGroupService.findTeacherDemoGroups(queryInfo));
-    }
-
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -41,13 +41,7 @@ public class TeacherAttendanceController extends BaseController {
     public Object queryPage(TeacherAttendanceQueryInfo queryInfo) {
         return succeed(teacherAttendanceService.queryPage(queryInfo));
     }
-
-    @ApiOperation(value = "查询教师签到（上课）记录")
-    @GetMapping("/getTeacherPersonalAttendances")
-    public Object getTeacherPersonalAttendances(TeacherCloseQueryInfo queryInfo){
-        return succeed(teacherAttendanceService.getTeacherPersonalAttendances(queryInfo));
-    }
-
+    
     @ApiOperation(value = "根据班级ID获取当前课程的学生")
     @GetMapping("/getCurrentCourseStudents")
     public Object getCurrentCourseStudents(Long courseScheduleId){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -54,11 +54,6 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.getDetail(id));
     }
 
-    @ApiOperation(value = "分页查询教师列表")
-    @GetMapping("/queryPage")
-    public Object queryPage(TeacherQueryInfo queryInfo) {
-        return succeed(teacherService.queryPageDetail(queryInfo));
-    }
 
     @ApiOperation(value = "根据教师编号查询教师课程班列表")
     @GetMapping("/getClass")
@@ -67,19 +62,6 @@ public class TeacherController extends BaseController {
         return succeed(classGroupService.findClassGroup4Teacher(id));
     }
 
-    @ApiOperation(value = "获取老师乐团课程信息列表")
-    @GetMapping("/getTeacherMusicClass")
-    @ApiParam(value = "教师编号", required = true)
-    public Object getTeacherMusicClass(QueryInfo queryInfo){
-        return succeed(classGroupService.getTeacherMusicClass(queryInfo));
-    }
-
-    @ApiOperation(value = "获取老师VIP课程信息列表")
-    @GetMapping("/getTeacherVipClass")
-    public Object getTeacherVipClass(VipClassQueryInfo queryInfo){
-        return succeed(classGroupService.getTeacherVipClass(queryInfo));
-    }
-
     @ApiOperation(value = "获取教师所有聊天群组")
     @GetMapping("/queryTeacherGroups")
     public Object queryTeacherGroups(String search){
@@ -100,15 +82,4 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.queryGroupStudents(sysUser.getId(),search));
     }
 
-    @ApiOperation(value = "获取教师上课结算列表")
-    @GetMapping("/queryCloses")
-    public Object queryCloses(TeacherCloseQueryInfo queryInfo){
-        return succeed(teacherService.queryCloses(queryInfo));
-    }
-
-    @ApiOperation(value = "获取教师上课课酬未结算总额")
-    @GetMapping("/sumTeacherNoPay")
-    public Object findTeacherNoPay(Integer teacherId){
-        return succeed(teacherService.findTeacherNoPay(teacherId));
-    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/DemoGroupController.java

@@ -0,0 +1,32 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.TeacherManageDemoGroupQueryInfo;
+import com.ym.mec.biz.service.DemoGroupService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/25
+ */
+@Api(tags = "试听课")
+@RequestMapping("demoGroup")
+@RestController
+public class DemoGroupController extends BaseController {
+
+    @Autowired
+    private DemoGroupService demoGroupService;
+    @ApiOperation(value = "获取教师试听课安排列表")
+    @GetMapping("/findTeacherDemoGroups")
+    @PreAuthorize("@pcs.hasPermissions('demoGroup/findTeacherDemoGroups')")
+    public Object findTeacherDemoGroups(TeacherManageDemoGroupQueryInfo queryInfo){
+        return succeed(demoGroupService.findTeacherDemoGroups(queryInfo));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/TeacherAttendanceController.java

@@ -0,0 +1,28 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
+import com.ym.mec.biz.service.TeacherAttendanceService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("teacherAttendance")
+@Api(tags = "教师签到服务")
+@RestController
+public class TeacherAttendanceController extends BaseController {
+
+    @Autowired
+    private TeacherAttendanceService teacherAttendanceService;
+
+    @ApiOperation(value = "查询教师签到（上课）记录")
+    @GetMapping("/getTeacherPersonalAttendances")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/getTeacherPersonalAttendances')")
+    public Object getTeacherPersonalAttendances(TeacherCloseQueryInfo queryInfo){
+        return succeed(teacherAttendanceService.getTeacherPersonalAttendances(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -2,11 +2,12 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
-import com.ym.mec.biz.dal.page.MusicGroupTeachersQueryInfo;
+import com.ym.mec.biz.dal.page.*;
+import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,6 +25,8 @@ public class TeacherController extends BaseController {
     private TeacherService teacherService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private ClassGroupService classGroupService;
 
     @ApiOperation(value = "新增教师")
     @PostMapping("/add")
@@ -33,6 +36,13 @@ public class TeacherController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "分页查询教师列表")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('teacher/queryPage')")
+    public Object queryPage(TeacherQueryInfo queryInfo) {
+        return succeed(teacherService.queryPageDetail(queryInfo));
+    }
+
     @ApiOperation(value = "修改教师信息")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('teacher/update')")
@@ -80,4 +90,34 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.queryTeacherAttendance(queryInfo));
     }
 
+    @ApiOperation(value = "获取老师乐团课程信息列表")
+    @GetMapping("/getTeacherMusicClass")
+    @ApiParam(value = "教师编号", required = true)
+    @PreAuthorize("@pcs.hasPermissions('teacher/getTeacherMusicClass')")
+    public Object getTeacherMusicClass(QueryInfo queryInfo){
+        return succeed(classGroupService.getTeacherMusicClass(queryInfo));
+    }
+
+    @ApiOperation(value = "获取老师VIP课程信息列表")
+    @GetMapping("/getTeacherVipClass")
+    @PreAuthorize("@pcs.hasPermissions('teacher/getTeacherVipClass')")
+    public Object getTeacherVipClass(VipClassQueryInfo queryInfo){
+        return succeed(classGroupService.getTeacherVipClass(queryInfo));
+    }
+
+    @ApiOperation(value = "获取教师上课结算列表")
+    @GetMapping("/queryCloses")
+    @PreAuthorize("@pcs.hasPermissions('teacher/queryCloses')")
+    public Object queryCloses(TeacherCloseQueryInfo queryInfo){
+        return succeed(teacherService.queryCloses(queryInfo));
+    }
+
+    @ApiOperation(value = "获取教师上课课酬未结算总额")
+    @GetMapping("/sumTeacherNoPay")
+    @PreAuthorize("@pcs.hasPermissions('teacher/sumTeacherNoPay')")
+    public Object findTeacherNoPay(Integer teacherId){
+        return succeed(teacherService.findTeacherNoPay(teacherId));
+    }
+
+
 }