update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -67,7 +67,6 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "根据用户编号获取用户基本信息")
 	@GetMapping("/getBasic")
-    @PreAuthorize("@pcs.hasPermissions('user/getBasic')")
 	public Object getBasic(Integer userId) {
 		if (userId == null) {
 			return failed("参数校验异常");

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
 import com.ym.mec.biz.dal.dto.VipGroupSalaryDto;
 import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
 import com.ym.mec.common.dal.BaseDAO;
@@ -79,4 +80,11 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 */
 	List<CourseScheduleTeacherSalary> findByCourseScheduleIdsAndTeacherRole(@Param("courseScheduleIds") List<Integer> courseScheduleIds,
 															 @Param("teacherRole") String teacherRole);
+
+	/**
+	 * 乐团详情--课酬调整--课程教师列表
+	 * @param courseScheduleId
+	 * @return
+	 */
+    List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
 }

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

@@ -0,0 +1,75 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CourseScheduleTeachersDto{
+
+    @ApiModelProperty(value = "教师编号",required = false)
+    private String teacherId;
+
+    @ApiModelProperty(value = "课程编号",required = false)
+    private String courseScheduleId;
+
+    @ApiModelProperty(value = "教师名称",required = false)
+    private String teacherName;
+
+    @ApiModelProperty(value = "教师角色",required = false)
+    private String teacherRole;
+
+    @ApiModelProperty(value = "课酬",required = false)
+    private BigDecimal expectSalary;
+
+    @ApiModelProperty(value = "补贴",required = false)
+    private BigDecimal subsidy;
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(String teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(String courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeacherRole() {
+        return teacherRole;
+    }
+
+    public void setTeacherRole(String teacherRole) {
+        this.teacherRole = teacherRole;
+    }
+
+    public BigDecimal getExpectSalary() {
+        return expectSalary;
+    }
+
+    public void setExpectSalary(BigDecimal expectSalary) {
+        this.expectSalary = expectSalary;
+    }
+
+    public BigDecimal getSubsidy() {
+        return subsidy;
+    }
+
+    public void setSubsidy(BigDecimal subsidy) {
+        this.subsidy = subsidy;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Teacher.java

@@ -54,7 +54,6 @@ public class Teacher extends SysUser {
 	private String subjectId;
 
 	/** 专业技能（支持多个，用|分隔），对应科目表编号 */
-	@ApiModelProperty(value = "专业技能（支持多个，用逗号分隔），对应科目表名称", required = false)
 	private List<String> subjectName;
 
 	/** 入职时间 */
@@ -73,6 +72,10 @@ public class Teacher extends SysUser {
 	@ApiModelProperty(value = "流动范围(多个用逗号分开)", required = false)
 	private String flowOrganRange;
 
+	/** 流动范围(多个用|分开) */
+	@ApiModelProperty(value = "流动范围编号", required = false)
+	private String flowOrganRangeId;
+
 	@ApiModelProperty(value = "老师介绍", required = false)
 	private String introduction;
 
@@ -85,9 +88,16 @@ public class Teacher extends SysUser {
 	@ApiModelProperty(value = "离职时间", required = false)
 	private Date demissionDate;
 
-	@ApiModelProperty(value = "老师教学点列表", required = false)
 	private List<School> teacherSchools;
 
+	public String getFlowOrganRangeId() {
+		return flowOrganRangeId;
+	}
+
+	public void setFlowOrganRangeId(String flowOrganRangeId) {
+		this.flowOrganRangeId = flowOrganRangeId;
+	}
+
 	public List<School> getTeacherSchools() {
 		return teacherSchools;
 	}

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

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
@@ -141,4 +142,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	SubFeeSettingDto findMusicGroupBasicInfo(String musicGroupId);
+
+	/**
+	 * 乐团详情--课酬调整--课程教师列表
+	 * @param courseScheduleId
+	 * @return
+	 */
+    List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId);
 }

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

@@ -3,10 +3,7 @@ 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.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.MusicCardDto;
-import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
-import com.ym.mec.biz.dal.dto.SubjectRegisterDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
 import com.ym.mec.biz.dal.enums.*;
@@ -602,4 +599,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         subFeeSettingDto.setMonths(paymentMonth);
         return subFeeSettingDto;
     }
+
+    @Override
+    public List<CourseScheduleTeachersDto> queryTeacherSalary(Integer courseScheduleId) {
+        return courseScheduleTeacherSalaryDao.queryTeacherSalary(courseScheduleId);
+    }
 }

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

@@ -77,18 +77,22 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(Teacher teacher){
+	public void add(Teacher teacher) throws Exception {
 		SysUser user = sysUserFeignService.queryUserByMobile(teacher.getPhone());
 		if(user != null && user.getId() != null){
-			teacherDao.updateUser(user);
-			Teacher teacher1 = teacherDao.get(user.getId());
+			Integer id = user.getId();
+			Teacher teacher1 = teacherDao.get(id);
 			if(teacher1 == null || teacher1.getId() == null){
-				teacher.setId(user.getId());
+				teacher.setId(id);
+				teacherDao.updateUser(user);
 				teacherDao.insert(teacher);
+			}else {
+				throw new Exception("用户已存在");
 			}
 			return;
 		}
 		teacher.setUserType(SysUserType.TEACHER);
+		teacher.setUsername(teacher.getRealName());
 		teacherDao.addSysUser(teacher);
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(teacher.getId(),"CNY"));
@@ -301,6 +305,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			teacher.setTeacherSchools(teacherSchools);
 			//获取流动范围
 			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
+				teacher.setFlowOrganRangeId(teacher.getFlowOrganRange());
 				List<String> organNames = organizationDao.findByOrganIds(teacher.getFlowOrganRange());
 				teacher.setFlowOrganRange(StringUtils.join(organNames,","));
 			}

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

@@ -173,7 +173,21 @@
 		AND csts.teacher_role_=#{teacherRole}
 	</select>
 
-	<update id="batchUpdateWages" parameterType="map">
+	<resultMap id="CourseScheduleTeachersDto" type="com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto">
+		<result property="teacherId" column="user_id_"/>
+		<result property="teacherName" column="real_name_"/>
+		<result property="teacherRole" column="teacher_role_"/>
+		<result property="expectSalary" column="expect_salary_"/>
+		<result property="subsidy" column="subsidy_"/>
+	</resultMap>
+    <select id="queryTeacherSalary" resultMap="CourseScheduleTeachersDto">
+		SELECT csts.user_id_,su.real_name_,csts.teacher_role_,csts.expect_salary_,csts.subsidy_
+		FROM course_schedule_teacher_salary csts
+		LEFT JOIN sys_user su ON su.id_ = csts.user_id_
+		WHERE csts.course_schedule_id_ = #{courseScheduleId}
+	</select>
+
+    <update id="batchUpdateWages" parameterType="map">
 		UPDATE course_schedule_teacher_salary set
 			subsidy_ = #{subsidy},
 			expect_salary_ = #{salary},

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

@@ -49,7 +49,7 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Teacher">
-        SELECT t.*,su.username_,su.password_,su.salt_,su.phone_,su.avatar_,
+        SELECT t.*,su.real_name_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
         su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_
         FROM teacher t

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -54,12 +54,12 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		projectconfig.setItsmApiUrl(apisUrl);
 		Result result = ServiceClientManager.registClient(projectconfig, null, null);
 		if (result.getErrCode() != 0) {
-			throw new ThirdpartyException("e签宝客户端注册失败");
+//			throw new ThirdpartyException("e签宝客户端注册失败");
 		}
 
 		serviceClient = ServiceClientManager.get(projectId);
 		if (serviceClient == null) {
-			throw new ThirdpartyException("获取e签宝客户端失败");
+//			throw new ThirdpartyException("获取e签宝客户端失败");
 		}
 	}
 

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

@@ -163,4 +163,11 @@ public class CourseScheduleController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "乐团详情--课酬调整--课程教师列表")
+	@GetMapping("/queryTeacherSalary")
+    @PreAuthorize("@pcs.hasPermissions('course/queryTeacherSalary')")
+	public Object queryTeacherSalary(Integer courseScheduleId) {
+		return succeed(musicGroupService.queryTeacherSalary(courseScheduleId));
+	}
+
 }