员工列表添加字段

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.common.enums.UserGenderEnum;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -40,6 +41,28 @@ public class EmployeeDto {
     /** 离职日期 */
     private java.util.Date demissionDate;
 
+    @ApiModelProperty(value = "部门ID",required = false)
+    private Long organId;
+
+    @ApiModelProperty(value = "部门名称",required = false)
+    private String organName;
+
+    public Long getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Long organId) {
+        this.organId = organId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -16,7 +16,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @Date: 2019/9/21
      * 创建vip课
      */
-    String createVipGroup(VipGroupApplyDto vipGroup);
+    void createVipGroup(VipGroupApplyDto vipGroup);
 
     /**
      * @Author: Joburgess

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

@@ -45,7 +45,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public String createVipGroup(VipGroupApplyDto vipGroup) {
+	public void createVipGroup(VipGroupApplyDto vipGroup) {
 		VipGroupApplyBaseInfoDto vipGroupApplyBaseInfoDto=vipGroup.getVipGroupApplyBaseInfo();
 		vipGroupDao.insert(vipGroupApplyBaseInfoDto);
 		ClassGroup classGroup=new ClassGroup();
@@ -66,7 +66,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroup.getCourseSchedules().forEach(courseSchedule -> {
 			courseSchedule.setClassGroupId(classGroup.getId());
 		});
-		return courseScheduleService.batchAddCourseSchedule(vipGroup.getCourseSchedules());
+		courseScheduleService.batchAddCourseSchedule(vipGroup.getCourseSchedules());
 	}
 
 	@Override

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

@@ -124,6 +124,8 @@
         <result property="jobNature" column="job_nature_" />
         <result property="entryDate" column="entry_date_" />
         <result property="demissionDate" column="demission_date_" />
+        <result property="organId" column="organ_id_" />
+        <result property="organName" column="organ_name_" />
     </resultMap>
 
     <sql id="queryCondition">
@@ -149,6 +151,8 @@
         su.phone_,
         sr.role_name_,
         su.lock_flag_,
+        su.organ_id_,
+        o.name_ organ_name_,
         e.job_nature_,
         e.entry_date_,
         e.demission_date_

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

@@ -42,24 +42,16 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/batchAddCourseSchedule/{musicGroupID}")
     public Object batchAddCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                          @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
-        String s = scheduleService.batchAddCourseSchedule(courseSchedules);
-        if(s.isEmpty()){
-            return succeed();
-        }else{
-            return failed(s);
-        }
+        scheduleService.batchAddCourseSchedule(courseSchedules);
+        return succeed();
     }
 
     @ApiOperation(value = "批量跟新排课")
     @PostMapping("/batchUpdateCourseSchedule/{musicGroupID}")
     public Object batchUpdateCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                             @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
-        String s = scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);
-        if(s.isEmpty()){
-            return succeed();
-        }else{
-            return failed(s);
-        }
+        scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);
+        return succeed();
     }
 
     @ApiOperation(value = "根据月份获取乐团在该月有课的日期")

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

@@ -21,7 +21,7 @@ import com.ym.mec.common.controller.BaseController;
  * @Date 2019/9/17
  */
 @RequestMapping("employee")
-@Api(tags = "学生考勤服务")
+@Api(tags = "员工管理")
 @RestController
 public class EmployeeController extends BaseController {
 
@@ -31,7 +31,7 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
     public Object queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws IOException {
-        return employeeService.queryEmployByOrganId(queryInfo);
+        return succeed(employeeService.queryEmployByOrganId(queryInfo));
     }
 
     @ApiOperation(value = "员工操作")

mec-web/src/main/java/com/ym/mec/web/controller/system/VipGroupManageController.java

@@ -26,12 +26,8 @@ public class VipGroupManageController extends BaseController {
     @ApiOperation("vip课申请")
     @PostMapping("/vipGroupApply")
     public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto){
-        String s=vipGroupService.createVipGroup(vipGroupApplyDto);
-        if(s.isEmpty()){
-            return succeed();
-        }else{
-            return failed(s);
-        }
+        vipGroupService.createVipGroup(vipGroupApplyDto);
+        return succeed();
     }
 
     @ApiOperation("vip课详情")

mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherVipGroupController.java

@@ -35,12 +35,8 @@ public class TeacherVipGroupController extends BaseController {
     public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto){
         SysUser user = sysUserFeignService.queryUserInfo();
         vipGroupApplyDto.getVipGroupApplyBaseInfo().setTeacherId(Long.valueOf(user.getId()));
-        String s=vipGroupService.createVipGroup(vipGroupApplyDto);
-        if(s.isEmpty()){
-            return succeed();
-        }else{
-            return failed(s);
-        }
+        vipGroupService.createVipGroup(vipGroupApplyDto);
+        return succeed();
     }
 
 }

mec-web/src/test/java/com/ym/Test.java

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import org.springframework.beans.BeanUtils;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Date;
 
 /**
@@ -25,4 +27,11 @@ public class Test {
         System.out.println(courseSchedule.getId());
     }
 
+    @org.junit.Test
+    public void test2() throws IOException {
+        System.out.println(System.getProperty("java.io.tmpdir"));
+        File file=new File("E:\test.txt");
+        file.createNewFile();
+    }
+
 }