From 75a8d6112f87563904df7fa422d9c5ea73eb305f Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Fri, 4 Sep 2020 15:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E6=A0=A1=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=E8=A7=81=E4=B9=A0=E4=B9=8B=E6=98=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E5=9F=BA=E5=9C=B0=E5=88=9D=E9=80=89?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SchoolCommonController.java | 50 +++++++++++++++++++ .../controller/jxjs/TsbzJdcxController.java | 6 +++ .../controller/jxjs/TsbzJdxController.java | 35 +++++++++++-- .../jxjs/TsbzJxjsjbxxController.java | 9 ++++ .../jxjs/TsbzJxzxpxfaController.java | 2 +- .../java/com/ruoyi/jxjs/domain/TsbzJdcx.java | 15 +++++- .../resources/mapper/jxjs/TsbzJdcxMapper.xml | 4 +- .../resources/mapper/system/SysDeptMapper.xml | 3 ++ ruoyi-ui/src/views/jxjs/jdxcx/index.vue | 23 +++++---- ruoyi-ui/src/views/jxjs/jxjsjbxx/index.vue | 4 +- ruoyi-ui/src/views/system/dept/index.vue | 1 + 11 files changed, 133 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java index 115f3253d..b41f708ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SchoolCommonController.java @@ -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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java index 7e2b5e855..6172f88e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java @@ -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 list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx); List list = tsbzJdcxService.selectTsbzJdcxExport(tsbzJdcx); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java index b974bd8ff..4d2f46fe5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdxController.java @@ -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 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)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java index a7742db10..f091dd081 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java @@ -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 list = tsbzJxjsjbxxService.selectTsbzJxjsjbxxList(tsbzJxjsjbxx); return getDataTable(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxpxfaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxpxfaController.java index 933bfb526..96f293145 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxpxfaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxpxfaController.java @@ -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(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java index 7ba752a09..124a37853 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java @@ -172,6 +172,9 @@ public class TsbzJdcx extends BaseEntity { @Excel(name = "面试综合得分", type = Type.IMPORT) private BigDecimal zhdf2; + //基地校id + private String jdxid; + public String getFaname() { return faname; @@ -421,6 +424,14 @@ public class TsbzJdcx extends BaseEntity { return lqzt; } + public String getJdxid() { + return jdxid; + } + + public void setJdxid(String jdxid) { + this.jdxid = jdxid; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -447,8 +458,8 @@ public class TsbzJdcx extends BaseEntity { .append("msjgmnktjxdf", getMsjgmnktjxdf()) .append("yjdf", getYjdf()) .append("zhdf2", getZhdf2()) - .append("lqzt", getLqzt() - ) + .append("lqzt", getLqzt()) + .append("jdxid", getJdxid()) .toString(); } } diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml index 5d87254bb..2702553af 100644 --- a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -164,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index cb4f5c09d..c4d68b553 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -40,6 +40,9 @@ AND status = #{status} + + AND schoolid = #{schoolid} + ${params.dataScope} order by d.parent_id, d.order_num diff --git a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue index 12709f92d..e04c23596 100644 --- a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue +++ b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue @@ -166,9 +166,11 @@ import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa"; import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx"; export default { - name: "Jdcx", + name: "Jdxcx", data() { return { + //默认选中方案id + defaultFaId: "", isable: false, isCheck: true, checkAll: false, @@ -231,7 +233,7 @@ export default { }, // 查询参数 queryParams_fa: { - fazt: null, + fazt: "1", }, // 表单参数 form: {}, @@ -249,7 +251,6 @@ export default { }, created() { this.getFaList(); - this.getList(); this.getJsList(); this.getDicts("sys_dm_shzt").then((response) => { this.dqztOptions = response.data; @@ -293,10 +294,13 @@ export default { }); return actions.join(""); }, - getFaList() { - this.queryParams_fa.fazt = "1"; - listJxzxpxfa(this.queryParams_fa).then((response) => { + async getFaList() { + await listJxzxpxfa(this.queryParams_fa).then((response) => { this.faOptions = response.rows; + this.defaultFaId = response.rows[0].id; + this.queryParams.faid = this.defaultFaId; + + this.getList(); }); }, getJsList() { @@ -355,6 +359,7 @@ export default { }; this.resetForm("form"); + this.form.faid = this.defaultFaId; this.checkedJss = []; }, /** 搜索按钮操作 */ @@ -365,6 +370,7 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.queryParams.faid = this.defaultFaId; this.handleQuery(); }, // 多选框选中数据 @@ -392,7 +398,6 @@ export default { this.form = response.data; listJxjsjbxx(null).then((response) => { this.jss = response.rows; - }); this.checkedJss.push(response.data.jsid); this.open = true; @@ -427,7 +432,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$confirm( - '是否确认删除基地校初级审核编号为"' + ids + '"的数据项?', + '是否确认删除基地校初级审核数据项?', "警告", { confirmButtonText: "确定", @@ -448,7 +453,7 @@ export default { handleCheck(row) { const ids = row.id || this.ids; this.$confirm( - '确认提交基地校初级审核编号为"' + ids + '"的数据项?', + '确认提交基地校初级审核数据项?提交后数据不能维护', "警告", { confirmButtonText: "确定", diff --git a/ruoyi-ui/src/views/jxjs/jxjsjbxx/index.vue b/ruoyi-ui/src/views/jxjs/jxjsjbxx/index.vue index 76a2b75fb..ebfde4078 100644 --- a/ruoyi-ui/src/views/jxjs/jxjsjbxx/index.vue +++ b/ruoyi-ui/src/views/jxjs/jxjsjbxx/index.vue @@ -234,8 +234,8 @@ /> - - + + diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index 30f9f5562..9859369d5 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/ruoyi-ui/src/views/system/dept/index.vue @@ -66,6 +66,7 @@ >修改