update

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

@@ -137,6 +137,8 @@ public class MusicGroup{
 	@ApiModelProperty(value = "备注",required = true)
 	private String memo;
 
+	private Integer repairUserId;
+
 	@ApiModelProperty(value = "预计开团日期",required = true)
 	private Date expectStartGroupDate;
 
@@ -145,6 +147,14 @@ public class MusicGroup{
 	
 	private OwnershipType ownershipType;
 
+	public Integer getRepairUserId() {
+		return repairUserId;
+	}
+
+	public void setRepairUserId(Integer repairUserId) {
+		this.repairUserId = repairUserId;
+	}
+
 	public String getDirectorUserName() {
 		return directorUserName;
 	}

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

@@ -30,6 +30,7 @@
 		<result column="expect_start_group_date_" property="expectStartGroupDate" />
 		<result column="group_member_num_" property="groupMemberNum" />
 		<result column="memo_" property="memo" />
+		<result column="repair_user_id_" property="repairUserId" />
         <result column="ownership_type_" property="ownershipType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 
@@ -55,11 +56,12 @@
 		INSERT INTO music_group
 		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,
 		bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,settlement_type_,cooperation_organ_id_,enlightenment_course_time_,
-		parent_meeting_time_,img_,director_user_id_,is_classroom_lessons_,memo_,expect_start_group_date_,ownership_type_)
+		parent_meeting_time_,img_,director_user_id_,is_classroom_lessons_,memo_,expect_start_group_date_,ownership_type_,repair_user_id_)
 		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},now(),now(),
 		#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},
 		#{isExtraClass, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{settlementType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId},#{isClassroomLessons},#{memo},#{expectStartGroupDate},#{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+		#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime},#{img},#{directorUserId},#{isClassroomLessons},#{memo},#{expectStartGroupDate},
+		#{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{repairUserId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -72,6 +74,9 @@
 			<if test="status != null">
 				status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
+			<if test="repairUserId != null">
+				repair_user_id_ = #{repairUserId},
+			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>

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

@@ -145,4 +145,21 @@ public class EmployeeController extends BaseController {
         }
         return succeed(employeeService.findByRole("4,5",organIds));
     }
+
+    @ApiOperation(value = "获取维修技师")
+    @GetMapping("/findTechnician")
+    public HttpResponseResult findTechnician(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        String organIds=new String();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeService.get(sysUser.getId());
+            if (StringUtils.isEmpty(organIds)) {
+                organIds=employee.getOrganIdList();
+            }
+        }
+        return succeed(employeeService.findByRole("37",organIds));
+    }
 }