中间表教职工表状态是非在职或返聘的职工禁止登录学工系统

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java

@@ -152,15 +152,6 @@ public class CphSqlServerDataController extends BaseController {
         return success(list);
     }
 
-//    //同步辅导员
-//    @RequestMapping("/synchronousEmployEEInfoList")
-//    public AjaxResult synchronousEmployEEInfoList(){
-//        //startPage();
-//        List<Map> list=sqlServerDataService.getEmployEEInfoList();
-//        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
-//        iCphTeacherService.Usertb();
-//        return success();
-//    }
     //同步教职工
     @RequestMapping("/synchronousEmployEEInfoList")
     public AjaxResult synchronousEmployEEInfoList(){

srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java

@@ -31,7 +31,7 @@ public class SyncDataController extends BaseController {
     public AjaxResult synchronousEmployEEInfoList(){
         List<Map> list=syncDataService.getEmployEEInfoList();
         iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
-        //iCphTeacherService.Usertb();
+        iCphTeacherService.Usertb();
         return success();
     }
 }

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java

@@ -501,23 +501,80 @@ public class CphTeacherServiceImpl implements ICphTeacherService
         }
     }
 
+//    //同步到用户表
+//    @Override
+//    @Transactional(rollbackFor = Exception.class)
+//    public void Usertb(){
+//        //同步到user表
+//        List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工
+//        List<SysUser> sysUserList = sysUserMapper.selectUserLisrS();//所以用户
+//        List<SysUser> insertUser = new ArrayList<>();//需要添加的集合
+//        List<SysUser> updateUser = new ArrayList<>();//需要修改的集合
+//        for (CphTeacher cphTeacher:cphTeachers){
+//            int i=0;//添加标记
+//            for (SysUser sysUser:sysUserList){
+//                //修改
+//                if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){
+//                    SysUser sysUser1 = new SysUser();
+//                    sysUser1.setUserName(cphTeacher.getEmployeeId());
+//                    sysUser1.setDeptId(cphTeacher.getDeptId());
+//                    updateUser.add(sysUser1);
+//                    i=0;
+//                    break;
+//                }
+//                i=1;
+//            }
+//            //添加
+//            if (i==1){
+//                SysUser sysUser = new SysUser();
+//                sysUser.setUserName(cphTeacher.getEmployeeId());
+//                if (cphTeacher.getDeptId()!=null){
+//                    sysUser.setDeptId(cphTeacher.getDeptId());
+//                }
+//                sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1");
+//                sysUser.setNickName(cphTeacher.getName());
+//                sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#"));
+//                insertUser.add(sysUser);
+//
+//            }
+//            i=0;
+//        }
+//        if (insertUser.size()!=0){
+//            sysUserMapper.insertUserListInfo(insertUser);
+//            insertUserrole(insertUser);
+//        }
+//        if (updateUser.size()!=0) {
+//            List<List<SysUser>> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合
+//            if (listList1 != null) {
+//                for (List<SysUser> userList : listList1) {
+//                   // sysUserMapper.updateUserListInfo(userList);
+//                }
+//            }
+//        }
+//        System.out.println(insertUser.size());
+//        System.out.println(updateUser.size());
+//    }
+
     //同步到用户表
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void Usertb(){
         //同步到user表
-        List<CphTeacher> cphTeachers = cphTeacherMapper.selectTeacherList();//所有职工
+        List<QgzxTeacher> qgzxTeachers = qgzxTeacherMapper.selectTeacherList();//所有职工
         List<SysUser> sysUserList = sysUserMapper.selectUserLisrS();//所以用户
         List<SysUser> insertUser = new ArrayList<>();//需要添加的集合
         List<SysUser> updateUser = new ArrayList<>();//需要修改的集合
-        for (CphTeacher cphTeacher:cphTeachers){
+        for (QgzxTeacher qgzxTeacher:qgzxTeachers){
             int i=0;//添加标记
             for (SysUser sysUser:sysUserList){
                 //修改
-                if (Objects.equals(cphTeacher.getEmployeeId(), sysUser.getUserName())){
+                if (Objects.equals(qgzxTeacher.getEmployeeId(), sysUser.getUserName())){
                     SysUser sysUser1 = new SysUser();
-                    sysUser1.setUserName(cphTeacher.getEmployeeId());
+                    sysUser1.setUserName(qgzxTeacher.getEmployeeId());
-                    sysUser1.setDeptId(cphTeacher.getDeptId());
+                    sysUser1.setDeptId(qgzxTeacher.getDeptId());
+                    if(!qgzxTeacher.getStatus().equals("11")&&!qgzxTeacher.getStatus().equals("4")){
+                        sysUser1.setStatus("1");
+                    }
                     updateUser.add(sysUser1);
                     i=0;
                     break;
@@ -527,13 +584,16 @@ public class CphTeacherServiceImpl implements ICphTeacherService
             //添加
             if (i==1){
                 SysUser sysUser = new SysUser();
-                sysUser.setUserName(cphTeacher.getEmployeeId());
+                sysUser.setUserName(qgzxTeacher.getEmployeeId());
-                if (cphTeacher.getDeptId()!=null){
+                if (qgzxTeacher.getDeptId()!=null){
-                    sysUser.setDeptId(cphTeacher.getDeptId());
+                    sysUser.setDeptId(qgzxTeacher.getDeptId());
+                }
+                sysUser.setSex(Objects.equals(qgzxTeacher.getGender(), "男") ?"0":"1");
+                sysUser.setNickName(qgzxTeacher.getName());
+                sysUser.setPassword(SecurityUtils.encryptPassword("#A"+qgzxTeacher.getEmployeeId()+"A#"));
+                if(!qgzxTeacher.getStatus().equals("11")&&!qgzxTeacher.getStatus().equals("4")){
+                    sysUser.setStatus("1");
                 }
-                sysUser.setSex(Objects.equals(cphTeacher.getGender(), "男") ?"0":"1");
-                sysUser.setNickName(cphTeacher.getName());
-                sysUser.setPassword(SecurityUtils.encryptPassword("#A"+cphTeacher.getEmployeeId()+"A#"));
                 insertUser.add(sysUser);
 
             }
@@ -547,7 +607,7 @@ public class CphTeacherServiceImpl implements ICphTeacherService
             List<List<SysUser>> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合
             if (listList1 != null) {
                 for (List<SysUser> userList : listList1) {
-                   // sysUserMapper.updateUserListInfo(userList);
+                    sysUserMapper.updateUserListInfo(userList);
                 }
             }
         }
@@ -555,6 +615,7 @@ public class CphTeacherServiceImpl implements ICphTeacherService
         System.out.println(updateUser.size());
     }
 
+
     public void insertUserrole(List<SysUser> insertUser){
         List<SysUserRole> userRoleList=new ArrayList<>();
         for (SysUser sysUser:insertUser){

srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml

@@ -77,17 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
     <insert id="insertBatchSomeColumn" parameterType="java.util.List">
-        insert into qgzx_teacher(name,gender,age,employee_id,dept_id,status,create_time)
+        insert into qgzx_teacher(name,gender,employee_id,dept_id,status,create_time)
         values
-        <foreach item="entity" collection="list" separator="," open="(" close=")">
+        <foreach item="entity" collection="list" separator="," >
             (
-            <if test="entity.name != null and entity.name != ''">#{entity.name},</if>
+            <if test="entity.name != null and entity.name != ''">#{entity.name}</if>,
-            <if test="entity.gender != null and entity.gender != ''">#{entity.gender},</if>
+            <if test="entity.gender != null and entity.gender != ''">#{entity.gender}</if>,
-            <if test="entity.age!=null">#{entity.age},</if>
+            <if test="entity.employeeId != null and entity.employeeId != ''">#{entity.employeeId}</if>,
-            <if test="entity.employeeId != null and entity.employeeId != ''">#{entity.employeeId},</if>
+            <if test="entity.deptId !=null">#{entity.deptId}</if>,
-            <if test="entity.deptId!=null">#{entity.deptId},</if>
+            <if test="entity.status != null and entity.status != ''">#{entity.status}</if>,
-            <if test="entity.status != null and entity.status != ''">#{entity.status},</if>
+            <if test="entity.createTime !=null">#{entity.createTime}</if>
-            <if test="entity.createTime!=null">#{entity.createTime},</if>
             )
         </foreach>
     </insert>

srs-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -291,19 +291,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			nick_name,
 			sex,
 			password,
+		    status,
 			create_time
 		)
 		values
 		<foreach collection="userList" item="item" index="i" separator=",">
 			(
-			 #{item.userName},
+				 #{item.userName},
-			<if test="item.deptId != null">#{item.deptId}</if>
+				<if test="item.deptId != null">#{item.deptId}</if>
-			<if test="item.deptId == null">null</if>,
+				<if test="item.deptId == null">null</if>,
-			 #{item.nickName},
+				 #{item.nickName},
-			<if test="item.sex != null">#{item.sex}</if>
+				<if test="item.sex != null">#{item.sex}</if>
-			<if test="item.sex == null">"2"</if>,
+				<if test="item.sex == null">'2'</if>,
-			 #{item.password},
+				 #{item.password},
-			sysdate())
+				<if test="item.status != null">#{item.status}</if>
+			    <if test="item.status == null">null</if>,
+				sysdate()
+			)
 		</foreach>
 	</insert>
 	<update id="updateUserListInfo" parameterType="java.util.List">
@@ -335,6 +339,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 						when user_name=#{i.userName} then sysdate()
 				</foreach>
 			</trim>
+			<trim prefix="status=case" suffix="end,">
+				<foreach collection="studentList" item="i" index="index">
+					when user_name=#{i.userName} then #{i.status}
+				</foreach>
+			</trim>
 		</trim>
 		where user_name in
 		<foreach collection="studentList" separator="," item="i" index="index" open="(" close=")">