Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

基地校优化、见习之星列表优化、基地初选优化

Browse Source
This commit is contained in:
paidaxing444
2020-09-04 15:22:18 +08:00
parent a2dfd2c6ae
commit 75a8d6112f
11 changed files with 133 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java
View File

@ -1,11 +1,61 @@
package com.ruoyi.web.controller.common;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jxjs.domain.TsbzJdx;
import com.ruoyi.jxjs.service.ITsbzJdxService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.UUID;
@RestController
public class SchoolCommonController {
@Autowired
private ISysDeptService deptService;
@Autowired
private ISysUserService userService;
@Autowired
private ITsbzJdxService tsbzJdxService;
/**
* 当前登录用户部门id转基地校id
**/
public String deptIdToJdxId() {
String jdxId = "";//转换值
try {
SysDept sysDept = getDept();
TsbzJdx tsbzJdx = new TsbzJdx();
String strSchoolId = sysDept.getSchoolid();
System.out.println("schoolId is Empty======:" + isStringEmpty(strSchoolId));
if (sysDept != null && !isStringEmpty(strSchoolId)) {
jdxId = strSchoolId;
return jdxId;
}
return jdxId;
} catch (Exception e) {
//throw new CustomException("部门id转换学校id异常", HttpStatus.UNAUTHORIZED);
return jdxId;
}
}
public SysDept getDept() {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long deptId = loginUser.getUser().getDept().getDeptId();//当前用户部门id
System.out.println("部门id======:" + deptId);
System.out.println("sys_user.deptid======:" + loginUser.getUser().getDeptId());
SysDept sysDept = deptService.selectDeptById(deptId);
return sysDept;
}
public boolean isStringEmpty(String str) {
if (str == null || "".equals(str)) {
return true;

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java
View File

@ -53,6 +53,12 @@ public class TsbzJdcxController extends BaseController {
@PreAuthorize("@ss.hasPermi('jxjs:jdcx:list')")
@GetMapping("/list")
public TableDataInfo list(TsbzJdcx tsbzJdcx) {
System.out.println("faid:" + tsbzJdcx.getFaid());
//首先判断是否为学校用户
String jdxId=schoolCommonController.deptIdToJdxId();
if(!schoolCommonController.isStringEmpty(jdxId)){
tsbzJdcx.setJdxid(jdxId);
}
startPage();
// List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx);
List<TsbzJdcx> list = tsbzJdcxService.selectTsbzJdcxExport(tsbzJdcx);

35
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java
View File

@ -3,10 +3,12 @@ package com.ruoyi.web.controller.jxjs;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jxjs.domain.TsbzJxjsjbxx;
import com.ruoyi.jxjs.service.ITsbzJxjsjbxxService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.controller.common.SchoolCommonController;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@ -44,6 +46,8 @@ public class TsbzJdxController extends BaseController {
private ITsbzJxjsjbxxService tsbzJxjsjbxxService;
@Autowired
private ISysDeptService deptService;
@Autowired
private ISysUserService userService;
/**
* 查询基地校列表
@ -109,10 +113,10 @@ public class TsbzJdxController extends BaseController {
SysDept dept = new SysDept();
//设置schoolID为xxdm
dept.setSchoolid(tsbzJdx.getId());
dept = deptService.selectDeptList(dept).get(0);
dept.setDeptName(tsbzJdx.getJdxmc());
dept.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
deptService.updateDept(dept);
SysDept deptNew = deptService.selectDeptList(dept).get(0);
deptNew.setDeptName(tsbzJdx.getJdxmc());
deptNew.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
deptService.updateDept(deptNew);
return toAjax(tsbzJdxService.updateTsbzJdx(tsbzJdx));
}
@ -133,6 +137,29 @@ public class TsbzJdxController extends BaseController {
return AjaxResult.error("当前基地校已分配见习教师，无法删除");
}
}
//先判断是否允许删除dept部门
//检查是否允许删除
SysDept dept = null;
for (int i = 0; i < ids.length; i++) {
dept = new SysDept();
dept.setSchoolid(ids[i]);
dept = deptService.selectDeptList(dept).get(0);
SysUser user = new SysUser();
user.setDeptId(dept.getDeptId());
List<SysUser> list = userService.selectUserList(user);
if (list != null && list.size() > 0) {
return AjaxResult.error("当前选中的基地校存在用户数据，无法删除");
}
}
//删除过程
for (int i = 0; i < ids.length; i++) {
dept = new SysDept();
dept.setSchoolid(ids[i]);
dept = deptService.selectDeptList(dept).get(0);
deptService.deleteDeptById(dept.getDeptId());
}
return toAjax(tsbzJdxService.deleteTsbzJdxByIds(ids));
}
}

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.web.controller.jxjs;
import java.util.List;
import com.ruoyi.web.controller.common.SchoolCommonController;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -32,6 +33,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class TsbzJxjsjbxxController extends BaseController {
@Autowired
private ITsbzJxjsjbxxService tsbzJxjsjbxxService;
@Autowired
private SchoolCommonController schoolCommonController;
/**
* 查询见习教师基本信息列表，没有基地校的教师列表
@ -50,6 +53,12 @@ public class TsbzJxjsjbxxController extends BaseController {
@PreAuthorize("@ss.hasPermi('jxjs:jxjsjbxx:list')")
@GetMapping("/list")
public TableDataInfo list(TsbzJxjsjbxx tsbzJxjsjbxx) {
//首先判断是否为学校用户
String jdxId=schoolCommonController.deptIdToJdxId();
if(!schoolCommonController.isStringEmpty(jdxId)){
tsbzJxjsjbxx.setJdxid(jdxId);
}
startPage();
List<TsbzJxjsjbxx> list = tsbzJxjsjbxxService.selectTsbzJxjsjbxxList(tsbzJxjsjbxx);
return getDataTable(list);

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxpxfaController.java
View File

@ -37,7 +37,7 @@ public class TsbzJxzxpxfaController extends BaseController {
/**
* 查询见习之星评选方案列表
*/
@PreAuthorize("@ss.hasPermi('jxjs:jxzxpxfa:list')")
@PreAuthorize("@ss.hasPermi('jxjs:jxzxpxfa:list')"+ "||@ss.hasPermi('jxjs:jdcx:list')")
@GetMapping("/list")
public TableDataInfo list(TsbzJxzxpxfa tsbzJxzxpxfa) {
startPage();