Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0810

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

@@ -4565,12 +4565,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                                         }
                                         salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(aLong + "");
                                     } else if (courseSchedule.getType() == CourseScheduleType.HIGH) {
-                                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
-                                        if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
-                                            throw new BizException("请设置老师课酬");
-                                        }
-                                        salary = JSON.parseObject(teacherDefaultMusicGroupSalaryHigh.getSalaryRuleJson()).getBigDecimal(aLong + "");
-                                        /*MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
+//                                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
+//                                        if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
+//                                            throw new BizException("请设置老师课酬");
+//                                        }
+//                                        salary = JSON.parseObject(teacherDefaultMusicGroupSalaryHigh.getSalaryRuleJson()).getBigDecimal(aLong + "");
+                                        MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                                         TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
                                         if (Objects.isNull(teacherDefaultMusicGroupSalaryHigh)) {
                                             throw new BizException("请设置老师课酬");
@@ -4582,7 +4582,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                                         if (Objects.isNull(salary)) {
                                             throw new BizException("请设置老师课酬");
                                         }
-                                        salary = salary.multiply(new BigDecimal(aLong));*/
+                                        salary = salary.multiply(new BigDecimal(aLong));
                                     }
                                     if (Objects.isNull(salary)) {
                                         throw new BizException("请设置老师课酬");

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -37,9 +38,14 @@ public class OaServiceImpl implements OaUserService {
 				oaUser.setSex(employee.getGender().toString());
 			}
 			oaUser.setDeptId(employee.getDeptId());
-			oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
+            	oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+            }
 			oaUser.setAvatar(employee.getAvatar());
-			oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
+            	oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+            }
 			if (oaUser.getPostDeptIds() != null) {
 				List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
 				oaUser.setPostIds(postIds);
@@ -55,9 +61,15 @@ public class OaServiceImpl implements OaUserService {
 				oaUser.setSex(employee.getGender().toString());
 			}
 			oaUser.setDeptId(employee.getDeptId());
-			oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
+            	oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+            }
 			oaUser.setAvatar(employee.getAvatar());
-			oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
+            	oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+            }
 			if (oaUser.getPostDeptIds() != null) {
 				List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
 				oaUser.setPostIds(postIds);
@@ -83,10 +95,10 @@ public class OaServiceImpl implements OaUserService {
             if(Objects.nonNull(employee.getDeptId())){
                 oaUser.setDeptId(employee.getDeptId());
             }
-            if(Objects.nonNull(employee.getDeptIds())){
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
                 oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
             }
-            if(Objects.nonNull(employee.getPostDeptIds())){
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
                 oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
                 List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
                 oaUser.setPostIds(postIds);
@@ -104,10 +116,10 @@ public class OaServiceImpl implements OaUserService {
             if(Objects.nonNull(employee.getDeptId())){
                 oaUser.setDeptId(employee.getDeptId());
             }
-            if(Objects.nonNull(employee.getDeptIds())){
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
                 oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
             }
-            if(Objects.nonNull(employee.getPostDeptIds())){
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
                 oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
                 List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
                 oaUser.setPostIds(postIds);

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

@@ -342,7 +342,7 @@ public class StudentServeServiceImpl implements StudentServeService {
     public void exercisesSituationStatistics2(String monday, Integer tenantId) {
         LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
         
-        //统计上周的服务指标总数
+        /*//统计上周的服务指标总数
         int preWeekServiceNum = studentExtracurricularExercisesSituationDao.countWeekServiceNum(nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7).toString(), tenantId);
         
         //统计上周数据今日更新的条数
@@ -350,7 +350,7 @@ public class StudentServeServiceImpl implements StudentServeService {
         
         if(preWeekServiceNum>0 && lastWeekTodayUpdateNum<=0){
             nowDate = nowDate.plusDays(-nowDate.getDayOfWeek().getValue());
-        }
+        }*/
 
         if(StringUtils.isNotBlank(monday)){
             nowDate=LocalDate.parse(monday, DateUtil.dateFormatter);

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

@@ -118,7 +118,7 @@
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Teacher">
         SELECT t.id_,t.organ_id_ teacher_organ_id_,t.job_type_,t.job_nature_,t.is_probation_period_,t.education_background_,t.graduate_school_,t.graduate_school_,
-        t.technical_titles_,t.work_unit_,t.subject_id_,t.entry_date_,t.certificate_type_,t.certificate_num_,t.flow_organ_range_,t.update_time_,
+        t.technical_titles_,t.work_unit_,t.subject_id_,t.entry_date_,t.certificate_type_,t.certificate_num_,t.flow_organ_range_,t.update_time_,t.dept_id_,t.dept_ids_,t.post_dept_ids_,
         t.create_time_,t.introduction_,t.demission_date_,t.formal_staff_date_,t.is_support_course_schedule_rewards_rules_,t.is_support_extra_practice_lesson_,
         t.lecture_num_,t.idcard_front_img_,t.idcard_back_img_,t.idcard_hand_img_,t.memo_,
         su.real_name_,su.id_card_no_,su.password_,su.salt_,su.phone_,su.avatar_,