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 ++
1 files changed, 2 insertions(+), 0 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();
--
Gitblit v1.9.2