From 1af5d4eb731533ede0f5c2e58d38dc9997735625 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 10 Dec 2024 18:33:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E6=97=B6=E6=AE=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=88=90=E6=9C=AC=E5=BD=B1=E5=93=8D=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proteam/supplement/controller/ProVioController.java | 4 +++- .../proteam/supplement/controller/RiskCostController.java | 4 +++- .../proteam/supplement/controller/RiskRectController.java | 6 ++++-- .../proteam/supplement/controller/RiskTimeController.java | 4 +++- .../proteam/supplement/domain/vo/RiskCostVo.java | 4 ++-- .../src/main/resources/mapper/supplement/RiskCostMapper.xml | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java index 9625c04..0703822 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java @@ -1,7 +1,9 @@ package com.sercurityControl.proteam.supplement.controller; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.service.ProVioService; import io.swagger.annotations.ApiOperation; @@ -30,7 +32,7 @@ public class ProVioController { @ApiOperation(value = "工程违章统计-列表") @PostMapping(value = "getProVioList") - @Log(title = "工程违章统计", menu = "值班任务->工程违章统计", businessType = BusinessType.QUERY, details = "工程违章统计") + @SysLog(title = "工程违章统计", model = "值班任务->工程违章统计", operaType = OperaType.QUERY, details = "工程违章统计",logType = 1) public Map getProVioList(ParamsDto dto) { return service.getProVioList(dto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskCostController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskCostController.java index 88f5c9e..0e4913a 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskCostController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskCostController.java @@ -1,7 +1,9 @@ package com.sercurityControl.proteam.supplement.controller; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.service.RiskCostService; import io.swagger.annotations.ApiOperation; @@ -30,7 +32,7 @@ public class RiskCostController { @ApiOperation(value = "风险成本影响分析-列表") @PostMapping(value = "getRiskCostList") - @Log(title = "风险成本影响分析", menu = "值班任务->风险时段分析", businessType = BusinessType.QUERY, details = "风险成本影响分析") + @SysLog(title = "风险成本影响分析", model = "值班任务->风险时段分析", operaType = OperaType.QUERY, details = "风险成本影响分析",logType = 1) public Map getRiskCostList(ParamsDto dto) { return service.getRiskCostList(dto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java index 3b23d59..8211645 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java @@ -2,7 +2,9 @@ package com.sercurityControl.proteam.supplement.controller; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.service.ProVioService; import com.sercurityControl.proteam.supplement.service.RiskRectService; @@ -32,14 +34,14 @@ public class RiskRectController { @ApiOperation(value = "风险整改分析-列表") @PostMapping(value = "getRiskRectList") - @Log(title = "风险整改分析", menu = "值班任务->风险整改分析", businessType = BusinessType.QUERY, details = "风险整改分析") + @SysLog(title = "风险整改分析", model = "值班任务->风险整改分析", operaType = OperaType.QUERY, details = "风险整改分析",logType = 1) public Map getRiskRectList(ParamsDto dto) { return service.getRiskRectList(dto); } @ApiOperation(value = "风险整改分析-整改详情") @PostMapping(value = "getRiskRectDetail") - @Log(title = "风险整改分析整改详情", menu = "值班任务->风险整改分析", businessType = BusinessType.QUERY, details = "整改详情") + @SysLog(title = "风险整改分析整改详情", model = "值班任务->风险整改分析", operaType = OperaType.QUERY, details = "整改详情",logType = 1) public AjaxResult getRiskRectDetail(ParamsDto dto) { return service.getRiskRectDetail(dto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskTimeController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskTimeController.java index 7776e58..5d1681b 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskTimeController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskTimeController.java @@ -1,7 +1,9 @@ package com.sercurityControl.proteam.supplement.controller; import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.annotation.SysLog; import com.securityControl.common.log.enums.BusinessType; +import com.securityControl.common.log.enums.OperaType; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.service.RiskTimeService; import io.swagger.annotations.ApiOperation; @@ -30,7 +32,7 @@ public class RiskTimeController { @ApiOperation(value = "风险时段分析-列表") @PostMapping(value = "getRiskTimeList") - @Log(title = "风险时段分析", menu = "值班任务->风险时段分析", businessType = BusinessType.QUERY, details = "风险时段分析") + @SysLog(title = "风险时段分析", model = "值班任务->风险时段分析", operaType = OperaType.QUERY, details = "风险时段分析",logType = 1) public Map getRiskTimeList(ParamsDto dto) { return service.getRiskTimeList(dto); } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskCostVo.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskCostVo.java index 8ba5350..6433e35 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskCostVo.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskCostVo.java @@ -33,7 +33,7 @@ public class RiskCostVo { private String workSite; /**工序*/ private String gx; - /**时间*/ - private String time; + /**风险成本*/ + private String riskCost; } diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskCostMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskCostMapper.xml index 72b5d13..83c6ade 100644 --- a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskCostMapper.xml +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskCostMapper.xml @@ -13,7 +13,7 @@ jjcmi.work_manage_phone AS workManagerPhone, jjcmi.work_gx AS gx, jjcmi.work_site AS workSite, - jjcm.current_constr_date AS time + jjcmi.main_risk AS riskCost FROM jj_class_meetting jjcm LEFT JOIN jj_class_metting_info jjcmi ON jjcm.id = jjcmi.class_id LEFT JOIN jj_ticket jjt ON jjcm.ticket_id = jjt.id