From d18dde2957a5cf877e48847a98e75a5d5ce66201 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 09:25:31 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java | 3 ++-
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 10 ++++++++++
src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml | 4 ++--
4 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
index aaff7cf..7337210 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -64,6 +64,16 @@
ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData();
+
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ for (TbSpecialCheckItemDangerLogDTO log : data) {
+ for (PreventCJReportDangerInfo danger : dangerList) {
+ if (danger.getId().equals(log.getDangerId())){
+ log.setDangerName(danger.getDangerName());
+ }
+ }
+ }
+
TableDataInfo dataTable = getDataTable(data);
dataTable.setTotal(resultVO.getCount());
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
index 1c5e5e7..36f735b 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
@@ -13,7 +13,6 @@
public class TbSpecialCheckItemDangerLogDTO {
- @TableId(type = IdType.AUTO)
private Long indexId;
private String id;
@@ -24,6 +23,8 @@
private String dangerId;
+ private String dangerName;
+
private String taskId;
private String checkType;
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
index f8a4b92..a6f9b95 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -140,6 +140,26 @@
itemDangerLog.setReportStatus((byte) 1);
itemDangerLog.setReportTime(null);
itemDangerLog.setDeleted((byte) 0);
+// itemDangerLog.setDangerId(itemDangerLog.getDangerId());
+// itemDangerLog.setDangerId(itemDangerLog.getTaskId());
+// itemDangerLog.setCheckType(itemDangerLog.getCheckType());
+// itemDangerLog.setCheckItemId(itemDangerLog.getCheckItemId());
+// itemDangerLog.setCheckScoreId(itemDangerLog.getCheckScoreId());
+// itemDangerLog.setCheckDate(itemDangerLog.getCheckDate());
+// itemDangerLog.setCheckPay(itemDangerLog.getCheckPay());
+// itemDangerLog.setHarmType(itemDangerLog.getHarmType());
+ itemDangerLog.setCheckName(baseCheckItemByItemId.getCheckName());
+ itemDangerLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ itemDangerLog.setCheckWay(null);
+ itemDangerLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ itemDangerLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+ itemDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
+ itemDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
+ itemDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
+
+
+
+
int saveResult = itemDangerLogMapper.save(itemDangerLog);
if (saveResult == 0){
@@ -210,14 +230,18 @@
LocalDateTime dateTime = LocalDateTime.now();
- updateBO.setCompanyCode("652310082");
- updateBO.setCreateDate(dateTime);
updateBO.setUpdateDate(dateTime);
- updateBO.setCreateBy(sysUser.getUserName());
updateBO.setUpdateBy(sysUser.getUserName());
updateBO.setReportStatus((byte) 1);
- updateBO.setReportTime(null);
- updateBO.setDeleted((byte) 0);
+
+ updateBO.setCheckName(baseCheckItemByItemId.getCheckName());
+ updateBO.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ updateBO.setCheckWay(null);
+ updateBO.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ updateBO.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+ updateBO.setIsReject(baseCheckScoreByScoreId.getIsReject());
+ updateBO.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
+ updateBO.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
int updateResult = itemDangerLogMapper.updateSpecialCheckItemDangerLogById(updateBO);
if (updateResult == 0){
diff --git a/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml b/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
index 08ac3aa..8530642 100644
--- a/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
+++ b/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
@@ -44,8 +44,8 @@
<if test="id != null">
and task_id = #{id}
</if>
- <if test="checkWay != null">
- and check_way like concat('%',#{checkWay},'%')
+ <if test="checkType != null">
+ and check_type like concat('%',#{checkType},'%')
</if>
<if test="reportStatus != null">
and report_status = #{reportStatus}
--
Gitblit v1.9.2