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
6f64595f
Commit
6f64595f
authored
2 years ago
by
王晓倩
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
64003f1f
004f180a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
74 additions
and
29 deletions
+74
-29
TSafetyCommitmentAnnouncementController.java
...tyManagement/TSafetyCommitmentAnnouncementController.java
+17
-0
TSafetyCommitmentAnnouncement.java
...m/zehong/system/domain/TSafetyCommitmentAnnouncement.java
+9
-1
TBreakRulesPersonRecordServiceImpl.java
...stem/service/impl/TBreakRulesPersonRecordServiceImpl.java
+5
-0
TSafetyCommitmentAnnouncementMapper.xml
...ces/mapper/system/TSafetyCommitmentAnnouncementMapper.xml
+14
-7
index.vue
...age-web/src/views/safetyManagement/announcement/index.vue
+12
-0
limitTime.vue
danger-manage-web/src/views/system/limitTime/limitTime.vue
+17
-21
No files found.
danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TSafetyCommitmentAnnouncementController.java
View file @
6f64595f
...
...
@@ -4,6 +4,7 @@ import java.text.ParseException;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
cn.hutool.core.date.DateTime
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
@@ -113,6 +114,22 @@ public class TSafetyCommitmentAnnouncementController extends BaseController
@PutMapping
public
AjaxResult
edit
(
@RequestBody
TSafetyCommitmentAnnouncement
tSafetyCommitmentAnnouncement
)
{
System
.
out
.
println
(
tSafetyCommitmentAnnouncement
);
return
toAjax
(
tSafetyCommitmentAnnouncementService
.
updateTSafetyCommitmentAnnouncement
(
tSafetyCommitmentAnnouncement
));
}
/**
* 修改安全承诺公告
* @param tSafetyCommitmentAnnouncement
* @return
*/
@RequestMapping
(
"/updateTSafetyCommitmentAnnouncement"
)
public
AjaxResult
updateTSafetyCommitmentAnnouncement
(
@RequestBody
TSafetyCommitmentAnnouncement
tSafetyCommitmentAnnouncement
)
{
//签字时间
tSafetyCommitmentAnnouncement
.
setSignTime
(
new
DateTime
());
//设置签字状态
tSafetyCommitmentAnnouncement
.
setSignOrNot
(
"1"
);
return
toAjax
(
tSafetyCommitmentAnnouncementService
.
updateTSafetyCommitmentAnnouncement
(
tSafetyCommitmentAnnouncement
));
}
...
...
This diff is collapsed.
Click to expand it.
danger-manage-system/src/main/java/com/zehong/system/domain/TSafetyCommitmentAnnouncement.java
View file @
6f64595f
...
...
@@ -3,6 +3,7 @@ package com.zehong.system.domain;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.ToString
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.zehong.common.annotation.Excel
;
...
...
@@ -10,11 +11,12 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 安全承诺公告对象 t_safety_commitment_announcement
*
*
* @author zehong
* @date 2022-12-21
*/
@Data
@ToString
public
class
TSafetyCommitmentAnnouncement
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -84,4 +86,10 @@ public class TSafetyCommitmentAnnouncement extends BaseEntity
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Excel
(
name
=
"承诺日期"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
commitmentDate
;
private
String
signOrNot
;
private
String
sign
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
signTime
;
}
This diff is collapsed.
Click to expand it.
danger-manage-system/src/main/java/com/zehong/system/service/impl/TBreakRulesPersonRecordServiceImpl.java
View file @
6f64595f
package
com
.
zehong
.
system
.
service
.
impl
;
import
java.sql.Time
;
import
java.util.Date
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -52,6 +54,9 @@ public class TBreakRulesPersonRecordServiceImpl implements ITBreakRulesPersonRec
@Override
public
int
insertTBreakRulesPersonRecord
(
TBreakRulesPersonRecord
tBreakRulesPersonRecord
)
{
if
(
tBreakRulesPersonRecord
.
getReportTime
()==
null
){
tBreakRulesPersonRecord
.
setReportTime
(
new
Date
());
}
return
tBreakRulesPersonRecordMapper
.
insertTBreakRulesPersonRecord
(
tBreakRulesPersonRecord
);
}
...
...
This diff is collapsed.
Click to expand it.
danger-manage-system/src/main/resources/mapper/system/TSafetyCommitmentAnnouncementMapper.xml
View file @
6f64595f
...
...
@@ -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.TSafetyCommitmentAnnouncementMapper"
>
<resultMap
type=
"TSafetyCommitmentAnnouncement"
id=
"TSafetyCommitmentAnnouncementResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"productionUnit"
column=
"production_unit"
/>
...
...
@@ -22,15 +22,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result
property=
"announcement"
column=
"announcement"
/>
<result
property=
"commitmentDate"
column=
"commitment_date"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"signOrNot"
column=
"sign_or_not"
/>
<result
property=
"sign"
column=
"sign"
/>
<result
property=
"signTime"
column=
"sign_time"
/>
</resultMap>
<sql
id=
"selectTSafetyCommitmentAnnouncementVo"
>
select id, production_unit, running_device, shutdown_device, maintenance_device, hot_work, special_hot_work, class_one_hot_work, class_two_hot_work, is_confined_space, is_trial_production, is_security_status, assessment_level, key_person, announcement, commitment_date, status from t_safety_commitment_announcement
select id, production_unit, running_device, shutdown_device, maintenance_device, hot_work, special_hot_work, class_one_hot_work, class_two_hot_work, is_confined_space, is_trial_production, is_security_status, assessment_level, key_person, announcement, commitment_date, status
,sign_or_not,sign,sign_time
from t_safety_commitment_announcement
</sql>
<select
id=
"selectTSafetyCommitmentAnnouncementList"
parameterType=
"TSafetyCommitmentAnnouncement"
resultMap=
"TSafetyCommitmentAnnouncementResult"
>
<include
refid=
"selectTSafetyCommitmentAnnouncementVo"
/>
<where>
<where>
<if
test=
"productionUnit != null "
>
and production_unit = #{productionUnit}
</if>
<if
test=
"runningDevice != null "
>
and running_device = #{runningDevice}
</if>
<if
test=
"shutdownDevice != null "
>
and shutdown_device = #{shutdownDevice}
</if>
...
...
@@ -45,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"assessmentLevel != null and assessmentLevel != ''"
>
and assessment_level = #{assessmentLevel}
</if>
<if
test=
"keyPerson != null and keyPerson != ''"
>
and key_person = #{keyPerson}
</if>
<if
test=
"announcement != null and announcement != ''"
>
and announcement = #{announcement}
</if>
<if
test=
"signOrNot != null and signOrNot != ''"
>
and sign_or_not = #{signOrNot}
</if>
<if
test=
"status != null and status != ''"
>
and status = #{status}
</if>
<if
test=
"params.beginTime != null and params.beginTime != ''"
>
<!-- 开始时间检索 -->
AND commitment_date
>
= #{params.beginTime}
...
...
@@ -55,12 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by commitment_date desc
</select>
<select
id=
"selectTSafetyCommitmentAnnouncementById"
parameterType=
"Long"
resultMap=
"TSafetyCommitmentAnnouncementResult"
>
<include
refid=
"selectTSafetyCommitmentAnnouncementVo"
/>
where id = #{id}
</select>
<insert
id=
"insertTSafetyCommitmentAnnouncement"
parameterType=
"TSafetyCommitmentAnnouncement"
>
insert into t_safety_commitment_announcement
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
...
@@ -120,6 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"announcement != null"
>
announcement = #{announcement},
</if>
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"commitmentDate != null"
>
commitment_date = #{commitmentDate},
</if>
<if
test=
"sign != null"
>
sign = #{sign},
</if>
<if
test=
"signOrNot != null"
>
sign_or_not = #{signOrNot},
</if>
<if
test=
"signTime != null"
>
sign_time = #{signTime}
</if>
</trim>
where id = #{id}
</update>
...
...
@@ -129,9 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete
id=
"deleteTSafetyCommitmentAnnouncementByIds"
parameterType=
"String"
>
delete from t_safety_commitment_announcement where id in
delete from t_safety_commitment_announcement where id in
<foreach
item=
"id"
collection=
"array"
open=
"("
separator=
","
close=
")"
>
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
This diff is collapsed.
Click to expand it.
danger-manage-web/src/views/safetyManagement/announcement/index.vue
View file @
6f64595f
...
...
@@ -52,6 +52,18 @@
<span
v-if=
"scope.row.status == '0'"
>
已承诺
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"是否签字"
align=
"center"
prop=
"signOrNot"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.signOrNot == '0'"
>
未签字
</span>
<span
v-if=
"scope.row.signOrNot == '1'"
>
已签字
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"签字时间"
align=
"center"
prop=
"signTime"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.signTime == null"
>
-
</span>
<span
v-else
>
{{
scope
.
row
.
signTime
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"查看报告"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
...
...
This diff is collapsed.
Click to expand it.
danger-manage-web/src/views/system/limitTime/limitTime.vue
View file @
6f64595f
...
...
@@ -30,15 +30,14 @@
<el-option
label=
"手动消警"
value=
"2"
/>
</el-select>
</el-form-item>
-->
<el-form-item
label=
"报警时间"
prop=
"alarmStatus"
>
<el-time-picker
is-range
v-model=
"queryParams.alarmStatus"
range-separator=
"至"
start-placeholder=
"开始时间"
end-placeholder=
"结束时间"
placeholder=
"选择时间范围"
>
</el-time-picker>
<el-form-item
label=
"报警时间"
prop=
"value1"
>
<el-date-picker
v-model=
"queryParams.value1"
type=
"daterange"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
>
</el-date-picker>
</el-form-item>
<el-form-item>
...
...
@@ -56,7 +55,6 @@
size=
"mini"
:loading=
"exportLoading"
@
click=
"handleExport"
v-hasPermi=
"['system:alarm:export']"
>
导出
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
...
...
@@ -244,6 +242,7 @@ export default {
alarmBeginTime
:
null
,
alarmEndTime
:
null
,
alarmStatus
:
null
,
value1
:
''
,
},
// 表单参数
form
:
{},
...
...
@@ -294,6 +293,7 @@ export default {
alarmBeginTime
:
null
,
alarmEndTime
:
null
,
alarmStatus
:
"0"
,
value1
:
''
,
alarmImageUrl
:
null
,
alarmVaule
:
null
,
createBy
:
null
,
...
...
@@ -301,14 +301,15 @@ export default {
updateBy
:
null
,
updateTime
:
null
,
isDel
:
null
,
remarks
:
null
remarks
:
null
,
value1
:
''
,
};
this
.
resetForm
(
"form"
);
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
//
this.getList();
},
/** 重置按钮操作 */
resetQuery
()
{
...
...
@@ -394,18 +395,13 @@ export default {
},
/** 导出按钮操作 */
handleExport
()
{
const
queryParams
=
this
.
queryParams
;
this
.
$confirm
(
'是否确认导出所有报警记录数据项?'
,
"警告"
,
{
this
.
$confirm
(
'暂无数据'
,
"警告"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
}).
then
(()
=>
{
this
.
exportLoading
=
true
;
return
exportAlarm
(
queryParams
);
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
}).
catch
(()
=>
{});
}).
catch
((
err
)
=>
{
console
.
log
()
});
}
}
};
...
...
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