Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
3b08e4b5
Commit
3b08e4b5
authored
2 years ago
by
zhangjianqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重新做隐患台账,修改隐患排查
parent
076b02f8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1016 additions
and
136 deletions
+1016
-136
TStaningBook.java
.../src/main/java/com/zehong/system/domain/TStaningBook.java
+280
-8
TStaningBookServiceImpl.java
...m/zehong/system/service/impl/TStaningBookServiceImpl.java
+8
-8
TStaningBookMapper.xml
...m/src/main/resources/mapper/system/TStaningBookMapper.xml
+87
-13
index.vue
danger-manage-web/src/views/system/book/index.vue
+629
-95
index.vue
danger-manage-web/src/views/system/workCheck/index.vue
+12
-12
No files found.
danger-manage-system/src/main/java/com/zehong/system/domain/TStaningBook.java
View file @
3b08e4b5
package
com
.
zehong
.
system
.
domain
;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.zehong.common.annotation.Excel
;
import
com.zehong.common.core.domain.BaseEntity
;
import
org.springframework.format.annotation.DateTimeFormat
;
/**
* 隐患台账对象 t_staning_book
*
* @author zehong
* @date 2022-
07-11
* @date 2022-
10-07
*/
public
class
TStaningBook
extends
BaseEntity
{
...
...
@@ -34,18 +37,96 @@ public class TStaningBook extends BaseEntity
@Excel
(
name
=
"隐患描述"
)
private
String
measures
;
/** 完成用时 */
@Excel
(
name
=
"完成用时"
)
/** 隐患危害 */
@Excel
(
name
=
"隐患危害"
)
private
String
troubleHarm
;
/** 隐患上报人 */
@Excel
(
name
=
"隐患上报人"
)
private
Long
escalation
;
private
String
escalationName
;
/** 隐患上报时间 */
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Excel
(
name
=
"隐患上报时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
findTime
;
/** 现场照片 */
@Excel
(
name
=
"现场照片"
)
private
String
picture
;
/** 隐患附件 */
@Excel
(
name
=
"隐患附件"
)
private
String
enclosure
;
/** 整改建议 */
@Excel
(
name
=
"整改建议"
)
private
String
proposal
;
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
rectificationTerm
;
/** 投入费用 */
@Excel
(
name
=
"投入费用"
)
private
String
investmentCost
;
/** 投入物资 */
@Excel
(
name
=
"投入物资"
)
private
String
investmentMaterial
;
/** 整改人 */
@Excel
(
name
=
"整改人"
)
private
Long
rectification
;
private
String
rectificationName
;
/** 整改后图片 */
@Excel
(
name
=
"整改后图片"
)
private
String
rectificationPictrue
;
/** 整改描述 */
@Excel
(
name
=
"整改描述"
)
private
String
rectificationText
;
/** 整改时间 */
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Excel
(
name
=
"整改时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
rectificationTime
;
/** 备注 */
@Excel
(
name
=
"备注"
)
private
String
remarks
;
/** 完成时间 */
@Excel
(
name
=
"完成时间"
)
private
Long
finishDay
;
/** 复查结果 */
@Excel
(
name
=
"复查结果"
)
/** 复查图片 */
@Excel
(
name
=
"复查图片"
)
private
String
inspectPictrue
;
/** 复查时间 */
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Excel
(
name
=
"复查时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
inspectTime
;
/** 复查结果描述 */
@Excel
(
name
=
"复查结果描述"
)
private
String
inspectResult
;
/**
责任
人 */
@Excel
(
name
=
"
责任
人"
)
/**
复查
人 */
@Excel
(
name
=
"
复查
人"
)
private
Long
personLiable
;
private
String
personLiableName
;
/** 隐患状态 */
@Excel
(
name
=
"隐患状态 "
)
private
Integer
state
;
/** 部门id */
@Excel
(
name
=
"部门id"
)
private
Long
deptId
;
...
...
@@ -57,9 +138,40 @@ public class TStaningBook extends BaseEntity
private
Long
workId
;
/** 删除 0否 1是 */
@Excel
(
name
=
"删除 0否 1是"
)
private
Integer
isDel
;
public
String
getEscalationName
()
{
return
escalationName
;
}
public
void
setEscalationName
(
String
escalationName
)
{
this
.
escalationName
=
escalationName
;
}
public
String
getRectificationName
()
{
return
rectificationName
;
}
public
void
setRectificationName
(
String
rectificationName
)
{
this
.
rectificationName
=
rectificationName
;
}
public
String
getPersonLiableName
()
{
return
personLiableName
;
}
public
void
setPersonLiableName
(
String
personLiableName
)
{
this
.
personLiableName
=
personLiableName
;
}
public
Date
getRectificationTerm
()
{
return
rectificationTerm
;
}
public
void
setRectificationTerm
(
Date
rectificationTerm
)
{
this
.
rectificationTerm
=
rectificationTerm
;
}
public
String
getDeptName
()
{
return
deptName
;
}
...
...
@@ -113,6 +225,123 @@ public class TStaningBook extends BaseEntity
{
return
measures
;
}
public
void
setTroubleHarm
(
String
troubleHarm
)
{
this
.
troubleHarm
=
troubleHarm
;
}
public
String
getTroubleHarm
()
{
return
troubleHarm
;
}
public
void
setEscalation
(
Long
escalation
)
{
this
.
escalation
=
escalation
;
}
public
Long
getEscalation
()
{
return
escalation
;
}
public
void
setFindTime
(
Date
findTime
)
{
this
.
findTime
=
findTime
;
}
public
Date
getFindTime
()
{
return
findTime
;
}
public
void
setPicture
(
String
picture
)
{
this
.
picture
=
picture
;
}
public
String
getPicture
()
{
return
picture
;
}
public
void
setEnclosure
(
String
enclosure
)
{
this
.
enclosure
=
enclosure
;
}
public
String
getEnclosure
()
{
return
enclosure
;
}
public
void
setProposal
(
String
proposal
)
{
this
.
proposal
=
proposal
;
}
public
String
getProposal
()
{
return
proposal
;
}
public
void
setInvestmentCost
(
String
investmentCost
)
{
this
.
investmentCost
=
investmentCost
;
}
public
String
getInvestmentCost
()
{
return
investmentCost
;
}
public
void
setInvestmentMaterial
(
String
investmentMaterial
)
{
this
.
investmentMaterial
=
investmentMaterial
;
}
public
String
getInvestmentMaterial
()
{
return
investmentMaterial
;
}
public
void
setRectification
(
Long
rectification
)
{
this
.
rectification
=
rectification
;
}
public
Long
getRectification
()
{
return
rectification
;
}
public
void
setRectificationPictrue
(
String
rectificationPictrue
)
{
this
.
rectificationPictrue
=
rectificationPictrue
;
}
public
String
getRectificationPictrue
()
{
return
rectificationPictrue
;
}
public
void
setRectificationText
(
String
rectificationText
)
{
this
.
rectificationText
=
rectificationText
;
}
public
String
getRectificationText
()
{
return
rectificationText
;
}
public
void
setRectificationTime
(
Date
rectificationTime
)
{
this
.
rectificationTime
=
rectificationTime
;
}
public
Date
getRectificationTime
()
{
return
rectificationTime
;
}
public
void
setRemarks
(
String
remarks
)
{
this
.
remarks
=
remarks
;
}
public
String
getRemarks
()
{
return
remarks
;
}
public
void
setFinishDay
(
Long
finishDay
)
{
this
.
finishDay
=
finishDay
;
...
...
@@ -122,6 +351,24 @@ public class TStaningBook extends BaseEntity
{
return
finishDay
;
}
public
void
setInspectPictrue
(
String
inspectPictrue
)
{
this
.
inspectPictrue
=
inspectPictrue
;
}
public
String
getInspectPictrue
()
{
return
inspectPictrue
;
}
public
void
setInspectTime
(
Date
inspectTime
)
{
this
.
inspectTime
=
inspectTime
;
}
public
Date
getInspectTime
()
{
return
inspectTime
;
}
public
void
setInspectResult
(
String
inspectResult
)
{
this
.
inspectResult
=
inspectResult
;
...
...
@@ -140,6 +387,15 @@ public class TStaningBook extends BaseEntity
{
return
personLiable
;
}
public
void
setState
(
Integer
state
)
{
this
.
state
=
state
;
}
public
Integer
getState
()
{
return
state
;
}
public
void
setDeptId
(
Long
deptId
)
{
this
.
deptId
=
deptId
;
...
...
@@ -176,9 +432,25 @@ public class TStaningBook extends BaseEntity
.
append
(
"troubleType"
,
getTroubleType
())
.
append
(
"troubleLevel"
,
getTroubleLevel
())
.
append
(
"measures"
,
getMeasures
())
.
append
(
"troubleHarm"
,
getTroubleHarm
())
.
append
(
"escalation"
,
getEscalation
())
.
append
(
"findTime"
,
getFindTime
())
.
append
(
"picture"
,
getPicture
())
.
append
(
"enclosure"
,
getEnclosure
())
.
append
(
"proposal"
,
getProposal
())
.
append
(
"investmentCost"
,
getInvestmentCost
())
.
append
(
"investmentMaterial"
,
getInvestmentMaterial
())
.
append
(
"rectification"
,
getRectification
())
.
append
(
"rectificationPictrue"
,
getRectificationPictrue
())
.
append
(
"rectificationText"
,
getRectificationText
())
.
append
(
"rectificationTime"
,
getRectificationTime
())
.
append
(
"remarks"
,
getRemarks
())
.
append
(
"finishDay"
,
getFinishDay
())
.
append
(
"inspectPictrue"
,
getInspectPictrue
())
.
append
(
"inspectTime"
,
getInspectTime
())
.
append
(
"inspectResult"
,
getInspectResult
())
.
append
(
"personLiable"
,
getPersonLiable
())
.
append
(
"state"
,
getState
())
.
append
(
"deptId"
,
getDeptId
())
.
append
(
"workId"
,
getWorkId
())
.
append
(
"createTime"
,
getCreateTime
())
...
...
This diff is collapsed.
Click to expand it.
danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaningBookServiceImpl.java
View file @
3b08e4b5
...
...
@@ -51,14 +51,14 @@ public class TStaningBookServiceImpl implements ITStaningBookService
public
List
<
TStaningBook
>
selectTStaningBookList
(
TStaningBook
tStaningBook
)
{
List
<
TStaningBook
>
list
=
tStaningBookMapper
.
selectTStaningBookList
(
tStaningBook
);
for
(
TStaningBook
book:
list
){
if
(
book
.
getDeptId
()!=
null
){
SysDept
dept
=
deptMapper
.
selectDeptById
(
book
.
getDeptId
());
if
(
dept
!=
null
){
book
.
setDeptName
(
dept
.
getDeptName
());
}
}
}
//
for(TStaningBook book: list){
//
if(book.getDeptId()!=null){
//
SysDept dept = deptMapper.selectDeptById(book.getDeptId());
//
if(dept!=null){
//
book.setDeptName(dept.getDeptName());
//
}
//
}
//
}
return
list
;
}
...
...
This diff is collapsed.
Click to expand it.
danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml
View file @
3b08e4b5
This diff is collapsed.
Click to expand it.
danger-manage-web/src/views/system/book/index.vue
View file @
3b08e4b5
This diff is collapsed.
Click to expand it.
danger-manage-web/src/views/system/workCheck/index.vue
View file @
3b08e4b5
...
...
@@ -201,7 +201,7 @@
<!--</el-form-item>-->
<el-form-item
label=
"责任部门"
prop=
"deptId"
>
<!--<el-input v-model="form.deptId" placeholder="请输入部门id" />-->
<el-select
v-model=
"form.deptId"
placeholder=
"请选择责任部门"
>
<el-select
v-model=
"form.deptId"
filterable
placeholder=
"请选择责任部门"
>
<el-option
v-for=
"dict in deptList"
:key=
"dict.deptId"
...
...
@@ -215,17 +215,17 @@
<!--<el-form-item label="关联隐患" prop="bookId">-->
<!--<el-input v-model="form.bookId" placeholder="请" />-->
<!--</el-form-item>-->
<
el-form-item
label=
"关联隐患"
prop=
"bookId"
>
<!--
<el-input v-model="form.deptId" placeholder="请输入部门id" />
-->
<
el-select
v-model=
"form.bookId"
placeholder=
"请选择关联隐患"
>
<
el-option
v-for=
"dict in bookList"
:key=
"dict.bookId"
:label=
"dict.troubleName"
:value=
"parseInt(dict.bookId)"
></el-option
>
<
/el-select
>
<
/el-form-item
>
<
!--<el-form-item label="关联隐患" prop="bookId">--
>
<!--
<!–<el-input v-model="form.deptId" placeholder="请输入部门id" />–>
-->
<
!--<el-select v-model="form.bookId" placeholder="请选择关联隐患">--
>
<
!--<el-option-->
<!--v-for="dict in bookList"-->
<!--:key="dict.bookId"-->
<!--:label="dict.troubleName"-->
<!--:value="parseInt(dict.bookId)"-->
<!--></el-option>--
>
<
!--</el-select>--
>
<
!--</el-form-item>--
>
<el-form-item
label=
"任务范围"
prop=
"workRange"
>
<el-input
v-model=
"form.workRange"
placeholder=
"请输入任务范围"
/>
</el-form-item>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment