Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 9b0abed6 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

隐患台账 指定整改人，选择部门筛选整改人，默认上报人当人登录人

parent 5d640131
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 64 deletions
danger-manage-admin/src/main/java/com/zehong/web/controller/hiddenDanger/TStaningBookController.java
View file @ 9b0abed6
......@@ -44,8 +44,9 @@ public class TStaningBookController extends BaseController
{
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
SysUser user = loginUser.getUser();
tStaningBook.setUserId(user.getUserId());
startPage();
List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getDeptId());
List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getRoles().get(0).getRoleId());
return getDataTable(list);
}
......@@ -60,7 +61,7 @@ public class TStaningBookController extends BaseController
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
SysUser user = loginUser.getUser();
startPage();
List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getDeptId());
List<TStaningBook> list = tStaningBookService.selectTStaningBookList(tStaningBook,user.getRoles().get(0).getRoleId());
ExcelUtil<TStaningBook> util = new ExcelUtil<TStaningBook>(TStaningBook.class);
return util.exportExcel(list, "隐患台账数据");
}
......@@ -83,6 +84,9 @@ public class TStaningBookController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody TStaningBook tStaningBook)
{
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
SysUser user = loginUser.getUser();
tStaningBook.setCreateId(user.getUserId());
return toAjax(tStaningBookService.insertTStaningBook(tStaningBook));
}
......
danger-manage-system/src/main/java/com/zehong/system/domain/TStaningBook.java
View file @ 9b0abed6
......@@ -145,6 +145,26 @@ public class TStaningBook extends BaseEntity
private List<Long> deptList;
private Long userId;
private Long createId;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getCreateId() {
return createId;
}
public void setCreateId(Long createId) {
this.createId = createId;
}
public List<Long> getDeptList() {
return deptList;
}
......
danger-manage-system/src/main/java/com/zehong/system/service/ITStaningBookService.java
View file @ 9b0abed6
......@@ -28,7 +28,7 @@ public interface ITStaningBookService
* @param tStaningBook 隐患台账
* @return 隐患台账集合
*/
public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long deptId);
public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long roleId);
/**
* 新增隐患台账
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/LedserviceImpl.java
View file @ 9b0abed6
......@@ -239,7 +239,7 @@ public class LedserviceImpl {
led.AddSinglelineTextToImageTextArea(hProgram,0,1,0,"上海灵信视觉","宋体",12,0xff,0,0,0,6,8,0);
//添加数字时钟节目
led.AddProgram(hProgram, 1, 0, 1);
led.AddDigitalClockArea(hProgram,1,1,0,0,ledWidth,ledHeight,"宋体",8,0xff,0,0,0,0,0,0,0,1,1,0,0,0xff,0,0xff,0,0xff,1);
led.AddDigitalClockArea(hProgram,1,1,0,0,ledWidth,ledHeight,"宋体",9,0xff,0,0,0,1,0,1,1,1,1,1,0,0xff,0,0xff,3,0xff,0);
int errCode = led.NetWorkSend(strIp, hProgram);
led.DeleteProgram(hProgram);
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaningBookServiceImpl.java
View file @ 9b0abed6
......@@ -51,13 +51,11 @@ public class TStaningBookServiceImpl implements ITStaningBookService
* @return 隐患台账
*/
@Override
public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long deptId)
public List<TStaningBook> selectTStaningBookList(TStaningBook tStaningBook,Long roleId)
{
List<Long> oneList = new ArrayList<>();
oneList.add(deptId);
List<Long> deptIds = selectDeptIds(new ArrayList<>(),oneList);
deptIds.add(deptId);
tStaningBook.setDeptList(deptIds);
if(roleId!=3){//当角色是管理员时候查询全部
tStaningBook.setUserId(0l);
}
List<TStaningBook> list = tStaningBookMapper.selectTStaningBookList(tStaningBook);
return list;
}
......
danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml
View file @ 9b0abed6
......@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="workId" column="work_id" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="createId" column="create_id" />
<result property="isDel" column="is_del" />
<result property="deptName" column="deptName" />
</resultMap>
......@@ -57,9 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dept d ON d.`dept_id` = b.`dept_id`
<where>
<foreach collection="deptList" item="deptId" open="AND b.dept_id in (" separator="," close=")">
#{deptId}
</foreach>
<if test="userId != null and userId != 0"> and (b.escalation=#{userId}||b.rectification = #{userId}||b.create_id = #{userId} ) </if>
<if test="troubleName != null and troubleName != ''"> and b.trouble_name like concat('%', #{troubleName}, '%')</if>
<if test="findTime != null "> and b.find_time &gt; #{findTime}</if>
<if test="rectificationTime != null "> and b.find_time &lt; #{rectificationTime}</if>
......@@ -103,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workId != null">work_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="createId != null">create_id,</if>
<if test="isDel != null">is_del,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
......@@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workId != null">#{workId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createId != null">#{createId},</if>
<if test="isDel != null">#{isDel},</if>
</trim>
</insert>
......@@ -169,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workId != null">work_id = #{workId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createId != null">create_id = #{createId},</if>
<if test="isDel != null">is_del = #{isDel},</if>
</trim>
where book_id = #{bookId}
......
danger-manage-web/src/views/system/book/index.vue
View file @ 9b0abed6
......@@ -98,7 +98,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-if="scope.row.state==0"
v-if="scope.row.state==0&&scope.row.rectification == user.userId"
size="mini"
type="text"
icon="el-icon-edit"
......@@ -106,7 +106,7 @@
v-hasPermi="['system:book:edit']"
>整改</el-button>
<el-button
v-if="scope.row.state==1"
v-if="scope.row.state==1&&(scope.row.escalation == user.userId||scope.row.createId == user.userId)"
size="mini"
type="text"
icon="el-icon-edit"
......@@ -231,17 +231,17 @@
</el-form-item>
<el-row :gutter="24" class="mb8">
<el-col :span="12">
<el-form-item label="责任部门" prop="deptId">
<!--<el-input v-model="form.deptId" placeholder="请输入部门id" />-->
<el-select v-model="form.deptId" filterable placeholder="请选择责任部门">
<el-option
v-for="dict in deptList"
:key="dict.deptId"
:label="dict.deptName"
:value="parseInt(dict.deptId)"
></el-option>
</el-select>
</el-form-item>
<!--<el-form-item label="责任部门" prop="deptId">-->
<!--&lt;!&ndash;<el-input v-model="form.deptId" placeholder="请输入部门id" />&ndash;&gt;-->
<!--<el-select v-model="form.deptId" filterable placeholder="请选择责任部门">-->
<!--<el-option-->
<!--v-for="dict in deptList"-->
<!--:key="dict.deptId"-->
<!--:label="dict.deptName"-->
<!--:value="parseInt(dict.deptId)"-->
<!--&gt;</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="整改时限" prop="rectificationTerm">
......@@ -257,20 +257,25 @@
<el-form-item label="整改建议" prop="proposal">
<el-input type="textarea" v-model="form.proposal" placeholder="请输入整改建议" />
</el-form-item>
<!--<el-form-item label="投入费用" prop="investmentCost" v-if="zhong==1">-->
<!--<el-input v-model="form.investmentCost" placeholder="请输入投入费用" />-->
<!--</el-form-item>-->
<!--<el-form-item label="投入物资" prop="investmentMaterial" v-if="zhong==1">-->
<!--<el-input v-model="form.investmentMaterial" placeholder="请输入投入物资" />-->
<!--</el-form-item>-->
<el-divider content-position="left" v-if="zhong==2||fast"><i class="el-icon-info"></i><span class="boxx">整改信息</span></el-divider>
<el-row :gutter="24" class="mb8">
<el-col :span="12">
<el-form-item label="整改人" prop="rectification" v-if="zhong==2||fast">
<el-form-item label="责任部门" prop="deptId">
<!--<el-input v-model="form.deptId" placeholder="请输入部门id" />-->
<el-select v-model="form.deptId" filterable placeholder="请选择责任部门" @change="switchDept()">
<el-option
v-for="dict in deptList"
:key="dict.deptId"
:label="dict.deptName"
:value="parseInt(dict.deptId)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改人" prop="rectification" >
<el-select v-model="form.rectification" filterable placeholder="请选择">
<el-option
v-for="item in staffList"
v-for="item in staffList2"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId">
......@@ -278,6 +283,28 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<!--<el-form-item label="投入费用" prop="investmentCost" v-if="zhong==1">-->
<!--<el-input v-model="form.investmentCost" placeholder="请输入投入费用" />-->
<!--</el-form-item>-->
<!--<el-form-item label="投入物资" prop="investmentMaterial" v-if="zhong==1">-->
<!--<el-input v-model="form.investmentMaterial" placeholder="请输入投入物资" />-->
<!--</el-form-item>-->
<el-divider content-position="left" v-if="zhong==2||fast"><i class="el-icon-info"></i><span class="boxx">整改信息</span></el-divider>
<el-row :gutter="24" class="mb8">
<!--<el-col :span="12">-->
<!--<el-form-item label="整改人" prop="rectification" v-if="zhong==2||fast">-->
<!--<el-select v-model="form.rectification" filterable placeholder="请选择">-->
<!--<el-option-->
<!--v-for="item in staffList2"-->
<!--:key="item.staffId"-->
<!--:label="item.staffName"-->
<!--:value="item.staffId">-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="12">
<el-form-item label="整改时间" prop="rectificationTime" v-if ="zhong==2||fast">
<el-date-picker clearable size="small"
......@@ -643,11 +670,39 @@
</span>
<span v-else>-</span>
</el-form-item>
<el-row :gutter="24" class="mb8">
<!--<el-col :span="12">-->
<!--<el-form-item label="责任部门" prop="deptId">-->
<!--&lt;!&ndash;<el-input v-model="form.deptId" placeholder="请输入部门id" />&ndash;&gt;-->
<!--<el-select v-model="form.deptId" filterable placeholder="请选择责任部门" disabled >-->
<!--<el-option-->
<!--v-for="dict in deptList"-->
<!--:key="dict.deptId"-->
<!--:label="dict.deptName"-->
<!--:value="parseInt(dict.deptId)"-->
<!--&gt;</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="12">
<el-form-item label="整改时限" prop="rectificationTerm">
<el-date-picker clearable size="small" disabled
v-model="form.rectificationTerm"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择整改时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="整改建议" prop="proposal">
<el-input type="textarea" v-model="form.proposal" placeholder="请输入整改建议" disabled/>
</el-form-item>
<el-row :gutter="24" class="mb8">
<el-col :span="12">
<el-form-item label="责任部门" prop="deptId">
<!--<el-input v-model="form.deptId" placeholder="请输入部门id" />-->
<el-select v-model="form.deptId" filterable placeholder="请选择责任部门" disabled>
<el-select v-model="form.deptId" filterable placeholder="请选择责任部门" disabled >
<el-option
v-for="dict in deptList"
:key="dict.deptId"
......@@ -658,19 +713,18 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改时限" prop="rectificationTerm">
<el-date-picker clearable size="small" disabled
v-model="form.rectificationTerm"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择整改时间">
</el-date-picker>
<el-form-item label="整改人" prop="rectification" >
<el-select v-model="form.rectification" filterable placeholder="请选择" disabled>
<el-option
v-for="item in staffList"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="整改建议" prop="proposal">
<el-input type="textarea" v-model="form.proposal" placeholder="请输入整改建议" disabled/>
</el-form-item>
<!--
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" disabled/>
......@@ -684,18 +738,7 @@
<!--</el-form-item>-->
<el-divider content-position="left" ><i class="el-icon-info"></i><span class="boxx">整改信息</span></el-divider>
<el-row :gutter="24" class="mb8">
<el-col :span="12">
<el-form-item label="整改人" prop="rectification" >
<el-select v-model="form.rectification" filterable placeholder="请选择" :disabled="disabled">
<el-option
v-for="item in staffList"
:key="item.staffId"
:label="item.staffName"
:value="item.staffId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改时间" prop="rectificationTime" >
<el-date-picker clearable size="small"
......@@ -792,6 +835,7 @@
import { listBook, getBook, delBook, addBook, updateBook, exportBook } from "@/api/system/book";
import { listDept } from "@/api/system/dept";
import { listStaff } from "@/api/safetyManagement/staff";
import { getUserProfile } from "@/api/system/user";
let uploadfile = require("@/assets/uploadfile.png");
export default {
name: "Book",
......@@ -801,6 +845,7 @@ export default {
data() {
return {
readOnly:false,
user:null,
disabled:false,
disabled2:false,
fast:false,
......@@ -862,6 +907,7 @@ export default {
staffName:""
},
staffList:[],
staffList2:[],
// 表单参数
form: {},
// 表单校验
......@@ -881,12 +927,15 @@ export default {
findTime: [
{ required: true, message: "上报时间不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "责任部门不能为空", trigger: "blur" }
],
// deptId: [
// { required: true, message: "责任部门不能为空", trigger: "blur" }
// ],
rectificationTerm:[
{ required: true, message: "整改时限不能为空", trigger: "blur" }
]
],
rectification:[
{ required: true, message: "整改人不能为空", trigger: "blur" }
],
}
};
},
......@@ -900,6 +949,9 @@ export default {
this.getDicts("t_trouble_level").then(response => {
this.troubleLevelOptions = response.data;
});
getUserProfile().then(response => {
this.user = response.data;
});
},
methods: {
/** 查询隐患台账列表 */
......@@ -914,11 +966,18 @@ export default {
checkFile(url) {
window.open(url,'_blank');
},
switchDept(){
//console.log(this.form.deptId);
listStaff({ pageNum: 1,pageSize: 99999,deptId:this.form.deptId}).then(response => {
this.staffList2 = response.rows;
});
},
/** 查询员工列表 */
getStaffList() {
this.loading = true;
listStaff(this.queryParams2).then(response => {
this.staffList = response.rows;
this.staffList2 = response.rows;
this.loading = false;
}
);
......@@ -961,7 +1020,7 @@ export default {
troubleLevel: null,
measures: null,
troubleHarm: null,
escalation: null,
escalation: this.user.userId,
findTime: null,
picture: null,
enclosure: null,
......@@ -1015,6 +1074,7 @@ export default {
this.reset();
this.open = true;
this.title = "添加隐患台账";
this.staffList2 = this.staffList;
},
handleFastAdd() {
this.reset();
......@@ -1022,6 +1082,7 @@ export default {
this.open = true;
this.title = "添加隐患台账";
this.zhong = 3;
this.staffList2 = this.staffList;
},
/** 修改按钮操作 */
......
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