bug

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -156,6 +156,17 @@ public class SysUser extends BaseEntity implements Serializable{
 	
 	private String positionName;
 
+	@ApiModelProperty(value = "用户职位",required = false)
+	private String positions;
+
+	public String getPositions() {
+		return positions;
+	}
+
+	public void setPositions(String positions) {
+		this.positions = positions;
+	}
+
 	public String getCertificateType() {
 		return certificateType;
 	}

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

@@ -150,7 +150,7 @@ public interface StudentManageService {
 
     /**
      * 修改学员信息
-     * @param sysUser
+     * @param student
      * @return
      */
     int studentUpdate(Student student);

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

@@ -387,8 +387,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					newCSList.add(tempPccs);
 				}
 				musicGroupPaymentCalender.setMusicGroupPaymentCalenderCourseSettingsList(newCSList);
+				musicGroupPaymentCalender.setCurrentTotalAmount(musicGroupPaymentCalenderCourseSettingsList.stream().map(e->e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO,BigDecimal::add));
 			}
-			musicGroupPaymentCalender.setCurrentTotalAmount(totalPaymentAmount);
 			musicGroupPaymentCalender.setOriginalTotalAmount(musicGroupPaymentCalenderDto.getOriginalAmount());
 
 			if (paymentType == PaymentType.MUSIC_APPLY) {

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

@@ -2153,20 +2153,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             studentRegistration.setUpdateTime(date);
             studentRegistrationDao.update(studentRegistration);
 
-            //更新服务指标、运营指标
-            /*int remainCourseNum = courseScheduleStudentPaymentDao.countStudentNotStartCourseNumWithCourseType(userId, null);
-            if (remainCourseNum == 0) {
-                Student student = studentDao.get(userId);
-                if (student == null) {
-                    throw new BizException("学生信息查询失败");
-                }
-                student.setServiceTag(0);
-                student.setOperatingTag(0);
-                student.setOperatingTempTag(0);
-                student.setUpdateTime(date);
-                studentDao.update(student);
-            }*/
-
             //删除进行中加学生，且在审批中或拒绝的缴费
             List<Long> paymentCalenderIdList = musicGroupPaymentCalenderDao.findStudentNoPaymentCalender(userId, musicGroupId);
             if (paymentCalenderIdList != null && paymentCalenderIdList.size() > 0) {

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

@@ -12,7 +12,7 @@
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 		
-	<resultMap type="com.ym.mec.biz.dal.dto.SysEmployeePositionDto" id="SysEmployeePositionDto">
+	<resultMap type="com.ym.mec.biz.dal.dto.SysEmployeePositionDto" id="SysEmployeePositionDto" extends="SysEmployeePosition">
 		<result column="position_name_" property="positionName" />
 		<result column="position_code_" property="positionCode" />
 	</resultMap>

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
@@ -164,6 +165,7 @@ public class EmployeeController extends BaseController {
             
             List<SysEmployeePositionDto> sysEmployeePositionDtoList = sysEmployeePositionService.queryByUserId(sysUser.getId());
             if(sysEmployeePositionDtoList != null && sysEmployeePositionDtoList.size() > 0){
+                sysUser.setPositions(StringUtils.join(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getRoleId).collect(Collectors.toSet()),","));
             	sysUser.setPositionName(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getPositionName).collect(Collectors.joining(",")));
             }
             return succeed(sysUser);
@@ -171,138 +173,6 @@ public class EmployeeController extends BaseController {
         return failed("获取用户信息失败");
     }
 
-    /*@ApiOperation(value = "获取教务人员")
-    @GetMapping("/findEducationUsers")
-    public HttpResponseResult findEducationUsers(Integer userId, Integer organId){
-        SysUser sysUser;
-        if(userId == null){
-            sysUser = sysUserFeignService.queryUserInfo();
-            if (sysUser == null) {
-                return failed("用户信息获取失败");
-            }
-        }else {
-            sysUser = sysUserFeignService.queryUserById(userId);
-        }
-        String organIds = new String();
-        if(Objects.isNull(organId)){
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds = employee.getOrganIdList();
-            }
-        }else{
-            organIds = organId.toString();
-        }
-        return succeed(employeeService.findByRole("4,5",organIds));
-    }
-
-    @ApiOperation(value = "获取对应角色的员工")
-    @GetMapping("/findUserByRole")
-    public HttpResponseResult findEducationUsers(Integer userId, Integer organId, EmployeeRoleEnum employeeRole){
-        SysUser sysUser;
-        if(userId == null){
-            sysUser = sysUserFeignService.queryUserInfo();
-            if (sysUser == null) {
-                return failed("用户信息获取失败");
-            }
-        }else {
-            sysUser = sysUserFeignService.queryUserById(userId);
-        }
-        String organIds = new String();
-        if(Objects.isNull(organId)){
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds = employee.getOrganIdList();
-            }
-        }else{
-            organIds = organId.toString();
-        }
-        HashMap<String, Object> map = new HashMap<>();
-        if(employeeRole == null){
-            map.put("TEAM_TEACHER",employeeService.findByRole("5",organIds));
-            map.put("TRANSACTION",employeeService.findByRole("58",organIds));
-            map.put("EDUCATION",employeeService.findByRole("4",organIds));
-        }else if(employeeRole == EmployeeRoleEnum.TEAM_TEACHER){
-            map.put("TEAM_TEACHER",employeeService.findByRole("5",organIds));
-        }else if(employeeRole == EmployeeRoleEnum.TRANSACTION){
-            map.put("TRANSACTION",employeeService.findByRole("58",organIds));
-        }else {
-            map.put("EDUCATION",employeeService.findByRole("4",organIds));
-        }
-        return succeed(map);
-    }
-
-    @ApiOperation(value = "获取对应角色的员工")
-    @GetMapping("/queryEmployeeByRole")
-    public HttpResponseResult queryEmployeeByRole(Integer organId, String roleId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        String organIds = new String();
-        if(Objects.isNull(organId)){
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds = employee.getOrganIdList();
-            }
-        }else{
-            organIds = organId.toString();
-        }
-        return succeed(employeeService.findByRole(roleId, organIds));
-    }
-
-    @ApiOperation(value = "获取教务老师")
-    @GetMapping("/findEducationTeacher")
-    public HttpResponseResult findEducationTeacher(Integer userId){
-        SysUser sysUser;
-        if(userId == null){
-            sysUser = sysUserFeignService.queryUserInfo();
-            if (sysUser == null) {
-                return failed("用户信息获取失败");
-            }
-        }else {
-            sysUser = sysUserFeignService.queryUserById(userId);
-        }
-        String organIds = new String();
-        Employee employee = employeeService.get(sysUser.getId());
-        if (StringUtils.isEmpty(organIds)) {
-            organIds = employee.getOrganIdList();
-        }
-        return succeed(employeeService.findByRole("4",organIds));
-    }
-
-    @ApiOperation(value = "获取维修技师")
-    @GetMapping("/findTechnician")
-    @PreAuthorize("@pcs.hasPermissions('employee/findTechnician')")
-    public HttpResponseResult findTechnician(String organIds){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        if(StringUtils.isEmpty(organIds)){
-            Employee employee = employeeService.get(sysUser.getId());
-            if (StringUtils.isEmpty(organIds)) {
-                organIds=employee.getOrganIdList();
-            }
-        }
-        return succeed(employeeService.findByRole("37",organIds));
-    }
-
-    @ApiOperation(value = "获取所有维修技师（包含离职和冻结的）")
-    @GetMapping("/findAllTechnician")
-    @PreAuthorize("@pcs.hasPermissions('employee/findAllTechnician')")
-    public HttpResponseResult<List<SimpleUserDto>> findAllTechnician(){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        String organIds = new String();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        Employee employee = employeeService.get(sysUser.getId());
-        if (StringUtils.isEmpty(organIds)) {
-            organIds=employee.getOrganIdList();
-        }
-        return succeed(employeeService.findAllByRole("37",organIds));
-    }*/
-
     @ApiOperation(value = "获取所选用户离职所需交接信息")
     @GetMapping("/levelDetail")
     @PreAuthorize("@pcs.hasPermissions('employee/levelDetail')")