diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java index 6fa8f57..e93026e 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java @@ -152,21 +152,12 @@ public class CphSqlServerDataController extends BaseController { return success(list); } -// //同步辅导员 -// @RequestMapping("/synchronousEmployEEInfoList") -// public AjaxResult synchronousEmployEEInfoList(){ -// //startPage(); -// List list=sqlServerDataService.getEmployEEInfoList(); -// iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员 -// iCphTeacherService.Usertb(); -// return success(); -// } - //同步教职工 + //同步辅导员 @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ //startPage(); List list=sqlServerDataService.getEmployEEInfoList(); - iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工 + iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员 iCphTeacherService.Usertb(); return success(); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java index 2657ff3..ef06d0c 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java @@ -4,9 +4,11 @@ import com.srs.common.core.controller.BaseController; import com.srs.common.core.domain.AjaxResult; import com.srs.common.core.page.TableDataInfo; import com.srs.comprehensive.service.ICphTeacherService; +import com.srs.comprehensive.service.ISrsMajorsService; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -20,6 +22,8 @@ public class SyncDataController extends BaseController { SyncDataService syncDataService; @Autowired ICphTeacherService iCphTeacherService; + @Autowired + ISrsMajorsService iSrsMajorsService; @RequestMapping("/getEmployEEInfoList") public TableDataInfo getEmployEEInfoList(){ startPage(); @@ -30,8 +34,22 @@ public class SyncDataController extends BaseController { @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ List list=syncDataService.getEmployEEInfoList(); - iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工 - //iCphTeacherService.Usertb(); + iCphTeacherService.synchronousMYSQL(list);//同步教职工 + iCphTeacherService.UsertbNew(); + return success(); + } + //中间表专业信息 + @RequestMapping("/getSpecialtyInfoList") + public TableDataInfo getSpecialtyInfoList(String zydm){ + startPage(); + List list=syncDataService.getSpecialtyInfoList(zydm); + return getDataTable(list); + } + //同步专业 + @RequestMapping("/synchronousSpecialtyInfoList") + public AjaxResult synchronousSpecialtyInfoList(){ + List list=syncDataService.getSpecialtyALLInfo(); + iSrsMajorsService.synchronousMYSQL(list);//同步专业 return success(); } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java index 72ad3d0..d7d20c8 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java @@ -5,4 +5,6 @@ import java.util.Map; public interface SyncDataMapper { public List getEmployEEInfoList();//教职工 + public List getSpecialtyInfoList(String zydm);//专业 + public List getSpecialtyALLInfo();//所有专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java index c73a947..b1d586c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphTeacherService.java @@ -117,8 +117,10 @@ public interface ICphTeacherService public Map teacherDataSync(); void sqlserverSynchronousMYSQL(List list); + void synchronousMYSQL(List list); void Usertb(); + void UsertbNew(); void insertUserrole(List insertUser); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java index 8d157c8..a552610 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsMajorsService.java @@ -68,6 +68,7 @@ public interface ISrsMajorsService public Map dataSync(); void sqlserverSynchronousMYSQL(List list); + void synchronousMYSQL(List list); //根据专业名称获取专业id public Long getMajorIdByName(String name); //获取学生的专业名称 diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java index a128842..3a433bf 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java @@ -5,4 +5,6 @@ import java.util.Map; public interface SyncDataService { List getEmployEEInfoList();//教职工 + List getSpecialtyInfoList(String zydm);//专业 + List getSpecialtyALLInfo();//所有专业 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java index 334f9cb..80c6286 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphTeacherServiceImpl.java @@ -354,116 +354,116 @@ public class CphTeacherServiceImpl implements ICphTeacherService } //同步辅导员 -// @Override -// @Transactional(rollbackFor = Exception.class) -// public void sqlserverSynchronousMYSQL(List list) { -// //辅导员列表 -// List cphTeachers = cphTeacherMapper.selectTeacherList(); -// //查找重复值 -// List updateMap = list.stream() -// .filter(obj1 -> cphTeachers -// .stream().anyMatch(obj2 -> { -// Object xhObj = obj1.get("zgh"); -// if (xhObj != null) { -// String zgh = xhObj.toString(); -// return obj2.getEmployeeId().equals(zgh); -// } -// return false; -// })) -// .collect(Collectors.toList()); -// -// //添加需要 -// List kshList2 = cphTeachers.stream() -// .map(CphTeacher::getEmployeeId) -// .collect(Collectors.toList()); -// -// List insertMap = list.stream() -// .filter(obj -> { -// Object xhObj = obj.get("zgh"); -// return xhObj != null && !kshList2.contains(xhObj.toString()); -// }) -// .collect(Collectors.toList()); -// //添加 -// List insertStudentList = new ArrayList<>(); -// for (Map map:insertMap){ -// CphTeacher cphTeacher = new CphTeacher(); -// Object xmObj = map.get("xm"); -// if (xmObj != null) { -// cphTeacher.setName(xmObj.toString()); -// } -// Object xbObj = map.get("xb"); -// if (xbObj != null) { -// String s = xbObj.toString(); -// if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { -// cphTeacher.setGender(xbObj.toString()); -// } -// } -// Object zghObj = map.get("zgh"); -// if (zghObj != null) { -// cphTeacher.setEmployeeId(zghObj.toString()); -// } -// //学院id -// Object yxdmObj = map.get("yxdm"); -// if (yxdmObj!=null) { -// Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); -// if (deptId != null) { -// cphTeacher.setDeptId(deptId); -// } -// } -// cphTeacher.setStatus("1"); -// cphTeacher.setCreateTime(DateUtils.getNowDate()); -// insertStudentList.add(cphTeacher); -// } -// if (insertStudentList.size()!=0) { -// cphTeacherMapper.insertBatchSomeColumn(insertStudentList); -// } -// //修改 -// List updateSrsStudent = new ArrayList<>(); -// for (Map map:updateMap){ -// CphTeacher cphTeacher = new CphTeacher(); -// Object xmObj = map.get("xm"); -// if (xmObj != null) { -// cphTeacher.setName(xmObj.toString()); -// } -// Object xbObj = map.get("xb"); -// if (xbObj != null) { -// String s = xbObj.toString(); -// if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { -// cphTeacher.setGender(xbObj.toString()); -// } -// } -// Object zghObj = map.get("zgh"); -// if (zghObj != null) { -// cphTeacher.setEmployeeId(zghObj.toString()); -// } -// //学院id -// Object yxdmObj = map.get("yxdm"); -// if (yxdmObj!=null) { -// Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); -// if (ksh != null) { -// cphTeacher.setDeptId(ksh); -// } -// } -// cphTeacher.setUpdateTime(DateUtils.getNowDate()); -// updateSrsStudent.add(cphTeacher); -// } -// /*if (updateSrsStudent.size()!=0) { -// List> lists = ListSliceUtil.updateSlice(updateSrsStudent); -// if (lists != null) { -// for (List studentList : lists) { -// cphTeacherMapper.updateSrsClassList(studentList); -// } -// } -// }*/ -// -// -// -// } + @Override + @Transactional(rollbackFor = Exception.class) + public void sqlserverSynchronousMYSQL(List list) { + //辅导员列表 + List cphTeachers = cphTeacherMapper.selectTeacherList(); + //查找重复值 + List updateMap = list.stream() + .filter(obj1 -> cphTeachers + .stream().anyMatch(obj2 -> { + Object xhObj = obj1.get("zgh"); + if (xhObj != null) { + String zgh = xhObj.toString(); + return obj2.getEmployeeId().equals(zgh); + } + return false; + })) + .collect(Collectors.toList()); + + //添加需要 + List kshList2 = cphTeachers.stream() + .map(CphTeacher::getEmployeeId) + .collect(Collectors.toList()); + + List insertMap = list.stream() + .filter(obj -> { + Object xhObj = obj.get("zgh"); + return xhObj != null && !kshList2.contains(xhObj.toString()); + }) + .collect(Collectors.toList()); + //添加 + List insertStudentList = new ArrayList<>(); + for (Map map:insertMap){ + CphTeacher cphTeacher = new CphTeacher(); + Object xmObj = map.get("xm"); + if (xmObj != null) { + cphTeacher.setName(xmObj.toString()); + } + Object xbObj = map.get("xb"); + if (xbObj != null) { + String s = xbObj.toString(); + if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { + cphTeacher.setGender(xbObj.toString()); + } + } + Object zghObj = map.get("zgh"); + if (zghObj != null) { + cphTeacher.setEmployeeId(zghObj.toString()); + } + //学院id + Object yxdmObj = map.get("yxdm"); + if (yxdmObj!=null) { + Long deptId = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); + if (deptId != null) { + cphTeacher.setDeptId(deptId); + } + } + cphTeacher.setStatus("1"); + cphTeacher.setCreateTime(DateUtils.getNowDate()); + insertStudentList.add(cphTeacher); + } + if (insertStudentList.size()!=0) { + cphTeacherMapper.insertBatchSomeColumn(insertStudentList); + } + //修改 + List updateSrsStudent = new ArrayList<>(); + for (Map map:updateMap){ + CphTeacher cphTeacher = new CphTeacher(); + Object xmObj = map.get("xm"); + if (xmObj != null) { + cphTeacher.setName(xmObj.toString()); + } + Object xbObj = map.get("xb"); + if (xbObj != null) { + String s = xbObj.toString(); + if (!Objects.equals(s, "NULL") && !Objects.equals(s, "null")&&!Objects.equals(s," ")) { + cphTeacher.setGender(xbObj.toString()); + } + } + Object zghObj = map.get("zgh"); + if (zghObj != null) { + cphTeacher.setEmployeeId(zghObj.toString()); + } + //学院id + Object yxdmObj = map.get("yxdm"); + if (yxdmObj!=null) { + Long ksh = cphTeacherMapper.selectDeptCode(yxdmObj.toString()); + if (ksh != null) { + cphTeacher.setDeptId(ksh); + } + } + cphTeacher.setUpdateTime(DateUtils.getNowDate()); + updateSrsStudent.add(cphTeacher); + } + /*if (updateSrsStudent.size()!=0) { + List> lists = ListSliceUtil.updateSlice(updateSrsStudent); + if (lists != null) { + for (List studentList : lists) { + cphTeacherMapper.updateSrsClassList(studentList); + } + } + }*/ + + + + } //同步教职工表 @Override @Transactional(rollbackFor = Exception.class) - public void sqlserverSynchronousMYSQL(List list) { + public void synchronousMYSQL(List list) { List insertTeacherList = new ArrayList<>();//添加集合 List updateTeacherList = new ArrayList<>();//修改集合 for (Map map : list) { @@ -555,6 +555,77 @@ public class CphTeacherServiceImpl implements ICphTeacherService System.out.println(updateUser.size()); } + //同步到用户表 + @Override + @Transactional(rollbackFor = Exception.class) + public void UsertbNew(){ + //同步到user表 + List qgzxTeachers = qgzxTeacherMapper.selectTeacherList();//所有职工 + List sysUserList = sysUserMapper.selectUserLisrS();//所以用户 + List insertUser = new ArrayList<>();//需要添加的集合 + List updateUser = new ArrayList<>();//需要修改的集合 + for (QgzxTeacher qgzxTeacher:qgzxTeachers){ + int i=0;//添加标记 + for (SysUser sysUser:sysUserList){ + //修改 + if (Objects.equals(qgzxTeacher.getEmployeeId(), sysUser.getUserName())){ + SysUser sysUser1 = new SysUser(); + sysUser1.setUserName(qgzxTeacher.getEmployeeId()); + sysUser1.setDeptId(qgzxTeacher.getDeptId()); + if(qgzxTeacher.getStatus().equals("11")){ + sysUser1.setStatus("0"); + } + else if (qgzxTeacher.getStatus().equals("4")){ + sysUser1.setStatus("0"); + }else { + sysUser1.setStatus("1"); + } + updateUser.add(sysUser1); + i=0; + break; + } + i=1; + } + //添加 + if (i==1){ + SysUser sysUser = new SysUser(); + sysUser.setUserName(qgzxTeacher.getEmployeeId()); + if (qgzxTeacher.getDeptId()!=null){ + 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")){ + sysUser.setStatus("0"); + } + else if (qgzxTeacher.getStatus().equals("4")){ + sysUser.setStatus("0"); + }else { + sysUser.setStatus("1"); + } + insertUser.add(sysUser); + + } + i=0; + } + if (insertUser.size()!=0){ + sysUserMapper.insertUserListInfo(insertUser); + insertUserroleNew(insertUser); + } + if (updateUser.size()!=0) { + List> listList1 = ListSliceUtil.updateSlice(updateUser);//切割修改集合 + if (listList1 != null) { + for (List userList : listList1) { + sysUserMapper.updateUserListInfo(userList); + } + } + } + System.out.println(insertUser.size()); + System.out.println(updateUser.size()); + } + + public void insertUserrole(List insertUser){ List userRoleList=new ArrayList<>(); for (SysUser sysUser:insertUser){ @@ -565,6 +636,16 @@ public class CphTeacherServiceImpl implements ICphTeacherService } sysUserRoleMapper.batchUserRole(userRoleList); } + public void insertUserroleNew(List insertUser){ + List userRoleList=new ArrayList<>(); + for (SysUser sysUser:insertUser){ + SysUserRole sysRole = new SysUserRole(); + sysRole.setUserId(sysUser.getUserId()); + sysRole.setRoleId(124L);//统一设为教职工角色 + userRoleList.add(sysRole); + } + sysUserRoleMapper.batchUserRole(userRoleList); + } @Override public List> exportSXZZ(CphExport param) { diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java index 81ae353..de8de9c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsMajorsServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.srs.comprehensive.domain.SrsMajors; import com.srs.comprehensive.service.ISrsMajorsService; +import org.springframework.transaction.annotation.Transactional; /** * 【请填写功能名称】Service业务层处理 @@ -251,4 +252,98 @@ public class SrsMajorsServiceImpl implements ISrsMajorsService } } + //同步专业 + @Override + public void synchronousMYSQL(List list) { + List srsMajors = srsMajorsMapper.selectSrsmajorsList();//数据库存在的专业列表 + //查找重复值 + List updateMap = list.stream() + .filter(obj1 -> srsMajors + .stream().anyMatch(obj2 -> { + Object xhObj = obj1.get("zydm"); + if (xhObj != null) { + String xh = xhObj.toString(); + return obj2.getMajorCode().equals(xh); + } + return false; + })) + .collect(Collectors.toList()); + + //添加需要 + List kshList2 = srsMajors.stream() + .map(SrsMajors::getMajorCode) + .collect(Collectors.toList()); + + List insertMap = list.stream() + .filter(obj -> { + Object xhObj = obj.get("zydm"); + return xhObj != null && !kshList2.contains(xhObj.toString()); + }) + .collect(Collectors.toList()); + //添加 + List insertStudentList = new ArrayList<>(); + for (Map map:insertMap){ + SrsMajors srsMajors1 = new SrsMajors(); + Object zydmobj=map.get("zydm"); + if (zydmobj!=null) { + srsMajors1.setMajorCode(zydmobj.toString()); + } + Object zymcobj=map.get("zymc"); + if (zymcobj!=null) { + srsMajors1.setMajorName(zymcobj.toString()); + } + srsMajors1.setStatus("0"); + + if (map.get("yxmc")!=null) { + //使用代码查询学院id + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); + if (yxdm != null) { + srsMajors1.setCollegeId(yxdm);//学院id + } else { + srsMajors1.setCollegeId(0L); + } + }else { + srsMajors1.setCollegeId(0L); + } + srsMajors1.setCreateTime(DateUtils.getNowDate()); + insertStudentList.add(srsMajors1); + } + + //修改 + List updateSrsStudent = new ArrayList<>(); + for (Map map:updateMap){ + SrsMajors srsMajors1 = new SrsMajors(); + Object zydmobj=map.get("zydm"); + if (zydmobj!=null) { + srsMajors1.setMajorCode(zydmobj.toString()); + } + Object zymcobj=map.get("zymc"); + if (zymcobj!=null) { + srsMajors1.setMajorName(zymcobj.toString()); + } + if (map.get("yxmc")!=null) { + //使用代码查询学院id + Long yxdm = srsMajorsMapper.selectOldDeptIdByDeptName(map.get("yxmc").toString()); + if (yxdm != null) { + srsMajors1.setCollegeId(yxdm);//学院id + } else { + srsMajors1.setCollegeId(0L); + } + }else { + srsMajors1.setCollegeId(0L); + } + srsMajors1.setUpdateTime(DateUtils.getNowDate()); + updateSrsStudent.add(srsMajors1); + } + if (insertStudentList.size()!=0) { + srsMajorsMapper.insertBatchSomeColumn(insertStudentList); + } + List> lists = ListSliceUtil.updateSlice(updateSrsStudent); + if (lists != null) { + for (List studentList : lists) { + srsMajorsMapper.updateSrsStudentList(studentList); + } + } + } + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java index 13b6fdb..fce4a0a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java @@ -1,5 +1,7 @@ package com.srs.comprehensive.service.impl; +import com.srs.common.annotation.DataSource; +import com.srs.common.enums.DataSourceType; import com.srs.comprehensive.mapper.SyncDataMapper; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,4 +18,13 @@ public class SyncDataServiceImpl implements SyncDataService { public List getEmployEEInfoList() { return syncDataMapper.getEmployEEInfoList(); } + @Override + public List getSpecialtyInfoList(String zydm) { + return syncDataMapper.getSpecialtyInfoList(zydm); + } + @Override + public List getSpecialtyALLInfo(){ + return syncDataMapper.getSpecialtyALLInfo(); + } + } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index 9980122..64205f1 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -11,4 +11,15 @@ END as xb,TBD.BMMC as ksmc,TBD.BMMC as yxmc,TBD.BMBH as ksh,TBA.ZGDQZTDM as zgzt from from_gxsdxyxxzx_teacher TBA LEFT JOIN from_gxsdxyxxzx_xzbm TBD ON TBA.SZBMBH=TBD.BMBH WHERE TBA.ZGLBDM LIKE '1%' + + diff --git a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml index 0a82f50..ee2daa6 100644 --- a/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml +++ b/srs-system/src/main/resources/mapper/system/QgzxTeacherMapper.xml @@ -77,17 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + ( - #{entity.name}, - #{entity.gender}, - #{entity.age}, - #{entity.employeeId}, - #{entity.deptId}, - #{entity.status}, - #{entity.createTime}, + #{entity.name}, + #{entity.gender}, + #{entity.employeeId}, + #{entity.deptId}, + #{entity.status}, + #{entity.createTime} ) diff --git a/srs-system/src/main/resources/mapper/system/SysUserMapper.xml b/srs-system/src/main/resources/mapper/system/SysUserMapper.xml index cd9c5cc..2b756be 100644 --- a/srs-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/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 ( - #{item.userName}, - #{item.deptId} - null, - #{item.nickName}, - #{item.sex} - "2", - #{item.password}, - sysdate()) + #{item.userName}, + #{item.deptId} + null, + #{item.nickName}, + #{item.sex} + '2', + #{item.password}, + #{item.status} + null, + sysdate() + ) @@ -335,6 +339,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" when user_name=#{i.userName} then sysdate() + + + when user_name=#{i.userName} then #{i.status} + + where user_name in