From 0cce417267a8e1154a3ced5069bce5ce854d6450 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 19 六月 2024 09:43:44 +0800
Subject: [PATCH] 处理时间问题
---
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java | 60 ++++++++++++++++++++
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java | 5 -
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java | 8 +-
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java | 55 ++++++++++++++++++
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java | 7 +-
5 files changed, 124 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
index 6bbc84c..2736883 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckScoreAndDangerLogController.java
@@ -9,11 +9,10 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO;
import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogRespDTO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
@@ -110,9 +109,9 @@
*/
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog){
+ public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog){
- ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerLog);
+ ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerEditLog);
String code = resultVO.getCode();
if ("200".equals(code)){
return toAjax(1);
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java
new file mode 100644
index 0000000..cde35de
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java
@@ -0,0 +1,55 @@
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckItemLogEditBO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String taskId;
+
+ private String checkItemId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java
new file mode 100644
index 0000000..42507b6
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java
@@ -0,0 +1,60 @@
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckScoreAndDangerLogEditBO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
index 2a30156..70497d5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
@@ -2,9 +2,8 @@
import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import java.util.List;
@@ -14,7 +13,7 @@
ResultVO<List<TbSpecialCheckScoreAndDangerLog>> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO );
- ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
+ ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog);
TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId);
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
index 3bd3d03..b48afea 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
@@ -2,17 +2,17 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.enums.ErrorCodes;
import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import com.ruoyi.project.tr.specialCheck.mapper.*;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
@@ -72,11 +72,11 @@
}
@Override
- public ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog) {
+ public ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog) {
User sysUser = getSysUser();
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
+ TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);
if (scoreAndDangerLog.getTaskId() == null){
resultVO.setMsg("任务不能为空");
return resultVO;
--
Gitblit v1.9.2