|
@@ -23,11 +23,19 @@ import com.xjrsoft.common.utils.RedisUtil;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.config.CommonPropertiesConfig;
|
|
import com.xjrsoft.config.CommonPropertiesConfig;
|
|
|
import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
import com.xjrsoft.module.hikvision.util.DataUtil;
|
|
|
-import com.xjrsoft.module.liteflow.node.WfTeacherDepartNode;
|
|
|
|
|
-import com.xjrsoft.module.organization.entity.*;
|
|
|
|
|
|
|
+import com.xjrsoft.module.organization.entity.Department;
|
|
|
|
|
+import com.xjrsoft.module.organization.entity.Post;
|
|
|
|
|
+import com.xjrsoft.module.organization.entity.User;
|
|
|
|
|
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
|
|
|
|
|
+import com.xjrsoft.module.organization.entity.UserPostRelation;
|
|
|
|
|
+import com.xjrsoft.module.organization.entity.UserRoleRelation;
|
|
|
import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
|
|
import com.xjrsoft.module.organization.mapper.UserDeptRelationMapper;
|
|
|
import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
|
|
import com.xjrsoft.module.organization.mapper.UserRoleRelationMapper;
|
|
|
-import com.xjrsoft.module.organization.service.*;
|
|
|
|
|
|
|
+import com.xjrsoft.module.organization.service.IDepartmentService;
|
|
|
|
|
+import com.xjrsoft.module.organization.service.IPostService;
|
|
|
|
|
+import com.xjrsoft.module.organization.service.IUserDeptRelationService;
|
|
|
|
|
+import com.xjrsoft.module.organization.service.IUserPostRelationService;
|
|
|
|
|
+import com.xjrsoft.module.organization.service.IUserService;
|
|
|
import com.xjrsoft.module.personnel.entity.CarMessageApply;
|
|
import com.xjrsoft.module.personnel.entity.CarMessageApply;
|
|
|
import com.xjrsoft.module.personnel.mapper.CarMessageApplyMapper;
|
|
import com.xjrsoft.module.personnel.mapper.CarMessageApplyMapper;
|
|
|
import com.xjrsoft.module.personnel.service.ITeacherFaceProcessService;
|
|
import com.xjrsoft.module.personnel.service.ITeacherFaceProcessService;
|
|
@@ -36,11 +44,27 @@ import com.xjrsoft.module.system.entity.DictionaryItem;
|
|
|
import com.xjrsoft.module.system.service.IDictionarydetailService;
|
|
import com.xjrsoft.module.system.service.IDictionarydetailService;
|
|
|
import com.xjrsoft.module.teacher.dto.AddXjrUserDto;
|
|
import com.xjrsoft.module.teacher.dto.AddXjrUserDto;
|
|
|
import com.xjrsoft.module.teacher.dto.UpdateXjrUserDto;
|
|
import com.xjrsoft.module.teacher.dto.UpdateXjrUserDto;
|
|
|
-import com.xjrsoft.module.teacher.entity.*;
|
|
|
|
|
-import com.xjrsoft.module.teacher.mapper.*;
|
|
|
|
|
-import com.xjrsoft.module.teacher.service.IBaseTeacherChangeRecordService;
|
|
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherChangeRecord;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherContact;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherEducation;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherEmploy;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherFamily;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherFamilyMember;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.BaseTeacherRegular;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.WfTeacherDepart;
|
|
|
|
|
+import com.xjrsoft.module.teacher.entity.XjrUser;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherChangeRecordMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherContactMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherEducationMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherEmployMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherFamilyMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherFamilyMemberMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.BaseTeacherRegularMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.WfTeacherDepartMapper;
|
|
|
|
|
+import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
|
|
|
import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
|
|
import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
|
|
|
-import com.xjrsoft.module.textbook.entity.WfTextbookRecede;
|
|
|
|
|
import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
|
|
import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
|
|
|
import com.xjrsoft.module.workflow.mapper.WorkflowFormRelationMapper;
|
|
import com.xjrsoft.module.workflow.mapper.WorkflowFormRelationMapper;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
@@ -52,7 +76,12 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.Arrays;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
+import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|