Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 3bea4186 authored by 吴卿华's avatar 吴卿华
Browse files
Options

用户角色问题修改

parent cbc859c8
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 30 deletions
danger-manage-system/src/main/java/com/zehong/system/domain/TStaff.java
View file @ 3bea4186
package com.zehong.system.domain;
import java.util.Arrays;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
......@@ -17,6 +18,8 @@ public class TStaff extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**系统用户id*/
private Integer userId;
/** 员工id */
private Integer staffId;
......@@ -49,6 +52,9 @@ public class TStaff extends BaseEntity
/** 岗位id */
@Excel(name = "岗位id")
private Integer postId;
/** 角色组 */
private Long[] roleIds;
/** 角色id */
@Excel(name = "角色id")
......@@ -83,6 +89,22 @@ public class TStaff extends BaseEntity
@Excel(name = "删除标志", readConverterExp = "0=正常，1删除")
private String isDel;
public Long[] getRoleIds() {
return roleIds;
}
public void setRoleIds(Long[] roleIds) {
this.roleIds = roleIds;
}
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
......@@ -246,7 +268,8 @@ public class TStaff extends BaseEntity
@Override
public String toString() {
return "TStaff{" +
"staffId=" + staffId +
"userId=" + userId +
", staffId=" + staffId +
", userName='" + userName + '\'' +
", password='" + password + '\'' +
", staffName='" + staffName + '\'' +
......@@ -255,6 +278,7 @@ public class TStaff extends BaseEntity
", deptId=" + deptId +
", phonenumber='" + phonenumber + '\'' +
", postId=" + postId +
", roleIds=" + Arrays.toString(roleIds) +
", roleId=" + roleId +
", positionalTitles='" + positionalTitles + '\'' +
", profession='" + profession + '\'' +
......
danger-manage-system/src/main/java/com/zehong/system/domain/vo/TStaffVo.java
View file @ 3bea4186
......@@ -12,7 +12,7 @@ import java.util.Date;
/**
* 员工信息管理对象 t_staff
*
*
* @author zehong
* @date 2022-06-17
*/
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaffServiceImpl.java
View file @ 3bea4186
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.SysUserRole;
import com.zehong.system.domain.TStaff;
import com.zehong.system.domain.form.TStaffForm;
import com.zehong.system.domain.vo.TStaffVo;
import com.zehong.system.mapper.SysUserRoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TStaffMapper;
......@@ -12,19 +18,23 @@ import com.zehong.system.service.ITStaffService;
/**
* 员工信息管理Service业务层处理
*
*
* @author zehong
* @date 2022-06-17
*/
@Service
public class TStaffServiceImpl implements ITStaffService
public class TStaffServiceImpl implements ITStaffService
{
@Autowired
private TStaffMapper tStaffMapper;
@Autowired
private SysUserRoleMapper userRoleMapper;
/**
* 查询员工信息管理
*
*
* @param staffId 员工信息管理ID
* @return 员工信息管理
*/
......@@ -36,7 +46,7 @@ public class TStaffServiceImpl implements ITStaffService
/**
* 查询员工信息管理列表
*
*
* @param tStaff 员工信息管理
* @return 员工信息管理
*/
......@@ -48,7 +58,7 @@ public class TStaffServiceImpl implements ITStaffService
/**
* 新增员工信息管理
*
*
* @param tStaff 员工信息管理
* @return 结果
*/
......@@ -58,25 +68,32 @@ public class TStaffServiceImpl implements ITStaffService
String staffCode = tStaffMapper.getStaffCode();
tStaff.setStaffCode(staffCode);
tStaff.setCreateTime(DateUtils.getNowDate());
return tStaffMapper.insertTStaff(tStaff);
tStaffMapper.insertTStaff(tStaff);
// 新增用户与角色管理
insertUserRole(tStaff);
return tStaff.getStaffId();
}
/**
* 修改员工信息管理
*
*
* @param tStaff 员工信息管理
* @return 结果
*/
@Override
public int updateTStaff(TStaff tStaff)
{
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(Long.valueOf(tStaff.getStaffId()));
// 新增用户与角色管理
insertUserRole(tStaff);
tStaff.setUpdateTime(DateUtils.getNowDate());
return tStaffMapper.updateTStaff(tStaff);
}
/**
* 批量删除员工信息管理
*
*
* @param staffIds 需要删除的员工信息管理ID
* @return 结果
*/
......@@ -88,7 +105,7 @@ public class TStaffServiceImpl implements ITStaffService
/**
* 删除员工信息管理信息
*
*
* @param staffId 员工信息管理ID
* @return 结果
*/
......@@ -97,4 +114,30 @@ public class TStaffServiceImpl implements ITStaffService
{
return tStaffMapper.deleteTStaffById(staffId);
}
/**
* 新增用户角色信息
*
* @param user 用户对象
*/
public void insertUserRole(TStaff user)
{
Long[] roles = user.getRoleIds();
if (StringUtils.isNotNull(roles))
{
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
for (Long roleId : roles)
{
SysUserRole ur = new SysUserRole();
ur.setUserId(Long.valueOf(user.getStaffId()));
ur.setRoleId(roleId);
list.add(ur);
}
if (list.size() > 0)
{
userRoleMapper.batchUserRole(list);
}
}
}
}
danger-manage-system/src/main/resources/mapper/system/TContractorTrainResultMapper.xml
View file @ 3bea4186
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TContractorTrainResultMapper">
<resultMap type="TContractorTrainResult" id="TContractorTrainResultResult">
<result property="resultId" column="result_id" />
<result property="beyondUnit" column="beyond_unit" />
......@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTContractorTrainResultList" parameterType="TContractorTrainResult" resultMap="TContractorTrainResultResult">
<include refid="selectTContractorTrainResultVo"/>
<where>
<where>
<if test="beyondUnit != null and beyondUnit != ''"> and beyond_unit = #{beyondUnit}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="sex != null and sex != ''"> and sex = #{sex}</if>
......@@ -34,13 +34,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="score != null and score != ''"> and score = #{score}</if>
<if test="isQualified != null and isQualified != ''"> and is_qualified = #{isQualified}</if>
</where>
order by result_id desc
</select>
<select id="selectTContractorTrainResultById" parameterType="Long" resultMap="TContractorTrainResultResult">
<include refid="selectTContractorTrainResultVo"/>
where result_id = #{resultId}
</select>
<insert id="insertTContractorTrainResult" parameterType="TContractorTrainResult" useGeneratedKeys="true" keyProperty="resultId">
insert into t_contractor_train_result
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -94,9 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTContractorTrainResultByIds" parameterType="String">
delete from t_contractor_train_result where result_id in
delete from t_contractor_train_result where result_id in
<foreach item="resultId" collection="array" open="(" separator="," close=")">
#{resultId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml
View file @ 3bea4186
......@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where t.user_id = #{staffId}
</select>
<insert id="insertTStaff" parameterType="TStaff">
<insert id="insertTStaff" parameterType="TStaff" useGeneratedKeys = "true" keyProperty = "staffId">
insert into sys_user
<trim prefix="(" suffix=")" suffixOverrides=",">
user_staff,
......
danger-manage-web/src/views/educationPlanExam/visitorTestStat/index.vue
View file @ 3bea4186
......@@ -62,11 +62,11 @@
<span>{{ parseTime(scope.row.testEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="正确率" align="center" prop="score">
<template slot-scope="scope">
<span>{{Math.round(scope.row.score/topicNum* 100)}}%</span>
</template>
</el-table-column>
<!-- <el-table-column label="正确率" align="center" prop="score">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{Math.round(scope.row.score/topicNum* 100)}}%</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="是否合格" align="center" prop="isQualified">
<template slot-scope="scope">
<span v-if="scope.row.isQualified == '0'">合格</span>
......
danger-manage-web/src/views/safetyManagement/staff/index.vue
View file @ 3bea4186
......@@ -150,7 +150,7 @@
</el-col>
</el-row>
<!-- 添加或修改参数配置对话框 -->
<!-- 添加参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
......@@ -238,7 +238,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="角色">
<el-select v-model="form.roleId" placeholder="请选择角色" style="width: 100%">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
......@@ -249,6 +249,9 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
......@@ -294,7 +297,151 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="opens" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="姓名" prop="staffName">
<el-input v-model="form.staffName" placeholder="请输入员工姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别" prop="sex" label-width="140px">
<el-select v-model="form.sex" placeholder="请选择员工性别" style="width: 100%">
<el-option
v-for="dict in sexOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId" label-width="140px">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="岗位" prop="postId">
<el-select v-model="form.postId" placeholder="请选择岗位" style="width: 100%">
<el-option
v-for="item in postOptions"
:key="item.postId"
:label="item.postName"
:value="item.postId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="职称" prop="positionalTitles" label-width="140px">
<el-input v-model="form.positionalTitles" placeholder="请输入员工职称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="工种" prop="profession">
<el-input v-model="form.profession" placeholder="请输入员工工种" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否为特种作业人员" label-width="140px">
<el-select v-model="form.specialOperators" placeholder="请选择是否为特种作业人员" style="width: 100%">
<el-option
v-for="dict in specialOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<!-- <el-form-item label="角色">-->
<!-- <el-select v-model="form.roleId" placeholder="请选择角色" style="width: 100%">-->
<!-- <el-option-->
<!-- v-for="item in roleOptions"-->
<!-- :key="item.roleId"-->
<!-- :label="item.roleName"-->
<!-- :value="item.roleId"-->
<!-- :disabled="item.status == 1"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="证书照片" prop="certificateUrl">
<MyFileUpload
listType="picture-card"
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileList"
/>
<el-input v-show="false" disabled v-model="form.certificateUrl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="证书名称" prop="certificateName">
<el-input v-model="form.certificateName" placeholder="请输入证书名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证书有效日期" prop="effectiveDate" label-width="140px">
<el-date-picker clearable
v-model="form.effectiveDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择证书有效日期"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注信息"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -303,6 +450,7 @@ import { listStaff, getStaff, delStaff, addStaff, updateStaff, exportStaff } fro
import { treeselect } from "@/api/system/dept";
import MyFileUpload from '@/components/MyFileUpload';
import Treeselect from "@riophae/vue-treeselect";
import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
......@@ -333,6 +481,8 @@ export default {
deptOptions: undefined,
// 是否显示弹出层
open: false,
// 修改是否显示弹出层
opens: false,
openDetail: false,
// 部门名称
deptName: undefined,
......@@ -431,6 +581,7 @@ export default {
// 取消按钮
cancel() {
this.open = false;
this.opens = false;
this.reset();
},
cancelDetail() {
......@@ -495,7 +646,13 @@ export default {
this.getTreeselect();
// this.open = true;
// this.title = "添加员工信息";
getStaff().then(response => {
// getStaff().then(response => {
// this.postOptions = response.posts;
// this.roleOptions = response.roles;
// this.open = true;
// this.title = "添加员工信息";
// });
getUser().then(response => {
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.open = true;
......@@ -507,16 +664,18 @@ export default {
this.reset();
this.getTreeselect();
const staffId = row.staffId || this.ids;
getUser().then(response => {
this.roleOptions = response.roles;
});
getStaff(staffId).then(response => {
this.form = response.data;
this.postOptions = response.posts;
this.roleOptions = response.roles;
if (this.form.certificateUrl) {
this.fileList.push({
url: this.form.certificateUrl,
});
}
this.open = true;
this.opens = true;
this.title = "修改员工信息";
});
},
......@@ -524,11 +683,10 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
console.log("this.form",this.form)
if (this.form.staffId != null) {
updateStaff(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.opens = false;
this.getList();
});
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment