From d22c9af5a9e461ebabd9ef6c776a66f238940fe0 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 13 三月 2023 14:19:36 +0800
Subject: [PATCH] 设备类型，用户名
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 2 ++
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java | 2 +-
src/main/java/com/ruoyi/project/tr/report/service/ReportService.java | 2 ++
src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java | 2 +-
src/main/resources/mybatis/system/UserMapper.xml | 2 +-
src/main/resources/mybatis/tr/VersionControlMapper.xml | 1 +
6 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index a118cb0..e62cf34 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -126,6 +126,7 @@
//获取上报数据对象
PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();
+ //此类方法已经修改，实际使用username
User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
User userById = trUserService.getUserById(infoByRiskId.getUserId());
@@ -262,6 +263,7 @@
//获取上报数据对象
PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
//转换数据
+ // todo 逻辑改变
PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
index cf7d7e7..ac1c7bf 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
@@ -400,7 +400,7 @@
//是隐患设置核查人ID、核查人名称
if ((!StringUtils.isEmpty(hdcp.getWhetherDanger())) &&
(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES.equals(hdcp.getWhetherDanger()))) {
- hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
+ hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状8态(待核查)
hdcp.setExamineUserId(hiddenDangerCheck.getExamineUserId());//核查人ID
hdcp.setExamineUserName(hiddenDangerCheck.getExamineUserName());//核查人名称
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//3隐患核查阶段(/** 更新者 */数据进入到3隐患核查阶段)
diff --git a/src/main/java/com/ruoyi/project/tr/report/service/ReportService.java b/src/main/java/com/ruoyi/project/tr/report/service/ReportService.java
index 1bb1759..db0b436 100644
--- a/src/main/java/com/ruoyi/project/tr/report/service/ReportService.java
+++ b/src/main/java/com/ruoyi/project/tr/report/service/ReportService.java
@@ -103,7 +103,9 @@
map.put("seriesDangers", seriesDangers);
//未整改隐患数量
map.put("unRectifyDangerCount", unRectifyDangerCount);
+
Map monthlyDangerMap = selectMonthlyDangers(companyId);
+
ArrayList normalDanger = (ArrayList) monthlyDangerMap.get("normalDanger");
long thisMonthNormalDangerCount = (long) normalDanger.get(normalDanger.size() - 1);
ArrayList highDanger = (ArrayList) monthlyDangerMap.get("highDanger");
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
index 6b56714..e160f13 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
@@ -225,7 +225,7 @@
mmap.put("riskList", riskList);
//查询风险清单类型
List<RiskType> riskTypes = getRiskTypes(riskList.getRiskType());
- mmap.put(" ", riskTypes);
+ mmap.put("riskTypes", riskTypes);
//判断如果是作业活动，查询作业活动频率
if (riskList.getRiskType() == 2) {
List riskTypes1 = getRiskTypes(4);
diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml
index 32cffc9..3f9f7ec 100644
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -283,6 +283,6 @@
<!-- User getUserByLoginName(String createBy);-->
<select id="getUserByLoginName" parameterType="User" resultMap="UserResult">
- select * from sys_user where login_name = #{createBy}
+ select * from sys_user where user_name = #{createBy}
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/tr/VersionControlMapper.xml b/src/main/resources/mybatis/tr/VersionControlMapper.xml
index 0af0d39..4911772 100644
--- a/src/main/resources/mybatis/tr/VersionControlMapper.xml
+++ b/src/main/resources/mybatis/tr/VersionControlMapper.xml
@@ -32,6 +32,7 @@
<if test="isForce != null "> and is_force = #{isForce}</if>
</where>
GROUP BY version_code DESC
+<!-- GROUP BY version_code,version_id, create_by, create_time, update_by, update_time, remark,version_name, updete_desc, apk_ptah, is_force desc-->
</select>
<select id="selectVersionControlById" parameterType="Long" resultMap="VersionControlResult">
--
Gitblit v1.9.2