From dfc1f756dcc5274e699c878f32e94189abff2169 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 20 十月 2022 15:21:50 +0800
Subject: [PATCH] lack of table field
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 056d077..560c2c5 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.caseHandler.impl;
+import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -154,6 +155,7 @@
public Page listViolationsPage(Page page, Integer state, Integer resource) {
Integer type = 01;
Integer hours = 60;
+ Integer day = 24;
Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
List<CasePoolViolationVO> violationVOList = violationsPage
.getRecords()
@@ -163,13 +165,15 @@
BeanUtils.copyProperties(item, casePoolViolationVO);
if (item.getCloseTime() == null) {
Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+ long continueHours = duration.toHours() - (duration.toDays() * day);
long minutes = duration.toMinutes() - (duration.toHours() * hours);
- String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
} else {
Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+ long continueHours = duration.toHours() - (duration.toDays() * day);
long minutes = duration.toMinutes() - (duration.toHours() * hours);
- String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
}
casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
@@ -232,7 +236,9 @@
disposeRecord.setCreateUser(userDetails.getUserId());
disposeRecord.setStartTime(LocalDateTime.now());
disposeRecord.setStepName(stepName);
- disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ if(!StringUtils.isEmpty(limitTime)) {
+ disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
disposeRecordMapper.insert(disposeRecord);
}
--
Gitblit v1.8.0