From 3a97be6a6b145e109de944765d2c75525e9b3202 Mon Sep 17 00:00:00 2001
From: mzh820631607 <mzh820631607@163.com>
Date: Thu, 22 Oct 2020 18:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   5 +
 .../com/msdw/tms/api/SystemSetttingApi.java   |  48 +++
 .../msdw/tms/common/utils/ConstantUtils.java  |   7 +
 .../tms/common/utils/ExcelImportHelper.java   |  94 +++++
 .../controller/SystemSettingController.java   | 119 ++++++-
 .../com/msdw/tms/dao/SystemSetttingDao.java   |  33 +-
 .../java/com/msdw/tms/dao/UserInfoDao.java    |  15 +-
 .../com/msdw/tms/entity/vo/StaffExportVo.java |  64 ++++
 .../java/com/msdw/tms/entity/vo/StaffVo.java  |  22 ++
 .../tms/service/SystemSetttingService.java    |  26 +-
 .../tms/service/impl/StudentServiceImpl.java  |   2 -
 .../impl/SystemSettingServiceImpl.java        | 326 ++++++++++++++++--
 .../员工信息导入失败模板.xlsx       | Bin 0 -> 9335 bytes
 .../员工信息导入模板.xlsx             | Bin 0 -> 9308 bytes
 src/main/resources/mapper/tms/StudentDao.xml  |   8 +-
 .../resources/mapper/tms/SystemSetting.xml    | 125 ++++++-
 src/main/resources/mapper/tms/UserInfoDao.xml |  94 ++++-
 17 files changed, 936 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/com/msdw/tms/api/SystemSetttingApi.java
 create mode 100644 src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java
 create mode 100644 src/main/resources/excel-template/员工信息导入失败模板.xlsx
 create mode 100644 src/main/resources/excel-template/员工信息导入模板.xlsx

diff --git a/pom.xml b/pom.xml
index cfc7e35..e3e712f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,6 +170,11 @@
             <artifactId>commons-lang</artifactId>
             <version>2.6</version>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.8</version>
+        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
diff --git a/src/main/java/com/msdw/tms/api/SystemSetttingApi.java b/src/main/java/com/msdw/tms/api/SystemSetttingApi.java
new file mode 100644
index 0000000..c4300d4
--- /dev/null
+++ b/src/main/java/com/msdw/tms/api/SystemSetttingApi.java
@@ -0,0 +1,48 @@
+package com.msdw.tms.api;
+
+import com.msdw.tms.common.utils.R;
+import com.msdw.tms.entity.vo.StaffVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@Api(value = "系统设置",tags = "系统设置")
+public interface SystemSetttingApi {
+
+    @ApiOperation(value = "新增员工",notes = "新增员工")
+    public R addStaff(StaffVo staffVo);
+
+    @ApiOperation(value = "员工列表",notes = "员工列表信息")
+    public R queryStaff(StaffVo staffVo);
+
+    @ApiOperation(value = "查看员工详情",notes = "查看员工详情")
+    public R querystaffDetail( Integer userId);
+
+    @ApiOperation(value = "编辑员工信息",notes = "编辑员工信息")
+    public R updateStaff( StaffVo staffVo);
+
+    @ApiOperation(value = "删除员工信息",notes = "删除员工信息")
+    public R deleteStaff(StaffVo staffVo);
+
+    @ApiOperation(value = "批量删除员工信息",notes = "批量删除员工信息")
+    public R daleteBatchStaff( List<Integer> userIds);
+
+    @ApiOperation(value = "新增部门",notes = "新增部门")
+    public R addDepartment( StaffVo staffVo);
+
+    @ApiOperation(value = "员工信息导入模板下载",notes = "员工信息导入模板下载")
+    public R downloadFiles(HttpServletResponse response) throws IOException;
+
+    @ApiOperation(value = "导入员工信息",notes = "导入员工信息")
+    public R importStaff(MultipartFile file) throws IOException;
+
+    @ApiOperation(value = "导入员工失败原因导出",notes = "导入员工失败原因导出")
+    public void exportFailureRecord(HttpServletResponse response, String token) throws Exception;
+}
diff --git a/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java b/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java
index 5fd6312..f7f9adc 100644
--- a/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java
+++ b/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java
@@ -9,6 +9,8 @@ public class ConstantUtils {
 
     //绑定角色ID
     public static final Integer STUDENT_ROLE = 4;
+
+
     public static final String STR_STUDENT_ROLE = "4";
 
     //平台id
@@ -17,6 +19,11 @@ public class ConstantUtils {
     //excel模板信息表id
     public static final int XLSX_TEMPLATE_ID = 2;
 
+
+    public static final int XLSX_TEMPLATE_ID3 = 3;
+
+
+
     //用户初始密码
     public static final String INITIAL_PASSWORD = "huoran123";
 }
diff --git a/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java b/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java
index e17d364..2897b6e 100644
--- a/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java
+++ b/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java
@@ -1,5 +1,6 @@
 package com.msdw.tms.common.utils;
 
+import com.msdw.tms.entity.vo.StaffVo;
 import com.msdw.tms.entity.vo.StudentVo;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -86,6 +87,99 @@ public class ExcelImportHelper {
 
         return list;
     }
+    /**
+     * 读取学生管理
+     * @param file
+     * @return
+     */
+    public static List<StaffVo> readStaff(MultipartFile file) {
+        List<StaffVo> list = new ArrayList<StaffVo>();
+
+        Workbook workbook=getWorkbook(file);
+        StaffVo staff = null;
+        // 循环工作表Sheet
+        for (int numSheet = 0; numSheet < workbook.getNumberOfSheets(); numSheet++) {
+            Sheet hssfSheet = workbook.getSheetAt(numSheet);
+            if (hssfSheet == null) {
+                continue;
+            }
+            // 循环行Row//开始行2
+            for (int rowNum = 2; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
+                Row row = hssfSheet.getRow(rowNum);
+
+                Cell phone;
+                Cell email;
+                if (row != null) {
+                    staff = new StaffVo();
+                    row.getCell(0).setCellType(CellType.STRING);
+                    Cell userName = row.getCell(0);
+                    row.getCell(1).setCellType(CellType.STRING);
+                    Cell account = row.getCell(1);
+                    row.getCell(2).setCellType(CellType.STRING);
+                    Cell role = row.getCell(2);
+                    row.getCell(3).setCellType(CellType.STRING);
+                    Cell workNumber = row.getCell(3);
+                    row.getCell(4).setCellType(CellType.STRING);
+                    Cell staffGradeName = row.getCell(4);
+                    row.getCell(5).setCellType(CellType.STRING);
+                    Cell staffProfessionalArchitectureName = row.getCell(5);
+                    if (row.getCell(6)!=null){
+                        row.getCell(6).setCellType(CellType.STRING);
+                        phone = row.getCell(6);
+                    }else {
+                        phone = row.createCell(6);
+                    }
+                    if (row.getCell(7)!=null){
+                        row.getCell(7).setCellType(CellType.STRING);
+                        email = row.getCell(7);
+                    }else {
+                        email = row.createCell(7);
+                    }
+
+                    row.getCell(8).setCellType(CellType.STRING);
+                    Cell schoolAppellationName = row.getCell(8);
+                    row.getCell(9).setCellType(CellType.STRING);
+                    Cell failureMsg = row.getCell(9);
+
+
+                    String roleValue = role.getStringCellValue();
+                    String str;
+                    // 角色id
+                    if (roleValue.equals("管理员")){
+                        str = "2";
+                    }else if (roleValue.equals("老师")){
+                        str = "3";
+                    }else{
+                        str = "2,3";
+                    }
+                    staff.setRoleId(str);
+                    //角色名称
+                    staff.setRole(role.getStringCellValue());
+                    // 学生姓名
+                    staff.setUserName(userName.getStringCellValue());
+                    //用户账号
+                    staff.setAccount(account.getStringCellValue());
+                    // 学生学号
+                    staff.setWorkNumber(workNumber.getStringCellValue());
+                    //专业名称
+                    staff.setStaffGradeName(staffGradeName.getStringCellValue());
+                    //组织架构名称
+                    staff.setStaffProfessionalArchitectureName(staffProfessionalArchitectureName.getStringCellValue());
+                    //电话
+                    staff.setPhone(phone.getStringCellValue());
+                    //邮箱
+                    staff.setEmail(email.getStringCellValue());
+                    //所属院校
+                    staff.setSchoolAppellationName(schoolAppellationName.getStringCellValue());
+                    //学校id
+                    staff.setSchoolId(ConstantUtils.Keda_schoolId);
+                    list.add(staff);
+                }
+            }
+
+        }
+        return list;
+    }
 
     private static  Workbook getWorkbook(MultipartFile file) {
         String fileName = file.getOriginalFilename();
diff --git a/src/main/java/com/msdw/tms/controller/SystemSettingController.java b/src/main/java/com/msdw/tms/controller/SystemSettingController.java
index 99aadbd..b574989 100644
--- a/src/main/java/com/msdw/tms/controller/SystemSettingController.java
+++ b/src/main/java/com/msdw/tms/controller/SystemSettingController.java
@@ -1,30 +1,143 @@
 package com.msdw.tms.controller;
 
+import com.msdw.tms.api.SystemSetttingApi;
+import com.msdw.tms.common.utils.ConstantUtils;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.vo.StaffVo;
 import com.msdw.tms.service.SystemSetttingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 系统设置
  */
 @RestController
 @RequestMapping("/tms/system")
-public class SystemSettingController {
+public class SystemSettingController implements SystemSetttingApi {
     @Autowired
     private SystemSetttingService systemSetttingService;
 
+    /**
+     * 新增员工
+     * @param staffVo
+     * @return
+     */
+    @Override
     @PostMapping("/addStaff")
     public R addStaff(@RequestBody StaffVo staffVo){
-        systemSetttingService.addStaff(staffVo);
-        return R.ok();
+        R r = systemSetttingService.addStaff(staffVo);
+        return r;
     }
 
+    /**
+     * 员工列表
+     * @param staffVo
+     * @return
+     */
+    @Override
     @PostMapping("/queryStaff")
     public R queryStaff(@RequestBody StaffVo staffVo){
         PageUtils query = systemSetttingService.queryStaff(staffVo);
         return R.ok().put("data",query);
     }
+
+    /**
+     * 查看用户详情
+     * @param userId
+     * @return
+     */
+    @Override
+    @GetMapping("/querystaffDetail")
+    public R querystaffDetail(@RequestParam Integer userId){
+        HashMap<String, Object> map = systemSetttingService.querystaffDetail(userId);
+        return R.ok().put("data",map);
+    }
+
+    /**
+     * 编辑员工信息
+     * @param staffVo
+     * @return
+     */
+    @Override
+    @PutMapping("/updateStaff")
+    public R updateStaff(@RequestBody StaffVo staffVo){
+        R r = systemSetttingService.updateStaff(staffVo);
+        return r;
+    }
+
+    /**
+     * 删除员工信息
+     * @param staffVo
+     * @return
+     */
+    @Override
+    @PostMapping("/deleteStaff")
+    public R deleteStaff(@RequestBody StaffVo staffVo){
+
+        systemSetttingService.deleteStaff(staffVo.getUserId());
+        return R.ok();
+    }
+
+    /**
+     * 批量删除员工信息
+     * @return
+     */
+    @Override
+    @PostMapping("/daleteBatchStaff")
+    public R daleteBatchStaff(@RequestBody List<Integer> userIds){
+        systemSetttingService.daleteBatchStaff(userIds);
+        return R.ok();
+    }
+
+    /**
+     * 新增部门
+     */
+    @Override
+    @PostMapping("/addDepartment")
+    public R addDepartment(@RequestBody StaffVo staffVo){
+        HashMap<String, Object> map =  systemSetttingService.addDepartment(staffVo);
+        return R.ok().put("data",map);
+    }
+
+    /**
+     * excel模板文件下载
+     */
+    @Override
+    @GetMapping("/download")
+    public R downloadFiles(HttpServletResponse response) throws IOException {
+        systemSetttingService.downloadFiles(response);
+        return R.ok();
+    }
+
+    /**
+     * 批量导入员工信息
+     * @param file
+     * @return
+     */
+    @Override
+    @PostMapping("/uploadFile")
+    public R importStaff(MultipartFile file) throws IOException{
+        Map<String,String> upload = systemSetttingService.upload(file);
+        return R.ok().put("data",upload);
+    }
+
+    /**
+     * 导入员工信息失败数据导出
+     * @param response
+     * @param token
+     * @throws Exception
+     */
+    @Override
+    @GetMapping("/export_failure")
+    public void exportFailureRecord(HttpServletResponse response, @RequestParam String token) throws Exception{
+        systemSetttingService.exportFailureRecord(response,token);
+    }
 }
diff --git a/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java b/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java
index c057a88..084daba 100644
--- a/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java
+++ b/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java
@@ -2,6 +2,7 @@ package com.msdw.tms.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.msdw.tms.entity.StaffEntity;
 import com.msdw.tms.entity.vo.StaffVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.poi.ss.formula.functions.T;
@@ -13,5 +14,35 @@ public interface SystemSetttingDao {
 
     boolean addStaff(StaffVo staffVo);
 
-    IPage<StaffVo> queryStaff(Page<T> tPage, String searchContent, StaffVo staffVo);
+    boolean addStaffN(StaffEntity staffEntity);
+
+    IPage<StaffVo> queryStaff(Page<T> tPage, String searchContent, Integer schoolId,String staffGradeIds,String staffProfessionalArchitectureIds);
+
+    StaffVo querystaffDetail(Integer userId,Integer schoolId);
+
+    boolean updateStaff(StaffEntity staffEntity);
+
+    boolean deleteStaffInfo(Integer userId);
+
+    boolean deleteStaff(Integer userId);
+
+    Integer queryGrade(StaffVo staffVo);
+
+    Integer queryDepartment(StaffVo staffVo);
+
+    boolean addDepartment(StaffVo staffVo);
+
+    boolean addStaffGrade(StaffVo staffVo);
+
+    boolean daleteBatchStaff(List<Integer> userId);
+
+    List<Integer> queryWorkNumber(String workNumber);
+
+    List<StaffVo> queryStaffInfo(Integer userId);
+
+    boolean addStaff(StaffEntity staffEntity,Integer userId);
+
+    boolean deleteStaffOnly(Integer userId);
+
+    boolean updateStaffOnly(StaffVo staffVo);
 }
diff --git a/src/main/java/com/msdw/tms/dao/UserInfoDao.java b/src/main/java/com/msdw/tms/dao/UserInfoDao.java
index 8fece8a..3de1095 100644
--- a/src/main/java/com/msdw/tms/dao/UserInfoDao.java
+++ b/src/main/java/com/msdw/tms/dao/UserInfoDao.java
@@ -3,6 +3,7 @@ package com.msdw.tms.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.msdw.tms.entity.StudentEntity;
 import com.msdw.tms.entity.UserInfoEntity;
+import com.msdw.tms.entity.vo.StaffVo;
 import com.msdw.tms.entity.vo.StudentVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -27,9 +28,19 @@ public interface UserInfoDao extends BaseMapper<UserInfoEntity> {
 
     List<StudentEntity> queryStudentPhone(String phone, Integer schoolId);
 
-    int bacthAddStudents(List<StudentVo> students);
+//    int bacthAddStudents(List<StudentVo> students);
 
     int batchSaveUserInfo(StudentVo studentVo);
 
-    Integer addUserinfo(UserInfoEntity userInfo);
+    Integer addUserinfo(StaffVo staffVo);
+
+    boolean updateUserInfo(StaffVo staffVo);
+
+    List<Integer> queryPhone(String phone);
+
+    List<String> queryAccount(String account);
+
+    boolean setNUM(Integer userId);
+
+    List<StaffVo> queryUserInfo(StaffVo staffVo);
 }
diff --git a/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java b/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java
new file mode 100644
index 0000000..4f364e4
--- /dev/null
+++ b/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java
@@ -0,0 +1,64 @@
+package com.msdw.tms.entity.vo;
+
+import com.msdw.tms.common.utils.poi.ExcelAttribute;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class StaffExportVo {
+
+    //序列号
+    private Long index;
+
+    //姓名
+    @ExcelAttribute(sort = 0)
+    private String userName;
+
+    //账号
+    @ExcelAttribute(sort = 1)
+    private String account;
+
+    //角色
+    @ExcelAttribute(sort = 2)
+    private String role;
+
+    //工号
+    @ExcelAttribute(sort = 3)
+    private String workNumber;
+
+    //管理员专业名称
+    @ExcelAttribute(sort = 4)
+    private String staffGradeName;
+
+    //管理员组织架构名称
+    @ExcelAttribute(sort = 5)
+    private String staffProfessionalArchitectureName;
+
+    //老师专业组织名称
+    @ExcelAttribute(sort = 6)
+    private String staffGradeNameTwo;
+
+    //老师组织架构名称
+    @ExcelAttribute(sort = 7)
+    private String staffProfessionalArchitectureNameTwo;
+
+    //手机号码
+    @ExcelAttribute(sort = 8)
+    private String phone;
+
+    //邮箱
+    @ExcelAttribute(sort = 9)
+    private String email;
+
+    //所属院校
+    @ExcelAttribute(sort = 10)
+    private String schoolAppellationName;
+
+    //失败原因
+    @ExcelAttribute(sort = 11)
+    private String failureMsg;
+
+
+
+}
diff --git a/src/main/java/com/msdw/tms/entity/vo/StaffVo.java b/src/main/java/com/msdw/tms/entity/vo/StaffVo.java
index 3ab5a0b..e9f58e5 100644
--- a/src/main/java/com/msdw/tms/entity/vo/StaffVo.java
+++ b/src/main/java/com/msdw/tms/entity/vo/StaffVo.java
@@ -1,9 +1,12 @@
 package com.msdw.tms.entity.vo;
 
+import com.msdw.tms.entity.StaffEntity;
 import com.msdw.tms.entity.UserInfoEntity;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 员工管理
  */
@@ -26,6 +29,8 @@ public class StaffVo extends UserInfoEntity {
     private String staffProfessionalArchitectureName;
     //绑定平台
     private Integer platformId;
+    //绑定员工角色id
+    private Integer staffRoleId;
 
 //----------------------------------分页
     //第几页
@@ -35,6 +40,23 @@ public class StaffVo extends UserInfoEntity {
     //搜索内容
     private String searchContent;
 
+//----------------------------------
+    //所属院校
+    private String schoolAppellationName;
+
+    //角色
+    private String role;
+
+    //多个组织架构id
+    private String staffProfessionalArchitectureIds;
+    //多个年纪id
+    private String staffGradeIds;
+
+    private List<StaffEntity> staff;
+
+
+//----------------------------------部门
+
 //----------------------------------员工年级staff_grade
     //员工年级表主键id
 //    private Integer staffGradeId;
diff --git a/src/main/java/com/msdw/tms/service/SystemSetttingService.java b/src/main/java/com/msdw/tms/service/SystemSetttingService.java
index 3199b68..67d3f2d 100644
--- a/src/main/java/com/msdw/tms/service/SystemSetttingService.java
+++ b/src/main/java/com/msdw/tms/service/SystemSetttingService.java
@@ -1,11 +1,35 @@
 package com.msdw.tms.service;
 
 import com.msdw.tms.common.utils.PageUtils;
+import com.msdw.tms.common.utils.R;
 import com.msdw.tms.entity.vo.StaffVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface SystemSetttingService {
 
-    boolean addStaff(StaffVo staffVo);
+    R addStaff(StaffVo staffVo);
 
     PageUtils queryStaff(StaffVo staffVo);
+
+    HashMap<String, Object> querystaffDetail(Integer userId);
+
+    R updateStaff(StaffVo staffVo);
+
+    boolean deleteStaff(Integer userId);
+
+    HashMap<String, Object> addDepartment(StaffVo staffVo);
+
+    boolean daleteBatchStaff(List<Integer> userIds);
+
+    Map<String, String> upload(MultipartFile file) throws IOException;
+
+    void exportFailureRecord(HttpServletResponse response, String token) throws Exception;
+
+    void downloadFiles(HttpServletResponse response)  throws IOException;
 }
diff --git a/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java
index 930378f..9526a47 100644
--- a/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/StudentServiceImpl.java
@@ -165,9 +165,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao,StudentEntity> im
                         vo.setIndex(ii).setUserName(student.getUserName()).setSchoolAppellationName(student.getSchoolAppellationName())
                                 .setAccount(student.getAccount()).setWorkNumber(student.getWorkNumber()).setPhone(student.getPhone()+" (重复的号码)").setEmail(student.getEmail())
                         ;
-//                                .setFailureMsg("重复的号码");
                         failVo1.add(vo);
-//                        map.put("被占用电话号码序列："+System.currentTimeMillis(),"电话号码："+phone);
                         students.remove(i);
                         i--;
                         continue;
diff --git a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java
index f3a2556..14fef27 100644
--- a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java
@@ -1,23 +1,39 @@
 package com.msdw.tms.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.msdw.tms.common.utils.Constant;
-import com.msdw.tms.common.utils.ConstantUtils;
-import com.msdw.tms.common.utils.PageUtils;
+import com.msdw.tms.common.exception.ExceptionCast;
+import com.msdw.tms.common.utils.*;
+import com.msdw.tms.common.utils.poi.ExcelExportUtil;
 import com.msdw.tms.dao.SystemSetttingDao;
 import com.msdw.tms.dao.UserInfoDao;
-import com.msdw.tms.entity.UserInfoEntity;
+import com.msdw.tms.entity.StaffEntity;
+import com.msdw.tms.entity.XlsxTemplateEntity;
+import com.msdw.tms.entity.response.CommonCode;
+import com.msdw.tms.entity.vo.StaffExportVo;
 import com.msdw.tms.entity.vo.StaffVo;
-import com.msdw.tms.entity.vo.StudentVo;
+import com.msdw.tms.entity.vo.StudentImportFailureVo;
+import com.msdw.tms.service.AliyunOssService;
 import com.msdw.tms.service.SystemSetttingService;
+import com.msdw.tms.service.XlsxTemplateService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.util.HashMap;
-import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @Service("systemSetttingService")
 public class SystemSettingServiceImpl implements SystemSetttingService {
@@ -28,28 +44,298 @@ public class SystemSettingServiceImpl implements SystemSetttingService {
     @Autowired
     private UserInfoDao userInfoDao;
 
+    @Resource
+    XlsxTemplateService xlsxTemplateService;
+
+    @Resource
+    AliyunOssService ossService;
+
+    @Resource
+    StringRedisTemplate stringRedisTemplate;
+
     @Override
     @Transactional
-    public boolean addStaff(StaffVo staffVo) {
-//        UserInfoEntity userInfo = new UserInfoEntity();
-        staffVo.setPlatformId(ConstantUtils.PLATFORMID).setUniqueIdentificationAccount(String.valueOf(System.currentTimeMillis())).setIsdel(Constant.IsDel.NOT_DEL.getType())
-                .setSchoolId(ConstantUtils.Keda_schoolId);
-        Integer userId =  userInfoDao.addUserinfo(staffVo);
-        boolean result = systemSetttingDao.addStaff(staffVo);
-        if (!result){
-            throw new RuntimeException();
+    public R addStaff(StaffVo staffVo) {
+        staffVo.setUniqueIdentificationAccount(String.valueOf(System.currentTimeMillis())).setIsdel(Constant.IsDel.NOT_DEL.getType()).setPassword(ConstantUtils.INITIAL_PASSWORD);
+        String account = staffVo.getAccount();
+        String phone = staffVo.getPhone();
+        String workNumber = staffVo.getWorkNumber();
+        List<StaffEntity> staff = staffVo.getStaff();
+        if (phone!=null&&phone!=""){
+            List<Integer> resultP = userInfoDao.queryPhone(phone);
+            if (resultP.size()>0){
+                return R.error(400,"手机号不能重复");
+            }
         }
-        return result;
+        List<String> resultA = userInfoDao.queryAccount(account);
+//        List<Integer> resultW = systemSetttingDao.queryWorkNumber(workNumber);
+        if(resultA.size()>0){
+            return R.error(400,"账号不能重复");
+        }
+        Integer userId = userInfoDao.addUserinfo(staffVo);
+        for (int i=0;i<staff.size();i++){
+            List<Integer> resultW = systemSetttingDao.queryWorkNumber(workNumber);
+            if (resultW.size()>0){
+                return R.error(400,"工号不能重复"+workNumber);
+            }
+            StaffEntity entity = staff.get(i);
+            entity.setSchoolId(ConstantUtils.Keda_schoolId).setPlatformId(ConstantUtils.PLATFORMID).setUserId(staffVo.getUserId());
+            boolean result = systemSetttingDao.addStaffN(entity);
+            if (!result) {throw new RuntimeException();}
+        }
+//        String[] split = staffVo.getRoleId().split(",");
+//        for (String s : split){
+//            staffVo.setStaffRoleId(Integer.parseInt(s));
+//            boolean result = systemSetttingDao.addStaff(staffVo);
+//            if (!result) {
+//                throw new RuntimeException();
+//            }
+//        }
+        return R.ok();
     }
 
     @Override
     public PageUtils queryStaff(StaffVo staffVo) {
-        Page<T> tPage = new Page<>(staffVo.getPage(),staffVo.getSize());
-//        IPage<StudentVo> saveStudent = studentDao.queryStudent(tPage,searchContent,schoolId);
-        IPage<StaffVo> staff = systemSetttingDao.queryStaff(tPage,staffVo.getSearchContent(),staffVo);
+        Page<T> tPage = new Page<>(staffVo.getPage(), staffVo.getSize());
+        IPage<StaffVo> staff = systemSetttingDao.queryStaff(tPage, staffVo.getSearchContent(),ConstantUtils.Keda_schoolId,staffVo.getStaffGradeIds(),staffVo.getStaffProfessionalArchitectureIds());
         PageUtils pageUtils = new PageUtils(staff);
         return pageUtils;
     }
 
+    @Override
+    public HashMap<String, Object> querystaffDetail(Integer userId) {
+        HashMap<String, Object> map = new HashMap<>();
+        StaffVo result = systemSetttingDao.querystaffDetail(userId, ConstantUtils.Keda_schoolId);
+
+        List<StaffVo> staff = systemSetttingDao.queryStaffInfo(userId);
+//        result.setWorkNumber(staff.getWorkNumber()).setStaffGradeId(staff.getStaffGradeId()).setStaffGradeName(staff.getStaffGradeName())
+//                .setStaffProfessionalArchitectureId(staff.getStaffProfessionalArchitectureId()).setStaffProfessionalArchitectureName(staff.getStaffProfessionalArchitectureName());
+        map.put("userInfo",result);
+        map.put("staffInfo",staff);
+        return map;
+    }
+
+    @Override
+    @Transactional
+    public R updateStaff(StaffVo staffVo) {
+        staffVo.setPlatformId(ConstantUtils.PLATFORMID);
+        String account = staffVo.getAccount();
+        String phone = staffVo.getPhone();
+        String workNumber = staffVo.getWorkNumber();
+        List<StaffEntity> staff = staffVo.getStaff();//获取员工数据
+
+        List<String> result = userInfoDao.queryAccount(account);
+        String roleIds = result.get(0);
+        String[] splitOld = staffVo.getRoleId().split(",");
+        String[] splitNew = roleIds.split(",");
+        if (splitOld.length==splitNew.length){
+            for (int i = 0;i<=splitNew.length;i++){
+                boolean a = systemSetttingDao.updateStaff(staff.get(i));
+                if (!a){throw new RuntimeException();}
+            }
+        }else if (splitNew.length>splitOld.length){
+            boolean a = systemSetttingDao.updateStaff(staff.get(0));
+            boolean b = systemSetttingDao.addStaff(staff.get(1),staffVo.getUserId());
+            if (!a|!b){throw new RuntimeException();}
+        }else{
+            boolean a = systemSetttingDao.deleteStaffOnly(staffVo.getUserId());//删除roleId最大的数据
+            staffVo.setStaffRoleId(Integer.parseInt(staffVo.getRoleId()));
+            boolean b = systemSetttingDao.updateStaffOnly(staffVo);//修改仅剩的数据
+
+        }
+
+        userInfoDao.setNUM(staffVo.getUserId());//重置账号、手机号码为00
+//        systemSetttingDao.deleteStaffInfo(staffVo.getUserId());//
+        List<String> resultA = userInfoDao.queryAccount(account);
+        List<Integer> resultW = systemSetttingDao.queryWorkNumber(workNumber);
+        if (phone!=null&&phone!=""){
+            List<Integer> resultP = userInfoDao.queryPhone(phone);
+            if (resultP.size()>0){
+                return R.error(400,"手机号不能重复");
+            }
+        }
+        if(resultA.size()>0){
+            return R.error(400,"账号不能重复");
+        }else if (resultW.size()>0){
+            return R.error(400,"工号不能重复");
+        }
+        boolean resultUserInfo = userInfoDao.updateUserInfo(staffVo);
+//        String[] split = staffVo.getRoleId().split(",");
+//        for (String s : split){
+//            staffVo.setStaffRoleId(Integer.parseInt(s));
+//            boolean resultStaff = systemSetttingDao.addStaff(staffVo);
+//            if (!resultStaff){
+//                throw new RuntimeException();
+//            }
+//        }
+            if (!resultUserInfo) {
+                throw new RuntimeException();
+            }
+        return R.ok();
+    }
+
+    @Override
+    public boolean deleteStaff(Integer userId) {
+        boolean result = systemSetttingDao.deleteStaff(userId);
+            return result;
+    }
+
+    @Override
+    @Transactional
+    public HashMap<String, Object> addDepartment(StaffVo staffVo) {
+        HashMap<String, Object> map = new HashMap<>();
+        //查询是否存在相同的部门
+        String departmentName = staffVo.getStaffProfessionalArchitectureName();
+        String gradeName = staffVo.getStaffGradeName();
+        if (gradeName!=null|gradeName!=""){
+            Integer department = systemSetttingDao.queryGrade(staffVo);
+            if (department==0){
+                systemSetttingDao.addDepartment(staffVo);
+            }
+            map.put("已存在的部门",departmentName);
+        }else{
+            Integer department = systemSetttingDao.queryDepartment(staffVo);
+            if (department==0){
+                boolean result = systemSetttingDao.addStaffGrade(staffVo);
+                if (!result){
+                    throw new RuntimeException();
+                }
+            }
+            map.put("已存在的部门",gradeName);
+        }
+        return map;
+    }
 
-}
+    @Override
+    public boolean daleteBatchStaff(List<Integer> userIds) {
+        boolean result = systemSetttingDao.daleteBatchStaff(userIds);
+        return result;
+    }
+
+    @Override
+    public Map<String, String> upload(MultipartFile file) throws IOException {
+        HashMap<String, String> map = new HashMap<>();
+        List<StaffVo> staffs = ExcelImportHelper.readStaff(file);
+        List<StaffExportVo> failVo1 = new ArrayList<>();
+        // 参数合法性校验，只能上传.xlsx后缀的文件
+        if (StringUtils.isBlank(file.getOriginalFilename())
+                || !file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")).equals(Constant.EXCEL_SUFFIX)) {
+            ExceptionCast.cast(CommonCode.EXCEL_FILE_INVALID);
+        }
+        int size = staffs.size();
+        Long ii = 1L;
+        try {
+            for (int i = 0;i<size;i++){
+                StaffVo staffVo = staffs.get(i);
+                String phone = staffVo.getPhone();
+                String workNumber = staffVo.getWorkNumber();
+                String account = staffVo.getAccount();
+                StaffVo staff = new StaffVo();
+                staff.setSchoolId(ConstantUtils.Keda_schoolId);//设定科大学校id
+                String schoolAppellationName = staffVo.getSchoolAppellationName();
+                List<Integer> resultW = systemSetttingDao.queryWorkNumber(workNumber);
+                List<String> resultA = userInfoDao.queryAccount(account);
+                List<StaffVo> resultU = userInfoDao.queryUserInfo(staffVo);
+                if (resultU.size()>0){//重复的数据
+                    StaffExportVo vo = new StaffExportVo();
+                    vo.setFailureMsg("用户信息已存在");
+                    ++ii;
+                    vo.setIndex(ii).setUserName(staff.getUserName()).setAccount(staff.getAccount()).setRole(staff.getRole()).setWorkNumber(staff.getWorkNumber()).setStaffGradeName(staff.getStaffGradeName()).setStaffProfessionalArchitectureName(staff.getStaffProfessionalArchitectureName()).setPhone(staff.getPhone()).setEmail(staff.getEmail()).setSchoolAppellationName(staff.getSchoolAppellationName());
+                    staffs.remove(i);
+                    i--;
+                }
+                if (resultW.size()>0){
+                    StaffExportVo vo = new StaffExportVo();
+                    vo.setFailureMsg("重复的工号");
+                    ++ii;
+                    vo.setIndex(ii).setUserName(staff.getUserName()).setAccount(staff.getAccount()).setRole(staff.getRole()).setWorkNumber(staff.getWorkNumber()).setStaffGradeName(staff.getStaffGradeName()).setStaffProfessionalArchitectureName(staff.getStaffProfessionalArchitectureName()).setPhone(staff.getPhone()).setEmail(staff.getEmail()).setSchoolAppellationName(staff.getSchoolAppellationName());
+                    staffs.remove(i);
+                    i--;
+                    continue;
+                }else if (resultA.size()>0){
+                    StaffExportVo vo = new StaffExportVo();
+                    vo.setFailureMsg("重复的账号");
+                    ++ii;
+                    vo.setIndex(ii).setUserName(staff.getUserName()).setAccount(staff.getAccount()).setRole(staff.getRole()).setWorkNumber(staff.getWorkNumber()).setStaffGradeName(staff.getStaffGradeName()).setStaffProfessionalArchitectureName(staff.getStaffProfessionalArchitectureName()).setPhone(staff.getPhone()).setEmail(staff.getEmail()).setSchoolAppellationName(staff.getSchoolAppellationName());
+                    staffs.remove(i);
+                    i--;
+                    continue;
+                }else if (phone!=null&&phone!=""){
+                    List<Integer> resultP = userInfoDao.queryPhone(phone);
+                    if (resultP.size()>0){
+                        StaffExportVo vo = new StaffExportVo();
+                        vo.setFailureMsg("重复的手机号码");
+                        ++ii;
+                        vo.setIndex(ii).setUserName(staff.getUserName()).setAccount(staff.getAccount()).setRole(staff.getRole()).setWorkNumber(staff.getWorkNumber()).setStaffGradeName(staff.getStaffGradeName()).setStaffProfessionalArchitectureName(staff.getStaffProfessionalArchitectureName()).setPhone(staff.getPhone()).setEmail(staff.getEmail()).setSchoolAppellationName(staff.getSchoolAppellationName());
+                        staffs.remove(i);
+                        i--;
+                        continue;
+                    }
+                }
+                ++ii;
+                if (!staffs.isEmpty()&&staffs.size()>0){
+                    staffVo.setPassword(ConstantUtils.INITIAL_PASSWORD);
+                    userInfoDao.addUserinfo(staffVo);
+                    staff.setPlatformId(ConstantUtils.PLATFORMID).setUserId(staffVo.getUserId());
+                    boolean b = systemSetttingDao.addStaff(staff);
+                    if(!b){
+                        throw new RuntimeException();
+                    }
+
+                }
+
+            }
+        }catch (RuntimeException e){
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        String token = "";
+
+        // 有导入失败的数据，才会存入redis
+        if (failVo1.size() > 0) {
+            //生成token
+            token = "FAILURE_IMPORT" + UUID.randomUUID().toString().replace("-", "");
+
+            ValueOperations<String, String> ops = stringRedisTemplate.opsForValue();
+            String failureVOJson = JSON.toJSONString(failVo1);
+
+            ops.set(token, failureVOJson, 30 * 60, TimeUnit.SECONDS);
+        }
+        map.put("token", token);
+        map.put("successNum", (size-failVo1.size())+"");
+        map.put("failureNum", failVo1.size()+"");
+
+        return map;
+    }
+
+    @Override
+    public void exportFailureRecord(HttpServletResponse response, String token) throws Exception{
+        if (StringUtils.isEmpty(token)) {
+            return;
+        }
+        ValueOperations<String, String> ops = stringRedisTemplate.opsForValue();
+        //获取数据
+        String record = ops.get(token);
+        if (StringUtils.isEmpty(record)) {
+            return;
+        }
+        List<StaffExportVo> parse = JSON.parseObject(record, new TypeReference<List<StaffExportVo>>() {
+        });
+
+        parse.sort(Comparator.comparing(StaffExportVo::getIndex));
+
+        //2.加载模板流数据
+        org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/员工信息导入失败模板.xlsx");
+        InputStream inputStream = resource.getInputStream();
+
+        //3、通过工具类下载文件
+        new ExcelExportUtil(StaffExportVo.class, Constant.ROW_INDEX, Constant.STYLE_INDEX).
+                export(response, inputStream, parse, "员工信息导入失败数据表.xlsx");
+    }
+
+    @Override
+    public void downloadFiles(HttpServletResponse response) throws IOException {
+        XlsxTemplateEntity xlsxTemplate = xlsxTemplateService.getById(ConstantUtils.XLSX_TEMPLATE_ID3);
+        ossService.downloadFiles(response, xlsxTemplate.getFileName());
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/excel-template/员工信息导入失败模板.xlsx b/src/main/resources/excel-template/员工信息导入失败模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..04bf779b78430a2319e026eaa1cfb9b48057e832
GIT binary patch
literal 9335
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
Qw8y(FFpqND#7}zv2RDWWtN;K2

literal 0
HcmV?d00001

diff --git a/src/main/resources/excel-template/员工信息导入模板.xlsx b/src/main/resources/excel-template/员工信息导入模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..6acd2c62482b51eccee84907f68121b2fddace53
GIT binary patch
literal 9308
zcmaia1yo$ivi9IkaF^ij7J?Jpf)m_b1|1-{1PCrcf(O??2pZfyxCeK4w>Kp3o}80+
z{`>b@Gkeyas;=H&bywG}uN7sXpb-I2Em&bi`04teh5-Iy0yI{11ll{XD1ybXz&GH3
ziq-SXl(9kp0GyBj0NUTh4DIci-E3{rVp?UO*s#Pe{U6aPfE-NZ%ItLhA$)LJF2o$b
z*%mpB*v;V^CT3@{D>%C|pz0km2j*~Lt)r{{!Ftmvd<HN%xpFC>nmRwuK>`8KRMu9V
zxA9GSWF##DtvsEz_49mfcxUE|OSk1xs3-!+_t?~H&JkN?;V@M}5<w1?^3L?Tgzp{B
z7|e=g7+!qY$%6>6Nj42e=7!G;bX;pfvb0LAx>_6^EsA8(VXk3@MDpI#DUI)N%dMry
zSvy_cUVV7?b(v2HYGz(nYCm9!>ARMqg#f}0x1M0`nilL9fzzx^S#Im}kIvEI-C3Bk
zmHX@C{c~pKWyYKB(!};H#a$@2Z78KZ*n0mC^a$Oy+%AGPcQvUfAHeIN7J*l7@-M=;
z0C{PznjThaw>5ZfukDUu{)sOAbHiF*FuEFGbkYBgt})Qj^a<XG*w?ZhtZ1Ew{)?a1
z7N{*nI4gA(HTi3w*JimP_1e@--;uosUCyOc*Sp{fxD7P$G`n-;=<KN`ditG~j$miu
ziy&ASniQuXHkKrAbIEuvX`OtxC>SQ;*BVd6%`KP1gM0n`jr}K>46)b?xoJe(SLMjY
zEY+E{Ls_pR9gI^~$OLr*m~crOAW|_M-(f>DyDzx`@<7yCP|BhBmO{EbkU1^Gevric
zdH9_|3jl>{Awr4uj>6gU8i)K>KUAu*;$GCdHl;;)Et-3=b%k8hd20&@Miu9klGsrJ
zCUUXlUM#iN-avf&{^2TzU8ihSuw>;E4^z*aS6cj)E1PoHFeai2hH*LFnUXux!NHWQ
z>Lw)(9hIfR)LIbs2lNxc0sdW5BY7B?q&p$<L43OJ?<Iu=HUu9L&w2idbF2jZ$O9N(
zUoh5~|G?SB$r)(-b0SB}gOUC@k;zOlHeMBt#e&NB2fE(*ukOhve}_)ap|q?Dd7S?+
z;&6E4KpO1Cvgo}9F)-?GDi2{P`aD`<TH&J##3HIkrC&?%r1QQ(1mhC9z>kC)p1aN&
zrEi%zaOj4f5JP0)yj^;!xprO{#+Y#nFXw~YzF}5-l?B?ABvo=kaEKm!N%AZwh|nNv
zI6C3I!=2ImGJCyhh@WlO>$8Nk<)WwyA(T>Sm;50oWWRzyNtEHkyy>$L8+b$P;>(%U
z10;V3FEg|x_3oY5Wkcw5^5m*<1mCiq(FKA%@fN-8sVL}PeV}$|59~6-@Ae_<Zbqf*
zF8*Qq?S$|Nu78gWP++*+Y<@<Ce-}XgCEyBlw05#EHFf?of*jWQR?&ldQHKKn@cxhN
zPZhQ&2UMxm+s(0J%_E(WLZj*?OC_XTsm+NPbw~KY!rw@lYh~HCeJF_jfDPPM#!AD;
zd^H6r&XKF__Yl47Em77Z^Cb(bXS5Z^#og_oE-_fu{E**Z(jQ*heOmmpt_Ti-z`>aP
ztT<5bSxrh$EMl;r89$|NB_+oGIf>8?rOv>5IGQQME82RCJk@a!(e|K}Z|)!kM%zGO
z7=XbITSZdB-$0)QF-fIVbw|P1G6eaRHh*BiYwB?dsDn-jgm^OaKtq_D^>7JxW4=q$
zj!mRg;nI)kDDR;-;!f-MsJtM~p%Xo`Y@*;IW7I!atXCqs!0Nr<N;iXfGq7qw7(zj7
zCx@>lt7}IcQlOnqDZNJ-TaEjm_GRRG%`)0VRPIVEfFb-XaU&E>+qR1*qOM%c0*1+`
z_^q9XsyNzIh>8qG9a}XPNi%u4Tj-Smwn;7yo|E8fKMHs?Wjhop{4e=i{$~iry5oxw
zxM|x&tbx!9>4r|Jri4~wsqp<Ym_!^Cn|n;>6UY_Z`)^%vO)**A9mTes^S%`zem{4P
z*M!D8dBa8!i)$i+XP`0>{bLoGy|o#8c>Jsf@rajyw~Bg8F7#uL7W<KaFR}-<n1*4J
zGm|CIgSZtF$rEl%Rpnk#p1p0`!C{WMvR`)O77#3jtywN1>O4~HoC@RI6+o)E(Ey;E
zNII=@6!eAAw+$E?yawN9&(ab*>krXFXQQP6g@&}V8`Xs1C7_>^uhfYM2cIl(hK6Lb
zXK9N0<{w^U$5Y7pM34@Wz>3LL0dv=nUj#O6E3A*qWoHeptzj<Fk;>VJ;=eP0OKQ4X
zT;BA;w9pj#vym#jiD8$UV~hQZsqZly>EUg(>fK^8{9GHd0l}j7O7O`PTt!uqcBc7t
za|N%m&blJ-K_0Ka8+}eM6}o>juk*RA%-gHsjaQ@IyeG$TWE>Qqg3=Ek>^av`@6!3l
znuSCC$;3kqjf@&^{RZv(yYi~<kgw&JAWja)p$IWWNTa?aDNkcbP?zUp*F#)}uqFn(
zEAfvKvTh(U%L=5n!iBY<mreuH?LSxG)=CWgP=p&}V0t9KcmVvr7wgkT4qmLz7N)kQ
ze{AG(#0kT5FaW@F{9hsPFR`D(KUd(sraX|42dxoz%jeBrV~oiz1v@!hwcrXh2t!OJ
zl&DbGDiPha?l~RbH|*Xo!hTtnBeH%AZ)s;?rF`{9^;fyYQy{OAh#fT;l(Ve5d&roK
z^eGQgmRARkQ0l%po*Rlb8V|r2T6UM|7Tu62K;gu4?p(P_21GI6rbpAFpqtViTsbk`
z71xt`+r#Yl;L%J&-Ky?oMv}^Y+*hS1_cf$s{(_u;WYgy6PwBa?M76dBeMencp;pSx
zfIwb&m`e*$Q$vl3Vc_GsT>ZM$mHr(8JS{1Gz8f*2f;A%9MwV=yYq&*sFuo{=z3o}<
zp%Nt}|JIe-{iX(}Om$enP;4DmyWKAH5wX7Qd8*wuuRA9*P3aWj`G(%MK2(8D_qq1H
zS+nNN7yt{pd^9y|`|Fp*g+ngH5{N#bm!6kejr+;(c<z8@4hz-=K1gLEb&od$-mF`q
zSWFGD>sMU_O?p6Emt7pa07p+Jl*OWh^BpFz6dTpHGm5S)XH9+BL_#z|Hk^W6y%K3<
zHR7f$mg*}_U8_(8+4Vdv*<q+IIDn#XD5bOj@6Zu6jAFB{SZ@;MVYJv6)v-+C@bJxR
z#pjbj<KgM>FM3V7o72gr(PhiZ^zW{2Iynx{!}9Z^(lZ2a*3XVt$0UU|n;6@nK1k#(
z7aulX-OjykY)<#O-09V@YhXQYemt82HhXWwwh3ynzr8*m6G|8Ix*pv0c{u8TSX{NR
zX_KUEZL5F(x`B_;uWGwxdf+&z`C})oL`Q`%+ZCwxpnn>2A(djMZQq#B?ec|G2$Gxa
zMa#;|@M}4Y?g5^a4oDI<iA#J}*rlN4{*WV!1c`&*>w%7Wk*#SiSKM56tJ|;0m2tH?
zAY+@626-iVr9c%%f%9;AHc-idAep*OlvK+{1I+Dtngv1f@6q8s)ATvHBM{QhS)6c1
zq^ht}vON|Avp=g{9({=jMDZ&KxPw<=2%j33%j#Hn48*X4y+iAr7I%EH>GysY3E^WT
ztErw)hiI*hox_{5m@~rXqz9FxBko2Nb(AWJL$5lL-tT>}<dKlxXhW4INSTi6#FD{s
zuleZQ8kN-eYTUI4N`@!zmZVkv+YpX_eP$|kuBl%E4aY&xI@dtS4e|GFXv0$W=X(iy
zG?W4=4X5}E{h;o})s8xMRP~Oxm<K|%BLbYVK;vobU8bEz(Pj;cN1w9cl#7$Osr6i}
z0GZ-;1Mii|%|nybV-HbU;y&KaV9|^g7|u+4KtP{@{!0gU;(nv60uZ~L!7_PdWkmPK
zyTBedyliBJLoR*Z_hQR0G4#5ie-NCPkJYq|X*zba-A!s17ZRE=lR);ayHzPgwnvC;
zY?)cR$I;JQSI0CRGsDx)@sJtHnZ-?mqAi$U)uPYt3H&#nf6};6e^W`!$jopVrds+1
zU}dVl6u8z}SG3BrV*n{(Z!3xwO#j-w2zO?p*E8kg0+w7cWYLjwc7d;H-dyNz*LvZ^
zdM+qZPMb2^@vHP!&lU-_5!Oo9%ZV*_iw4WjbNwH*&Qxhb-{5g-B|b)UiaVizif4sY
zROl>r(wy%$Ku|K&!kXO~E&IfR)cE6(iZt3{6mHkpQt7~}Fk0EJcY9>$n-Ei3am6B{
zlp7>e(%l;UEMvkdrDVz4wn)&+X;f3Nn(k9QBBT41tG&>0qjL3ZS>$OxFz<${+OAbo
z^odFsXOKq)!rL){a^`oa{utJkR`kAP=trUX36dO?N9q+=6{h#4oOz<4!72Z5K_?Dk
zU-7VsJF!lQKIb;%WH-mNu{L2_2l*0^(Ge`aP)3<VE}D?<{~Y5qJ?%2YtsKK4<}|~>
zq^6`hR%$ef9L8Oa(I3X;9xy@PG0Z%Onjw2xv{sF)RpY2YTMrH05T22}o1RUEH=You
zIgYjJg0G&e8$R1;{H2AXAT3`SuV_)HR`<R33`Oc#>(aZILer({Ovv&$n=-_f_wDbl
zk)Q~L0LNRc^*`|A$#LOPX7AztnGOfi!97TWv$<0R008CJmf_^=Ze!~7l!r~|=ts?U
zq5H559|{j!kcKZv=M)GzD{S64OFkFYf-Z-GmO>1mQF4W*Ri>i5WEKb1M0(gl;?kye
zSfXWGLQZ)Vl-X)kN)Yhrcg4EAzDG=(r>d(TRbHu+46Oi=N;`nOIZo$hG!K-uHKJf6
zo%>Iq=A7m#Dm3G%`uE=o%n4ZZ1Ank`YgJ$c=FM>s4^_>ce8KL~sA;}UD}BxnD%lNA
zz?K;fB&=L-XC=}rRP{gj#KjsQ545N|l3zT9GlS265TU}mNti*39&RZtn6S!bXSLN>
zSa6htGDd?{o+7L>)Sir$#kk&>Akk4ZeP20w{1&jDcXpo<*>Dv9=zSYaq?5pWzciY=
zBfpK^ssRKtUd8qRqlMl)1oKeUVXPX7Sj-69sN=3m-KPgQp6?j3_A%m3!X#2nZuH00
zu;XjWf+I#6r#uT|i|+fZ`o@V%9Rd?IKiX`DIqg=yQKm772fChZ-JxSoI%oos569S3
zL~qt2kGJ85G8VdBiIcqndldd$D7x)G!VZY0KW}D-VP^&0HAfv_Se!n)n5%$zEIN87
zja`6IIGBS0rERwgd7If!hrfUO7{5(?WJ&?-|K1rFF2Q6dJt&;vkKEtYmB>~S#JKd5
zu*uP3Kwr4S$+<E-k4Z5oYobAsJP)1n89OuUK<(s@#_5BGj&dYw`25m%9%9KbC!xN(
zcT`4=V+Hy)YkQrOTqtKE%zCrU9H3gN0~<d+?Q1HQJmrw?15dtJ0zz+B5UG5PdO)c;
zu%9Os-JvzAYl6)1w3@72-eVCjz912GSQC|xG*IjDl06VS8Z;K~1esvM^LHPRVZjmW
z#EM5YsY{aPxC-60fjlN-V7T5wB^qMG+N;~seR~-pko{F7oVk6A(`gDj0*y5S-j;Ks
z(2m<h7f2VOUYu*q1;fYc(@a2rv$i+YG3i+tTOh5Y1(&!}m9U`L`gOv;0P$>l>n$7e
zJ56`F3?thJ&-t7i>!lsD#)Tq=Z$)%4GmDuw8b-}cM)$SqeQdH~hGsu>Y!X7xIPCNg
z26s3I7)FM!n%~?zNSp5MZ>6QGXk{T$4X3&co?1~gm`OYutrE-(A(Mioz+cBc3)mu}
zUqul~sbxz$Qjk;Bvq*(zdVN?;el)};2W)dPjQS{WuS!$PSzih?!!gJmuSBA9$T(Vh
z^nbY_tK6A`3*G{5p~RrFAU8q~o!OkWILX7IGJFxc!<BC9!(tSzT2JShb!D_j;2#Kw
z#k%=W?Qa)ZX_C;I#F{fe4iJ*a&<w&$nV&pDV@XPDAEm-L1u>(ey{Qu;FOEPnN5?eM
zM=ePgAfPmijAe9RiB=Q;kpR!;B}Pp?fbrhO&P3J3nSvr_LSi98G>mr<A$s79_TVBh
z03tKQAlzI+Tp6a#>D8Uhv$y;*Q2idTz=PCu&Phs43lssLkz}o^!ifo3Z|Yc0SDWw<
zB0l<?On+{MG`#mV&PLGCB07*(F+SPONWJyeyx(0um@V$n;Oo4iyDJ!C3~R53sB8*N
z*d8I{F9=7K{zgqRr=4d^S_{?xPEEW2**>$@>3&<GIF41+4aZ<C)uZXY%!d6I5n(2&
zHH|sIFMWRrJtSQ}%wbrz>{idh<y8Yp7UD)4F8wM5Etb(UTKj=-zQXs%7UjTe*adtM
zbSxxg!xiW;8$^r^>gfQZXkIskc5V7e@*aW(`!6_(Dp&9x78V7|=`f#|6QV+(m1ce0
zF$~9#%#vKfc;#@6T<KYb7-EF*jk5OevIF}yMF_+<K|N9Zk~I|(qO^OvOFBW%wpjZh
z=)2)qO+~U+Bp-+*Xkp3c%9dU*n7Se|31fYzAeVIX4vZ7`X8fkl<}I#k(}>nCvp*|h
zHeFBMAnYzIg`DYTM!%VYF?wR-j>c}NA*&6@qh=D;kCo!^4ovH#l7A>S!*j)ZkpqPV
z?d?Z+x=&utB#eycxYZ~8X$oP*D!>Ix3}l*=<d0X~%`u|Q?})3d$2t!H#l>Ugv;`&-
z?q;em!k4v92=iVdo^gt(p82ZCLdMWhE=N<xv5zPjvXjVgu8Z|v?2Rh)fZt_<b6rg=
z<DOyejdmrs7JPnHZmomEq5^63HbQImuHCmJ9)#NBSfTUU&kuM^Aq;C`OKin?mYH={
zNW>%=k4ZV^Fg`jd%qV3ysgcLu>rBKs!{Sw|WLT#ajSV_aE9v~&f5cLS$U=Os58_Ri
z_TN(Ebn)ADxHUm-m-{q)yI|IE!c6?O=^nLYhQkBEet<|z5_HC~NVHHMX%GN0lfqu3
z;@A3tyEw%OMYG0t?%3qei0B<Y6p<mf-O(I3hJ^H%Kua~h_le2PmH@TYEybLlt1P^v
z!D(Mf%UMQL*K6-%^>dmp$OKS@a+tPmALEsZ7vs2dj(PN7KZ49pj(e|;1HQ5draWvg
zAdCV&A<;`)P;i|vTQr<g`oHu7`FLI$GWxN@$NO$}KsG{KGx~Lj(ED9R3_=nw)}P*O
zHy)SyxLj-phrf@m!;@}UbXHf^wj%GNR`o(@rsJ6FyIRa=(~{aA*jLO#+B076a<ph`
zEkJ+Im0%=p%4jQw$#<#mI&>hEa>xB1o}|6-18WeA_akxx-}P=Vo6g<yc*NzjnNz)M
ztG74%GXZ0`8BIKCV|^-;Ta&#)51ybC@2uE-)E1mt?g`1vNJX3}H7s{|sj%Kn8gqS5
za)@(svUHg>uR=|a{HRCHhxyxKCF+cOD)hB&%zNc7xo2dv80hJu<+IG?PB&Y!_JeB|
z+4wH}5j$6%hnlG|4$%PeRkzueD>_9y1S-1@hQ{%T(CDqg5h>@@?%YcJq}80=Jk8)u
zRK|};fyyp4BAqT|6DWkq(1V$KE+;N~^zpAHeDx?DZ@O{wpMed%ERUr?`{?QJaS|N7
z>OmTDxbV^QL7u$-D;xmHMCB_dyrgEbxvK886SQSIY)U?M!zyEoNJU=*3V(e|0OU;X
z;%n-fN6gjEA!G}Kp8BD$j3h#y$v=joOpBsh%xiqE?|N6o0`sHka}<lr$#OcrE+H_l
zB61<|ryP-b1A=V<Bx3LlaiIa+?QzINv=-DZCE0^Vo&oL^nIBa-5p=Ei7ki@a2D(_V
zQEbhET-wBF?d@V|49d;YkjkMq;0dJIp~Ew6pvt2ZhlPuTEI9au3_VJ~sy@SJZr|Hb
zc|<rMoiM7i1RQL<o;zF6qs}4^Y07U+j-Sb<Eb|s4)MvJ&QkGisYa4oeZ6Ph(0BcoG
zz7tX43g&MAS``@}XYQ{!8%*7B;Ll@9QzdXzY<@l%gSjBpWYd3kC3!WE5aQuHwR^$D
z(ji}I`u2|C?XzIyIo26>Cf`J}r83Tw{p!2Z#<aYqdh-Ip(j5isSH+s=D2+{D>y@Tn
z^3~S|>8TZ`xsqjk(hsP2%&~B4hUY1-Z^CuExBrS%cIkHCG+(vhgQ-xqbzIgaLZJZ(
zcW^>sOmQ@|T~$4higrcohV3i=&@G|rzc#f~{rE@D86<6Vj|VPuZ^8orPxJz~{@`R`
z=xA!9;_PT?XZ|zw+*en!9#h2f#=Uz+=Km~!sh8WtB3S_5>q5jwcvf#t*ipp^7<{8j
zGnN2)Sse<pDYvS}nV(faWXk<2WLC%1JNDpDBh7;s@>+04H#Yio-s#ZwB(0xUX-Z!!
zuiTHwX!->iy=(>T^VDh%*zeRG=C9+zth0m*B00WU8h=33CnNuC?Rr=cs0cA>6pQBc
zVS`i#LwYkhH;#%gigkd$hFCV=;HBpKHR2p|DO576kE0cgLeY%#Em_gkNJ)?^!#L%~
zS-vFtP{}gL^0@?uoL9@^0vT_sA{PmdSV);^ZZ8k%PAJy1uDT9U8YQOENZJ@#Q0`mV
zZeN(xtASp6EUzO9;RPF%ZbpVC#uf1u!2tPMH&N$iE@r*FZ%{yh)P16_%4z3|b#Y#k
zDdnX&*6G&)lj05>S=zAQU|c!P#+W9rT7}N9LA3*XyqXYgYDve*#+Mo}tRa0qkMlrP
z&28EO9z!^_tYrFk`dAC7I<J>vVq3hKY__N^z`J{{?HCA}CPgMh8jn334HV0r_l0y<
z{l{rz4^KWH^q_&MDOX1pW#;r4d-;A~CRU7+Em<VFNe0XjjU%FEpq%9L9iiUj0#s>P
z@1|PNmHk5B@WOe&(54<Nw~dHevIl-9wZ|$*CmPs^r}0P*d)8L)v6Ef*9HR&(MYqfY
zgxN@cR9H@P_edO+7`B&*Io^Dd-8HB}*%}pk@v}Ppo07syO@gKc7xL%9pJ%@d%0@t-
z_0#)HL`=UzJ1d&_rPN&jm&XpLS3zmAs;KW4tQutBY)4#Ik$#1)@<Y0GmU2SL#&$N}
z)b8Mn#l<@^dUGVaD0Tx22AX&QtfPku=NbS`T)DD^`4?YccsU&qI9ZC+{dzMp9Kek;
zoU^8p+Fc|<vC`vS$yun&O0I;D%75c4+6BvoKX}TR;zaS`onJZPqhakgb!@@f9h2ca
z2n@wAu@mEL&p=0AhKSo`a_R;j^dRR9E><R^w;$*~F&c>GS|86QK_Joi_$Vjm^-Cu}
zvG_#&fT90peTg{dw(m-19UuSsUXh&(W-Uxyf&{hETs4?Fru5qLqYM8-@Cczui6Hx2
zvFH8(e%z|=k65(6b{Qp%YR4a#%tQ2_iggWiw{Y{vGzE8gn1xjSTNM!&4644Psm-62
ze2*8PhDY#!i{NF9^p_0tlVoY^kPMio>N@m4MB8YRcg04Zab_XklQ;45O_F;YrpAob
z+;3_WQDPkb1{d}5dLw1g)1;no{<$7oUSxy6i;}-Eum{wnbmZywX5L?_q;UeuUDdt~
zx_;-x=r%B5ga5-UGi8jfr}8j+Fdto<<;b?GqHqQumv}y}kTFF7ccY!6UEhgBR|biq
zJb&i`eTYXrtiy|U4c9<m(eC#pfsfg*hBz43RAbUyY@)Hl13a^*o6*k2VPScP99;za
z4_#$~OG?d{P{eiKC8>n|Sl4NGVEovvqd*!;l{t7VJT|u3)*3USUD+@7GLR~3_mPsl
zyJIcEU64y(%JGD$*!BNgk^MI~*N?LB_Q5cI1H(xGzJep-FR>>o<v+9eKj>Puvm$pL
z1~dkYcsYzlut}upb!ASKdH{?Wd@PLMWVKUjGI~B~W;!S8AZG+NAJX*C&DR}{KcluX
zW>qxdrA21G;U0%=LOp!Ok{M!qR2>F^5-wHFaClfvI<1)?J6;Jz=YU|6X-J}1MLlHz
zqzi+B-Bx8gPY}=3dNxUH8}T-7bLi#$xv%4L;l+aR>@AIAutW6PW23QJ73yNv?E%|S
zJiL5_{FV@JuN!3-_e2jY&bnNPh<>oU4t7wtf}T@e(pl-%VDd2|UmLGi?Aw=N+Q^;B
z$oWZ;<Ihh99Oz<fWMAUqHC{Qa|53IsIM#A92QPFKaOwJqxzm0Hv~xDKbJkaNw>Ndt
zeOmCPANmy_*|35xshiq!v^iAl4Z{r$mQ4#OSD?l(S~$-V(*2Jv(&-E!Mf}23q+jk|
zH$UDrB1<q>hf;}+FHDr^pTB`nc$+(4Vn!O5c#@8t6sXeX2FIlhRWWjOW5uco*WzD9
zJXs=5$8R550l`py0zot==T%8Q!us6}&5_xx1?bVp$J{8pr2J6}g`0@KRh3bWK3(I?
zW0lfhM4jIbr@AEhJz97Id5lVv^Nz2w9Rjx62G{hKFONyUadseR!?mUQAR_C%mIxaT
zTO*<@ckPKIk(aPSP*Jm5<n-BCVS+FLk}SIFaCM1rydNbQHHuLBqlql(vf~wVcJ+<X
z3S?YOBF8g=1kDY(t3G=hG3fJj@-(SExo$KOS{pzt*F^foK><-%<9W;^?8Ce;j(~`Q
zbD{4hu-OTqxdDCD-+i5bdHTJ)y^`*{4{`td(k7GWtXI+Y!g*6nbu(kbY3r#m_Z_UF
zECeLh&#n8{$$&pS19lDo0`MIColo+we)`qHzmtehA?H_nI%M#S=yw46r_nz{(38$D
zqa1(f{9H2s&Dax5@~b@=duo3>{P0hEe;$8$68>e6=I?6%dl=$Ri2kJae`~)3PwBsm
z{)g=UQ~giY`nUQ%IAr`*|BJ)^Zx8*%<Nj(-4^0I9zpU=l<Nmu#{)v({@!tZ}p9B3f
zl0Dh^g_8f@)&5Uh`?H@vbHv~M*n^qlf6EyE?BUPK=I<Wvz=h7I9{#Fx{x`7x`Ru)5
z<{GT}A6D(3GvrTR?YG6FzpMRb+5Q~zpXto+4!(hR1+d+}!}i|>{Y1q7YEK>(_~qe$
o(DMHr`Jcr6lkP9CS^gj0-!#3VEX>cviVi-o0tc28dj6#MKSk2iv;Y7A

literal 0
HcmV?d00001

diff --git a/src/main/resources/mapper/tms/StudentDao.xml b/src/main/resources/mapper/tms/StudentDao.xml
index 5b67ea0..48d33a5 100644
--- a/src/main/resources/mapper/tms/StudentDao.xml
+++ b/src/main/resources/mapper/tms/StudentDao.xml
@@ -63,7 +63,7 @@
 		)
 	</insert>
 	<insert id="bacthAddStudents">
-	INSERT INTO student( schoolId, userId, workNumber, roleId, isdel,platformId )
+	INSERT INTO student( schoolId, userId, workNumber, roleId, isdel,platformId,now() )
 	VALUES
 		<foreach collection ="list" item="studentVo" index= "index" separator =",">
 			( #{studentVo.schoolId},#{studentVo.userId},#{studentVo.workNumber},4,0,1)
@@ -83,7 +83,6 @@
 		UPDATE
 		student s,hr_user_info u
 		<set>
-			<if test="schoolId!=null">s.schoolId = #{schoolId},</if>
 			<if test="workNumber!=null">s.workNumber = #{workNumber},</if>
 			<if test="professionalId!=null">s.professionalId = #{professionalId},</if>
 			<if test="professionalName!=null">s.professionalName = #{professionalName},</if>
@@ -92,19 +91,20 @@
 			<if test="classId!=null">s.classId = #{classId},</if>
 			<if test="className!=null">s.className = #{className},</if>
 			<if test="userName!=null">u.userName = #{userName},</if>
-			<if test="schoolId!=null">u.schoolId = #{schoolId},</if>
 			<if test="account!=null">u.account = #{account},</if>
 			<if test="phone!=null">u.phone = #{phone},</if>
 			<if test="phone==null">u.phone = NULL,</if>
 			<if test="email!=null">u.email = #{email}</if>
 			<if test="email==null">u.email = NULL</if>
-			<if test="schoolAppellationId!=null">u.schoolAppellationId = #{schoolAppellationId}</if>>
+			<if test="schoolAppellationId!=null">u.schoolId = #{schoolAppellationId}</if>>
 		</set>
 		WHERE
 		u.userId = s.userId
 		AND
 		s.studentId = #{studentId}
 	</update>
+<!--	<if test="schoolId!=null">s.schoolId = #{schoolId},</if>-->
+	<!--	<if test="schoolId!=null">u.schoolId = #{schoolId},</if>-->
 	<update id="updateWorkNumber">
 		update student set workNumber = #{workNumber}
 	</update>
diff --git a/src/main/resources/mapper/tms/SystemSetting.xml b/src/main/resources/mapper/tms/SystemSetting.xml
index 292943f..23ed521 100644
--- a/src/main/resources/mapper/tms/SystemSetting.xml
+++ b/src/main/resources/mapper/tms/SystemSetting.xml
@@ -7,7 +7,128 @@
         VALUES
 	        (#{userId},#{schoolId},#{workNumber},#{staffGradeId},#{staffProfessionalArchitectureId},#{staffGradeName},#{staffProfessionalArchitectureName},#{platformId},#{roleId})
     </insert>
-    <select id="queryStaff" resultType="com.msdw.tms.entity.vo.StaffVo">
-        select * FROM staff
+	<insert id="addDepartment">
+		INSERT INTO staff_professional_architecture ( staffProfessionalArchitectureName, schoolId )
+		VALUES
+			(#{staffProfessionalArchitectureName},#{schoolId})
+	</insert>
+	<insert id="addStaffGrade">
+		INSERT INTO staff_grade( staffProfessionalArchitectureId, schoolId,staffGradeName )
+		VALUES
+			(#{staffProfessionalArchitectureId},#{schoolId},#{staffGradeName})
+	</insert>
+	<insert id="addStaffN">
+		INSERT INTO staff (userId,schoolId,workNumber,staffGradeId,staffProfessionalArchitectureId,staffGradeName,staffProfessionalArchitectureName,platformId,roleId)
+        VALUES
+	        (#{userId},#{schoolId},#{workNumber},#{staffGradeId},#{staffProfessionalArchitectureId},#{staffGradeName},#{staffProfessionalArchitectureName},#{platformId},#{roleId})
+	</insert>
+	<update id="updateStaff">
+		UPDATE staff
+		<set>
+			<if test="workNumber!=null">=#{workNumber}</if>
+			<if test="staffProfessionalArchitectureId!=null">staffProfessionalArchitectureId=#{staffProfessionalArchitectureId}</if>
+			<if test="staffProfessionalArchitectureName!=null">staffProfessionalArchitectureName=#{staffProfessionalArchitectureName}</if>
+			<if test="staffGradeId!=null">staffGradeId=#{staffGradeId}</if>
+			<if test="staffGradeName!=null">staffGradeName=#{staffGradeName}</if>
+			<if test="roleId!=null">roleId=#{roleId}</if>
+		</set>
+		WHERE
+			staffId = #{staffId}
+	</update>
+	<update id="deleteStaff">
+		update staff s,hr_user_info u set s.isdel = 1 ,u.isdel = 1 where s.userId = u.userId and s.userId = #{userId}
+	</update>
+	<update id="daleteBatchStaff">
+		UPDATE staff s,
+			hr_user_info u
+		SET s.isdel = 1,
+			u.isdel = 1
+		WHERE
+			s.userId = u.userId
+		AND s.userId IN
+		(<foreach collection="list" item="userId" separator=",">
+			#{userId}
+		</foreach>)
+	</update>
+	<update id="updateStaffOnly">
+		UPDATE staff
+		<set>
+			<if test="workNumber!=null">=#{workNumber}</if>
+			<if test="staffProfessionalArchitectureId!=null">staffProfessionalArchitectureId=#{staffProfessionalArchitectureId}</if>
+			<if test="staffProfessionalArchitectureName!=null">staffProfessionalArchitectureName=#{staffProfessionalArchitectureName}</if>
+			<if test="staffGradeId!=null">staffGradeId=#{staffGradeId}</if>
+			<if test="staffGradeName!=null">staffGradeName=#{staffGradeName}</if>
+			<if test="roleId!=null">roleId=#{roleId}</if>
+		</set>
+		WHERE
+		staffId = #{staffId}
+	</update>
+	<delete id="deleteStaffInfo">
+		delete from staff where userId = #{userId}
+	</delete>
+	<delete id="deleteStaffOnly">
+		delete from staff where userId = #{userId} and roleId = (select max(roleId) from staff where userId = #{userId})
+	</delete>
+	<select id="queryStaff" resultType="com.msdw.tms.entity.vo.StaffVo">
+        SELECT
+	        u.userId,
+	        u.userName,
+	        u.roleId,
+	        u.logInNumber,
+	        u.lastLoginTime,
+	        u.schoolId,
+	        s.workNumber,
+	        s.staffProfessionalArchitectureId,
+	        s.staffProfessionalArchitectureName,
+	        s.staffGradeId,
+            s.staffGradeName
+        FROM
+	        hr_user_info u
+	    LEFT JOIN staff s ON u.userId = s.userId
+        WHERE
+	        s.schoolId = #{schoolId}
+	    <if test="searchContent!=null">AND (u.userName LIKE CONCAT('%',#{searchContent},'%') OR s.workNumber LIKE CONCAT('%',#{searchContent},'%'))</if>
+	    <if test="staffGradeIds!=null and staffGradeIds!='' ">AND FIND_IN_SET(staffGradeId,#{staffGradeIds})</if>
+	    <if test="staffProfessionalArchitectureIds!=null and staffProfessionalArchitectureIds!=''">AND FIND_IN_SET(staffProfessionalArchitectureId,#{staffProfessionalArchitectureIds})</if>
     </select>
+    <select id="querystaffDetail" resultType="com.msdw.tms.entity.vo.StaffVo">
+		SELECT
+	        u.userId,
+	        u.userName,
+	        u.roleId,
+	        u.logInNumber,
+	        u.lastLoginTime,
+	        u.schoolId,
+	        u.phone,
+	        u.email,
+	        u.account
+        FROM
+	        hr_user_info u
+        WHERE
+	    	u.userId = #{userId}
+	</select>
+	<select id="queryGrade" resultType="java.lang.Integer">
+		select staffProfessionalArchitectureName from staff where schoolId = #{schoolId}
+	</select>
+	<select id="queryDepartment" resultType="java.lang.Integer">
+		select staffGradeName from staff_grade where schoolId = #{schoolId} and staffProfessionalArchitectureId = #{staffProfessionalArchitectureId}
+	</select>
+	<select id="queryWorkNumber" resultType="java.lang.Integer">
+		select userId from staff where workNumber =#{workNumber} and isdel = 0
+	</select>
+	<select id="queryStaffInfo" resultType="com.msdw.tms.entity.vo.StaffVo">
+		SELECT
+			staffId,
+			workNumber,
+			staffProfessionalArchitectureId,
+			staffProfessionalArchitectureName,
+			staffGradeId,
+			staffGradeName,
+			roleId
+		FROM
+			staff
+		WHERE
+			userId = #{userId}
+		AND roleId in ( SELECT roleId FROM staff WHERE userId = #{userId} )
+	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml
index 2804ae8..4d628ee 100644
--- a/src/main/resources/mapper/tms/UserInfoDao.xml
+++ b/src/main/resources/mapper/tms/UserInfoDao.xml
@@ -79,34 +79,64 @@
 		and
 		schoolId = #{schoolId}
     </select>
+    <select id="queryPhone" resultType="java.lang.Integer">
+        SELECT
+		    phone
+	    FROM
+		    hr_user_info
+	    WHERE
+		    phone = #{phone}
+		and
+		    isdel = 0
+    </select>
+    <select id="queryAccount" resultType="java.lang.String">
+    SELECT
+		roleId
+	FROM
+		hr_user_info
+	WHERE
+		account = #{account}
+	and
+		isdel = 0
+    </select>
+    <select id="queryUserInfo" resultType="com.msdw.tms.entity.vo.StaffVo">
+        SELECT
+	        *
+        FROM
+	        hr_user_info u,
+	        staff s
+        WHERE
+	        u.userId = s.userId
+	    AND u.account = #{account} and u.phone = #{phone} and s.workNumber = #{workNumber}
+    </select>
 
     <insert id="saveUserInfo" useGeneratedKeys="true" keyProperty="userId" keyColumn="userId">
-    INSERT INTO hr_user_info ( userName,email,phone,uniqueIdentificationAccount, schoolId, account,password, roleId,isdel,schoolAppellationId,creationTime)
+    INSERT INTO hr_user_info ( userName,email,phone,uniqueIdentificationAccount, schoolId, account,password, roleId,isdel,creationTime)
     VALUES
-	    ( #{userName},#{email},#{phone},#{uniqueIdentificationAccount}, #{schoolId}, #{account}, #{password}, 4 ,0,#{schoolAppellationId},now())
-    </insert>
-    <insert id="bacthAddStudents">
-        insert into hr_user_info(
-            userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId,creationTime)
-        values
-        <foreach collection ="list" item="studentVo" index= "index" separator =",">
-            (#{studentVo.userName}, #{studentVo.uniqueIdentificationAccount},#{studentVo.schoolId},
-            #{studentVo.phone}, #{studentVo.account},#{studentVo.password},#{studentVo.roleId},
-            (SELECT schoolId FROM school WHERE schoolName = #{studentVo.schoolAppellationName}),now())
-    </foreach>
+	    ( #{userName},#{email},#{phone},#{uniqueIdentificationAccount}, #{schoolAppellationId}, #{account}, #{password}, 4 ,0,now())
     </insert>
+<!--    <insert id="bacthAddStudents">-->
+<!--        insert into hr_user_info(-->
+<!--            userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId,creationTime)-->
+<!--        values-->
+<!--        <foreach collection ="list" item="studentVo" index= "index" separator =",">-->
+<!--            (#{studentVo.userName}, #{studentVo.uniqueIdentificationAccount},#{studentVo.schoolId},-->
+<!--            #{studentVo.phone}, #{studentVo.account},#{studentVo.password},#{studentVo.roleId},-->
+<!--            (SELECT schoolId FROM school WHERE schoolName = #{studentVo.schoolAppellationName}),now())-->
+<!--    </foreach>-->
+<!--    </insert>-->
     <insert id="batchSaveUserInfo" useGeneratedKeys="true" keyProperty="userId" keyColumn="userId">
         insert into hr_user_info(
-        userName, uniqueIdentificationAccount, schoolId, phone,account,password,roleId, schoolAppellationId,creationTime)
+        userName, uniqueIdentificationAccount, phone,account,password,roleId, schoolId,creationTime)
         values
-        (#{userName}, #{uniqueIdentificationAccount},#{schoolId},
+        (#{userName}, #{uniqueIdentificationAccount},
         #{phone}, #{account},#{password},#{roleId},
         (SELECT schoolId FROM school WHERE schoolName = #{schoolAppellationName}),now())
     </insert>
-    <insert id="addUserinfo">
-        INSERT INTO hr_user_info ( account, userName, roleId, phone, email, uniqueIdentificationAccount, schoolId,creationTime)
+    <insert id="addUserinfo" useGeneratedKeys="true" keyProperty="userId" keyColumn="userId">
+        INSERT INTO hr_user_info ( account, userName, roleId, phone, email, uniqueIdentificationAccount, schoolId,creationTime,password)
         VALUES
-	        (#{account},#{userName},#{roleId},#{phone},#{email},#{uniqueIdentificationAccount},#{schoolId},now())
+	        (#{account},#{userName},#{roleId},#{phone},#{email},#{uniqueIdentificationAccount},#{schoolId},now(),#{password})
     </insert>
 
     <update id="initialPassword">
@@ -129,4 +159,34 @@
 	AND
 	    stu.userId = u.userId
 	</update>
+    <update id="updateUserInfo">
+        UPDATE hr_user_info
+        <set>
+            <if test="account!= null and account != '' ">
+                account = #{account},
+            </if>
+            <if test="userName != null">
+                userName = #{userName},
+            </if>
+            <if test="phone !=null">
+                phone = #{phone},
+            </if>
+            <if test="email !=null">
+                email = #{email},
+            </if>
+            <if test="schoolAppellationId !=null">
+                schoolAppellationId = #{schoolAppellationId},
+            </if>
+            <if test="roleId !=null">
+                roleId = #{roleId}
+            </if>
+        </set>
+        WHERE userId = #{userId};
+    </update>
+    <update id="setNUM">
+        UPDATE hr_user_info u
+        SET
+            u.account = '00',u.phone = '00'
+        WHERE  userId = #{userId}
+    </update>
 </mapper>
\ No newline at end of file