From 01a31c6c5ffe0d430b5c47af431502aa86153f66 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 20 Sep 2024 18:04:12 +0800
Subject: [PATCH] 督办bug修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java | 7 ++++++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
index 41fe608..dce4065 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -68,6 +69,7 @@
/**
* 督办时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "sup_time")
private Date supTime;
@@ -116,8 +118,9 @@
/**
* 回复时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "reply_time")
- private String replyTime;
+ private Date replyTime;
/**
* 删除状态，0：未删除，1：已删除
@@ -135,12 +138,14 @@
/**
* 创建时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "create_time")
private Date createTime;
/**
* 更新时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "update_time")
private Date updateTime;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
index eb884c7..7194f76 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
@@ -179,7 +179,7 @@
caseSupervise.setSupStatus(1);
caseSupervise.setReplyUserId(loginUser.getId());
caseSupervise.setReplyUserName(loginUser.getTrueName());
- caseSupervise.setReplyTime(String.valueOf(now));
+ caseSupervise.setReplyTime(now);
caseSupervise.setUpdateTime(now);
mapper.updateCaseSupervise(caseSupervise);
}catch (Exception e){
@@ -201,8 +201,8 @@
Map<String, Object>map = new HashMap<>();
map.put("mainId", caseId);
- map.put("ownerIds", caseSuperviseList.stream().map(CaseSupervise::getId).collect(Collectors.joining("','")));
- map.put("types", FileOwnerTypeBaseEnum.OWNER_TYPE_506.getIndex());
+ map.put("ownerIds", "'" + caseSuperviseList.stream().map(CaseSupervise::getId).collect(Collectors.joining("','"))+ "'");
+ map.put("types", "'"+ FileOwnerTypeBaseEnum.OWNER_TYPE_506.getIndex()+ "'");
List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(map);
for(CaseSupervise caseSupervise: caseSuperviseList){
for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
--
Gitblit v1.8.0