From 66a6b31ddc84644dfcae8a341a99796db76e60a7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 17:17:24 +0800
Subject: [PATCH] 上传时间处置 结案处理人添加
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 18 +++++++++++-------
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java | 3 +++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 3 ++-
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 8 ++++----
ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java | 2 +-
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java | 8 ++++----
ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java | 2 +-
7 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
index 40502f4..2527140 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
@@ -49,8 +49,8 @@
.eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment())
.eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId())
.between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
- .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
- .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream()
.map(item -> {
UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO();
@@ -114,8 +114,8 @@
.like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent())
.eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
.between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
- .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
- .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
.getRecords()
.stream()
.map(item -> {
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index d6e7b01..5ee1b2c 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -28,6 +28,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -121,7 +123,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鍒犻櫎妗堜欢")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鍒犻櫎妗堜欢")
public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
@@ -146,7 +148,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鎵归噺鍒犻櫎妗堜欢")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鎵归噺鍒犻櫎妗堜欢")
public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
@@ -168,7 +170,7 @@
**/
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鏂板杩濆缓妗堜欢")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濆缓妗堜欢")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
Integer violation = 1;
Integer resource = 2;
@@ -178,6 +180,7 @@
baseCase.setCategory(violation);
baseCase.setCode(utilNumber.createCaseCode());
baseCase.setState(BaseCaseStatus.PENDING);
+ baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -189,7 +192,7 @@
**/
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
@PostMapping("/addition_illegal_building")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鏂板杩濊妗堜欢")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濊妗堜欢")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
Integer illegalBuilding = 2;
Integer resource = 2;
@@ -199,6 +202,7 @@
baseCase.setEventSource(resource);
baseCase.setCode(utilNumber.createCaseCode());
baseCase.setState(BaseCaseStatus.PENDING);
+ baseCase.setAlarmTime(LocalDateTime.parse(illegalBuildingParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
@@ -259,9 +263,9 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢缁撴")
- public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result,@RequestParam String opinion) {
- baseCaseService.endCase(caseId, result,opinion);
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "妗堜欢缁撴")
+ public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result, @RequestParam String opinion) {
+ baseCaseService.endCase(caseId, result, opinion);
return CommonResult.success("end case success~!");
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index 3c06d2a..a19f04b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -78,7 +78,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
investigation.setBaseCaseId(caseId);
investigation.setCreateTime(LocalDateTime.now());
- investigation.setCreateUser(user.getUserId().longValue());
+ investigation.setCreateUser(user.getUserId());
investigation.setPartyId(partyInfo.getId());
iInvestigationService.save(investigation);
//鍒拌揪
@@ -86,7 +86,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
arrivalSituation.setBaseCaseId(caseId);
arrivalSituation.setCreateTime(LocalDateTime.now());
- arrivalSituation.setCreateUser(user.getUserId().longValue());
+ arrivalSituation.setCreateUser(user.getUserId());
iArrivalSituationService.save(arrivalSituation);
//鏂囦功
Integer illegalBuildingType = 2;
@@ -96,7 +96,7 @@
writ.setBaseCaseId(caseId);
writ.setIllegalBuildingId(caseId);
writ.setCreateTime(LocalDateTime.now());
- writ.setCreateUser(user.getUserId().longValue());
+ writ.setCreateUser(user.getUserId());
iWritService.save(writ);
}
baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
@@ -105,7 +105,7 @@
disposeRecord.setBaseCaseId(caseId);
disposeRecord.setState(0);
disposeRecord.setCreateTime(LocalDateTime.now());
- disposeRecord.setCreateUser(user.getUserId().longValue());
+ disposeRecord.setCreateUser(user.getUserId());
disposeRecord.setStepName(stepName);
disposeRecord.setStartTime(LocalDateTime.now());
iDisposeRecordService.addRecord(disposeRecord);
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
index cd8091e..779be4c 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
@@ -25,7 +25,7 @@
* 鎶ヨ鏃堕棿
*/
@TableField("alarm_time")
- private LocalDateTime alarmTime;
+ private String alarmTime;
/**
* 鎵�灞炵ぞ鍖�
diff --git a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
index fc67d3e..89d529c 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
@@ -24,7 +24,7 @@
* 鎶ヨ鏃堕棿
*/
@TableField("alarm_time")
- private LocalDateTime alarmTime;
+ private String alarmTime;
/**
* 灏忕被
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
index eb69ffa..2a03614 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -1,12 +1,15 @@
package com.ycl.entity.caseHandler;
+import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
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 ace3776..8510dd5 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
@@ -388,10 +388,11 @@
//淇敼缁撴璁板綍
DisposeRecord disposeRecord = new DisposeRecord();
- disposeRecord.setHandlerId(user.getUserId().longValue());
+ disposeRecord.setHandlerId(user.getUserId());
//缁撴宸茬粨鏉�
disposeRecord.setState(1);
disposeRecord.setEndTime(LocalDateTime.now());
+ disposeRecord.setHandlerId(user.getUserId());
disposeRecordMapper.update(disposeRecord, updateWrapper);
}
}
\ No newline at end of file
--
Gitblit v1.8.0