Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 909ec438 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

法律法规管理修改 gengdidi

parent a1787912
Show whitespace changes
Inline Side-by-side
Showing with 189 additions and 70 deletions
danger-manage-system/src/main/java/com/zehong/system/domain/TEnterpriseSystem.java
View file @ 909ec438
...@@ -6,10 +6,10 @@ import com.zehong.common.annotation.Excel; ...@@ -6,10 +6,10 @@ import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity; import com.zehong.common.core.domain.BaseEntity;
/** /**
* 企业制度管理对象 t_enterprise_system * 企业制度对象 t_enterprise_system
* *
* @author zehong * @author zehong
* @date 2022-06-21 * @date 2022-10-06
*/ */
public class TEnterpriseSystem extends BaseEntity public class TEnterpriseSystem extends BaseEntity
{ {
...@@ -18,14 +18,30 @@ public class TEnterpriseSystem extends BaseEntity ...@@ -18,14 +18,30 @@ public class TEnterpriseSystem extends BaseEntity
/** 制度id */ /** 制度id */
private Long systemId; private Long systemId;
/** 预案标题 */ /** 制度标题 */
@Excel(name = "预案标题") @Excel(name = "制度标题")
private String systemTitle; private String systemTitle;
/** 制度类型（1企业规章制度，2法律法规） */ /** 制度类型（1企业规章制度，2法律法规） */
@Excel(name = "制度类型", readConverterExp = "1=企业规章制度，2法律法规") @Excel(name = "制度类型", readConverterExp = "1=企业规章制度，2法律法规")
private String systemType; private String systemType;
/** 层级：1.国家法律 2.行政法规 3.部委规章 4.地方性法规 5.国家标准 6.行业标准 7.地方标准 8.国际通用规则 9.政策解读 10.其他 */
@Excel(name = "层级：1.国家法律 2.行政法规 3.部委规章 4.地方性法规 5.国家标准 6.行业标准 7.地方标准 8.国际通用规则 9.政策解读 10.其他")
private String hierarchy;
/** 文号 */
@Excel(name = "文号")
private String referenceNum;
/** 颁布部门 */
@Excel(name = "颁布部门")
private String issueDept;
/** 有效性：1.现行有效 2.尚未实施 3.废除 4.废止 */
@Excel(name = "有效性：1.现行有效 2.尚未实施 3.废除 4.废止")
private String availability;
/** 内容分类（仅用于企业规章制度分类） */ /** 内容分类（仅用于企业规章制度分类） */
@Excel(name = "内容分类", readConverterExp = "仅=用于企业规章制度分类") @Excel(name = "内容分类", readConverterExp = "仅=用于企业规章制度分类")
private String contentType; private String contentType;
...@@ -42,14 +58,14 @@ public class TEnterpriseSystem extends BaseEntity ...@@ -42,14 +58,14 @@ public class TEnterpriseSystem extends BaseEntity
@Excel(name = "文件路径") @Excel(name = "文件路径")
private String fileUrl; private String fileUrl;
/** 状态（0待发布，1待审批，2审批通过，3作废） */
@Excel(name = "状态", readConverterExp = "0=待发布，1待审批，2审批通过，3作废")
private String status;
/** 是否删除(0正常，1删除) */ /** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)") @Excel(name = "是否删除(0正常，1删除)")
private String isDel; private String isDel;
/** 状态 */
@Excel(name = "状态")
private String status;
public void setSystemId(Long systemId) public void setSystemId(Long systemId)
{ {
this.systemId = systemId; this.systemId = systemId;
...@@ -77,6 +93,42 @@ public class TEnterpriseSystem extends BaseEntity ...@@ -77,6 +93,42 @@ public class TEnterpriseSystem extends BaseEntity
{ {
return systemType; return systemType;
} }
public void setHierarchy(String hierarchy)
{
this.hierarchy = hierarchy;
}
public String getHierarchy()
{
return hierarchy;
}
public void setReferenceNum(String referenceNum)
{
this.referenceNum = referenceNum;
}
public String getReferenceNum()
{
return referenceNum;
}
public void setIssueDept(String issueDept)
{
this.issueDept = issueDept;
}
public String getIssueDept()
{
return issueDept;
}
public void setAvailability(String availability)
{
this.availability = availability;
}
public String getAvailability()
{
return availability;
}
public void setContentType(String contentType) public void setContentType(String contentType)
{ {
this.contentType = contentType; this.contentType = contentType;
...@@ -113,23 +165,23 @@ public class TEnterpriseSystem extends BaseEntity ...@@ -113,23 +165,23 @@ public class TEnterpriseSystem extends BaseEntity
{ {
return fileUrl; return fileUrl;
} }
public void setIsDel(String isDel) public void setStatus(String status)
{ {
this.isDel = isDel; this.status = status;
} }
public String getIsDel() public String getStatus()
{ {
return isDel; return status;
} }
public void setStatus(String status) public void setIsDel(String isDel)
{ {
this.status = status; this.isDel = isDel;
} }
public String getStatus() public String getIsDel()
{ {
return status; return isDel;
} }
@Override @Override
...@@ -138,6 +190,10 @@ public class TEnterpriseSystem extends BaseEntity ...@@ -138,6 +190,10 @@ public class TEnterpriseSystem extends BaseEntity
.append("systemId", getSystemId()) .append("systemId", getSystemId())
.append("systemTitle", getSystemTitle()) .append("systemTitle", getSystemTitle())
.append("systemType", getSystemType()) .append("systemType", getSystemType())
.append("hierarchy", getHierarchy())
.append("referenceNum", getReferenceNum())
.append("issueDept", getIssueDept())
.append("availability", getAvailability())
.append("contentType", getContentType()) .append("contentType", getContentType())
.append("content", getContent()) .append("content", getContent())
.append("fileName", getFileName()) .append("fileName", getFileName())
...@@ -146,8 +202,8 @@ public class TEnterpriseSystem extends BaseEntity ...@@ -146,8 +202,8 @@ public class TEnterpriseSystem extends BaseEntity
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("status", getStatus()) .append("status", getStatus())
.append("isDel", getIsDel())
.append("remark", getRemark()) .append("remark", getRemark())
.toString(); .toString();
} }
......
danger-manage-system/src/main/resources/mapper/system/TEnterpriseSystemMapper.xml
View file @ 909ec438
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TEnterpriseSystemMapper"> <mapper namespace="com.zehong.system.mapper.TEnterpriseSystemMapper">
<resultMap type="TEnterpriseSystem" id="TEnterpriseSystemResult"> <resultMap type="TEnterpriseSystem" id="TEnterpriseSystemResult">
<result property="systemId" column="system_id" /> <result property="systemId" column="system_id" />
<result property="systemTitle" column="system_title" /> <result property="systemTitle" column="system_title" />
<result property="systemType" column="system_type" /> <result property="systemType" column="system_type" />
<result property="hierarchy" column="hierarchy" />
<result property="referenceNum" column="reference_num" />
<result property="issueDept" column="issue_dept" />
<result property="availability" column="availability" />
<result property="contentType" column="content_type" /> <result property="contentType" column="content_type" />
<result property="content" column="content" /> <result property="content" column="content" />
<result property="fileName" column="file_name" /> <result property="fileName" column="file_name" />
...@@ -16,31 +20,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -16,31 +20,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="isDel" column="is_del" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="isDel" column="is_del" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
</resultMap> </resultMap>
<sql id="selectTEnterpriseSystemVo"> <sql id="selectTEnterpriseSystemVo">
select system_id, system_title, system_type, content_type, content, file_name, file_url, create_by, create_time, update_by, update_time, is_del, status, remark from t_enterprise_system select system_id, system_title, system_type, hierarchy, reference_num, issue_dept, availability, content_type, content, file_name, file_url, create_by, create_time, update_by, update_time, status, is_del, remark from t_enterprise_system
</sql> </sql>
<select id="selectTEnterpriseSystemList" parameterType="TEnterpriseSystem" resultMap="TEnterpriseSystemResult"> <select id="selectTEnterpriseSystemList" parameterType="TEnterpriseSystem" resultMap="TEnterpriseSystemResult">
<include refid="selectTEnterpriseSystemVo"/> <include refid="selectTEnterpriseSystemVo"/>
<where> is_del = '0' <where>
<if test="systemTitle != null and systemTitle != ''"> and system_title like concat('%', #{systemTitle}, '%')</if> <if test="systemTitle != null and systemTitle != ''"> and system_title = #{systemTitle}</if>
<if test="systemType != null and systemType != ''"> and system_type = #{systemType}</if> <if test="systemType != null and systemType != ''"> and system_type = #{systemType}</if>
<if test="hierarchy != null and hierarchy != ''"> and hierarchy = #{hierarchy}</if>
<if test="referenceNum != null and referenceNum != ''"> and reference_num = #{referenceNum}</if>
<if test="issueDept != null and issueDept != ''"> and issue_dept = #{issueDept}</if>
<if test="availability != null and availability != ''"> and availability = #{availability}</if>
<if test="contentType != null and contentType != ''"> and content_type = #{contentType}</if> <if test="contentType != null and contentType != ''"> and content_type = #{contentType}</if>
<if test="content != null and content != ''"> and content = #{content}</if> <if test="content != null and content != ''"> and content = #{content}</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if> <if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if> <if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="status != null and status != ''"> and status = #{status}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where> </where>
</select> </select>
...@@ -54,6 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -54,6 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="systemTitle != null">system_title,</if> <if test="systemTitle != null">system_title,</if>
<if test="systemType != null">system_type,</if> <if test="systemType != null">system_type,</if>
<if test="hierarchy != null">hierarchy,</if>
<if test="referenceNum != null">reference_num,</if>
<if test="issueDept != null">issue_dept,</if>
<if test="availability != null">availability,</if>
<if test="contentType != null">content_type,</if> <if test="contentType != null">content_type,</if>
<if test="content != null">content,</if> <if test="content != null">content,</if>
<if test="fileName != null">file_name,</if> <if test="fileName != null">file_name,</if>
...@@ -62,13 +69,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -62,13 +69,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="isDel != null">is_del,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="isDel != null">is_del,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemTitle != null">#{systemTitle},</if> <if test="systemTitle != null">#{systemTitle},</if>
<if test="systemType != null">#{systemType},</if> <if test="systemType != null">#{systemType},</if>
<if test="hierarchy != null">#{hierarchy},</if>
<if test="referenceNum != null">#{referenceNum},</if>
<if test="issueDept != null">#{issueDept},</if>
<if test="availability != null">#{availability},</if>
<if test="contentType != null">#{contentType},</if> <if test="contentType != null">#{contentType},</if>
<if test="content != null">#{content},</if> <if test="content != null">#{content},</if>
<if test="fileName != null">#{fileName},</if> <if test="fileName != null">#{fileName},</if>
...@@ -77,8 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -77,8 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="isDel != null">#{isDel},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
</trim> </trim>
</insert> </insert>
...@@ -88,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -88,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="systemTitle != null">system_title = #{systemTitle},</if> <if test="systemTitle != null">system_title = #{systemTitle},</if>
<if test="systemType != null">system_type = #{systemType},</if> <if test="systemType != null">system_type = #{systemType},</if>
<if test="hierarchy != null">hierarchy = #{hierarchy},</if>
<if test="referenceNum != null">reference_num = #{referenceNum},</if>
<if test="issueDept != null">issue_dept = #{issueDept},</if>
<if test="availability != null">availability = #{availability},</if>
<if test="contentType != null">content_type = #{contentType},</if> <if test="contentType != null">content_type = #{contentType},</if>
<if test="content != null">content = #{content},</if> <if test="content != null">content = #{content},</if>
<if test="fileName != null">file_name = #{fileName},</if> <if test="fileName != null">file_name = #{fileName},</if>
...@@ -96,8 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -96,8 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
</trim> </trim>
where system_id = #{systemId} where system_id = #{systemId}
......
danger-manage-web/src/components/FileUpload/index.vue
View file @ 909ec438
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
// 大小限制(MB) // 大小限制(MB)
fileSize: { fileSize: {
type: Number, type: Number,
default: 5, default: 50,
}, },
fileArr: { fileArr: {
type: Array, type: Array,
......
danger-manage-web/src/views/safetyManagement/laws/index.vue
View file @ 909ec438
...@@ -53,6 +53,10 @@ ...@@ -53,6 +53,10 @@
<el-table v-loading="loading" :data="enterpriseSystemList" > <el-table v-loading="loading" :data="enterpriseSystemList" >
<el-table-column label="法律法规标题" align="center" prop="systemTitle" /> <el-table-column label="法律法规标题" align="center" prop="systemTitle" />
<el-table-column label="颁布部门" align="center" prop="issueDept" />
<el-table-column label="文号" align="center" prop="referenceNum" />
<el-table-column label="层级" align="center" prop="hierarchy" :formatter="hierarchyFormat"/>
<el-table-column label="有效性" align="center" prop="availability" :formatter="availabilityFormat"/>
<el-table-column label="附件" align="center" prop="fileUrl" width="260px"> <el-table-column label="附件" align="center" prop="fileUrl" width="260px">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
...@@ -125,6 +129,32 @@ ...@@ -125,6 +129,32 @@
<el-form-item label="法律法规标题" prop="systemTitle"> <el-form-item label="法律法规标题" prop="systemTitle">
<el-input v-model="form.systemTitle" placeholder="请输入法律法规标题" :disabled="readOnly"/> <el-input v-model="form.systemTitle" placeholder="请输入法律法规标题" :disabled="readOnly"/>
</el-form-item> </el-form-item>
<el-form-item label="层级" prop="hierarchy">
<el-select v-model="form.hierarchy" placeholder="请选择层级" clearable size="small" :disabled="readOnly" style="width: 100%">
<el-option
v-for = "dict in hierarchys"
:key = "dict.dictValue"
:label = "dict.dictLabel"
:value = "dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="文号" prop="referenceNum">
<el-input v-model="form.referenceNum" placeholder="请输入文号" :disabled="readOnly"/>
</el-form-item>
<el-form-item label="颁布部门" prop="issueDept">
<el-input v-model="form.issueDept" placeholder="请输入颁布部门" :disabled="readOnly"/>
</el-form-item>
<el-form-item label="有效性" prop="availability">
<el-select v-model="form.availability" placeholder="请选择有效性" clearable size="small" :disabled="readOnly" style="width: 100%">
<el-option
v-for = "dict in availabilitys"
:key = "dict.dictValue"
:label = "dict.dictLabel"
:value = "dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" :disabled="readOnly" /> <el-input v-model="form.remark" placeholder="请输入备注" :disabled="readOnly" />
</el-form-item> </el-form-item>
...@@ -214,7 +244,7 @@ export default { ...@@ -214,7 +244,7 @@ export default {
systemType: '2', systemType: '2',
systemTitle: null, systemTitle: null,
content: null, content: null,
isDel: null, isDel: '0',
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -223,7 +253,12 @@ export default { ...@@ -223,7 +253,12 @@ export default {
systemTitle: [ systemTitle: [
{ required: true, message: "标题不能为空", trigger: "blur" } { required: true, message: "标题不能为空", trigger: "blur" }
], ],
} hierarchy: [
{ required: true, message: "请选择层级", trigger: "change" }
],
},
hierarchys:[],
availabilitys:[]
}; };
}, },
created() { created() {
...@@ -231,6 +266,13 @@ export default { ...@@ -231,6 +266,13 @@ export default {
this.getDicts("t_enterprise_system_status").then(response =>{ this.getDicts("t_enterprise_system_status").then(response =>{
this.statusOptions = response.data; this.statusOptions = response.data;
}) })
this.getDicts("t_hierarchy").then(response =>{
this.hierarchys = response.data;
})
this.getDicts("t_availability").then(response =>{
this.availabilitys = response.data;
})
}, },
methods: { methods: {
// 状态 // 状态
...@@ -429,6 +471,12 @@ export default { ...@@ -429,6 +471,12 @@ export default {
checkFile(url) { checkFile(url) {
window.open(url,'_blank'); window.open(url,'_blank');
}, },
hierarchyFormat(row,colum){
return this.selectDictLabel(this.hierarchys, row.hierarchy);
},
availabilityFormat(row,colum){
return this.selectDictLabel(this.availabilitys, row.availability);
}
} }
}; };
</script> </script>
......
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