Merge remote-tracking branch 'origin/master'

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

@@ -71,6 +71,26 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "角色id列表",required = false)
 	private List<Integer> roleIds;
 
+	private String contactAddress;
+
+	private String postalCode;
+
+	public String getContactAddress() {
+		return contactAddress;
+	}
+
+	public void setContactAddress(String contactAddress) {
+		this.contactAddress = contactAddress;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
 	public List<Integer> getRoleIds() {
 		return roleIds;
 	}

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/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -4171,10 +4171,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		LocalDate currentExpiredDay = courseStartDay.plusMonths(practiceGroup.getBuyMonths());
 		Date courseExpiredDateTemp=Date.from(currentExpiredDay.atStartOfDay(DateUtil.zoneId).toInstant());
 		if(coursesExpireDate.before(courseExpiredDateTemp)){
-			throw new BizException("课程结束时间不得早于，{}", DateUtil.dateToString(coursesExpireDate, "yyyy年MM月dd日"));
+			throw new BizException("课程结束时间不得早于，{}", DateUtil.dateToString(courseExpiredDateTemp, "yyyy年MM月dd日"));
 		}
 
-		practiceGroup.setCoursesExpireDate(coursesExpireDate);
+		practiceGroup.setCoursesExpireDate(DateUtil.addSeconds(DateUtil.addDays(coursesExpireDate, 1),-1));
 		practiceGroup.setUpdateTime(new Date());
 		practiceGroupDao.update(practiceGroup);
 	}

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

@@ -21,6 +21,8 @@
         <result column="create_time_" property="createTime"/>
         <result column="introduction_" property="introduction"/>
         <result column="demission_date_" property="demissionDate"/>
+        <result column="contact_address_" property="contactAddress"/>
+        <result column="postal_code_" property="postalCode"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
@@ -66,8 +68,10 @@
         </selectKey>
         -->
         INSERT INTO employee
-        (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_)
-        VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate})
+        (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
+        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_)
+        VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
+        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode})
     </insert>
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values
@@ -84,6 +88,12 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Employee">
         UPDATE employee
         <set>
+            <if test="contactAddress != null">
+                contact_address_ = #{contactAddress},
+            </if>
+            <if test="postalCode != null">
+                postal_code_ = #{postalCode},
+            </if>
             <if test="isProbationPeriod != null">
                 is_probation_period_ = #{isProbationPeriod},
             </if>

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));
+    }
 }