From b7cd70a1dc48f2cd2f5ed36d09f92c8ebcc62c8b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 03 十一月 2023 15:20:45 +0800
Subject: [PATCH] 修改审批流程
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index 0be0fee..ccc033f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -273,8 +273,8 @@
}
//灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
Map<String, String> donateorgan = new HashMap<>();
- donateorgan.put("createtime", serviceDonatebaseinfo.getCreateTime().toString());
- donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime().toString());
+ donateorgan.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
+ donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
donateorgan.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
map.put("donateorgan", donateorgan);
@@ -286,8 +286,8 @@
serviceMedicalevaluation.setInfoid(id);
List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
- medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString());
- medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString());
+ medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
+ medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
medicalevaluation.put("process", "");
}
}
@@ -301,8 +301,8 @@
serviceRelativesconfirmation.setInfoid(id);
List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
- relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString());
- relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString());
+ relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
+ relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
relativesconfirmation.put("process", "");
}
}
@@ -317,8 +317,8 @@
serviceEthicalreviewopinions.setInfoid(id);
List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
- ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString());
- ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString());
+ ethicalreviewopinions.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
+ ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
ethicalreviewopinions.put("process", "");
}
}
@@ -332,8 +332,8 @@
serviceOrganallocation.setOrganid(id);
List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
- organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString());
- organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString());
+ organallocationService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getCreateTime()));
+ organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getUpdateTime()) : "");
organallocationService.put("process", "");
}
}
@@ -345,8 +345,8 @@
if (serviceDonatebaseinfo.getWorkflow() >= 5) {
ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
- donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString());
- donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString());
+ donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
+ donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");
donationwitness.put("process", "");
}
}
@@ -360,8 +360,8 @@
serviceDonatecompletioninfo.setInfoid(id);
List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
- donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString());
- donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString());
+ donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
+ donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");
donatecompletioninfo.put("process", "");
}
}
--
Gitblit v1.9.3