From 6879ca54ad1315e738f5f3b760eff929d730d838 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 05 十二月 2024 08:57:07 +0800
Subject: [PATCH] 修改及增加功能
---
expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml | 2 +-
expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml | 2 ++
expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
index e5f0a8b..1a26d2f 100644
--- a/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
+++ b/expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
@@ -317,7 +317,7 @@
projectManagementUp.setId(req.getId());
projectManagementUp.setState(4L);
projectManagementUp.setStep(4L);
- projectManagementUp.setDesc(req.getDesc());
+// projectManagementUp.setDesc(req.getDesc());
projectManagementUp.setProjectEndTime(req.getProjectEndTime());
projectManagementUp.setUpdateBy(SecurityUtils.getUsername());
int i = projectManagementMapper.updateProjectManagement(projectManagementUp);
diff --git a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
index 5fa846f..f07accb 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectExpertMapper.xml
@@ -257,7 +257,7 @@
<if test="endTime != null "><!-- 结束时间检索 -->
and date_format(b.update_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
- order by b.team_leader asc , b.create_time desc
+ order by b.update_time desc
</select>
diff --git a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
index bcbc067..3b8cf54 100644
--- a/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml
@@ -92,6 +92,7 @@
<if test="evaluationState != null "> and evaluation_state = #{evaluationState}</if>
<if test="expertNum != null "> and expert_num = #{expertNum}</if>
</where>
+ order by create_time desc
</select>
<select id="selectProjectManagementById" parameterType="Long" resultMap="ProjectManagementResult">
@@ -211,6 +212,7 @@
<if test="projectCheckTime != null "> and a.project_check_time = #{projectCheckTime}</if>
<if test="projectName != null and projectName != ''"> and a.project_name like concat('%', #{projectName}, '%')</if>
<if test="evaluationState != null "> and a.evaluation_state = #{evaluationState}</if>
+ order by a.create_time desc
</select>
<select id="getDataNum" parameterType="Long" resultType="Integer">
--
Gitblit v1.9.2