From 0305121daab27b4bff4d906a01b9ca3ce08a5f04 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 20 十一月 2023 18:21:18 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/pom.xml                                                                              |    4 ++--
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java |   20 ++++++++++----------
 ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml               |    3 ++-
 ruoyi-common/pom.xml                                                                             |    4 ++++
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index b6ecf42..fec7ab2 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,8 +8,8 @@
         <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
-<!--    <packaging>jar</packaging>-->
+<!--    <packaging>war</packaging>-->
+    <packaging>jar</packaging>
     <artifactId>ruoyi-admin</artifactId>
 
     <description>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 0f14f49..a5dbbc0 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -139,6 +139,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
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 d53a421..da479a1 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
@@ -55,7 +55,7 @@
     private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
 
     @Autowired
-    private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+    private IServiceDonateflowchartService iServiceDonateflowchartService;
 
     @Autowired
     private IServiceOrganallocationService serviceOrganallocationService;
@@ -314,19 +314,19 @@
 
 
         //灏佽浼︾悊瀹℃煡
-        Map<String, String> ethicalreviewopinions = new HashMap<>();
+        Map<String, String> donateflowcharts = new HashMap<>();
         if (serviceDonatebaseinfo.getWorkflow() >= 3) {
-            ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions();
-            serviceEthicalreviewopinions.setInfoid(id);
-            List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
-            if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
-                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", "");
+            ServiceDonateflowchart serviceDonateflowchart = new ServiceDonateflowchart();
+            serviceDonateflowchart.setInfoid(id);
+            List<ServiceDonateflowchart> serviceDonateflowcharts = iServiceDonateflowchartService.queryList(serviceDonateflowchart);
+            if (!CollectionUtils.isEmpty(serviceDonateflowcharts)) {
+                donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getCreateTime()));
+                donateflowcharts.put("updatetime", serviceDonateflowcharts.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getUpdateTime()) : "");
+                donateflowcharts.put("process", "");
             }
         }
         //灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
-        map.put("ethicalreviewopinions", ethicalreviewopinions);
+        map.put("donateflowcharts", donateflowcharts);
 
         //灏佽鍣ㄥ畼鍒嗛厤
         Map<String, String> donateorgansService = new HashMap<>();
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
index 2e52927..87f3a2b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceMedicalevaluationMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.mapper.ServiceMedicalevaluationMapper">
-    
+
     <resultMap type="com.ruoyi.project.domain.ServiceMedicalevaluation" id="ServiceMedicalevaluationResult">
         <result property="id"    column="ID"    />
         <result property="infoid"    column="InfoID"    />
@@ -111,6 +111,7 @@
             <if test="endtime != null ">  and `service_medicalevaluation`.CoreTeamAssessTime &lt;= #{endtime}</if>
             <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
             <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
+            service_medicalevaluation.del_flag != 1
     </where>
 
         order by `service_medicalevaluation`.`create_time` desc,

--
Gitblit v1.9.3