From 509594adc08bf61a2dfeb17d099ea0375569555e Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Fri, 5 Jul 2024 09:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=91=A8=E6=8A=A5=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml  | 6 ++++--
 .../kehui/project/action/ProjectWeeklyController.java      | 3 ++-
 .../com/xqopen/kehui/project/dto/ProjectWeeklyDto.java     | 7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
index 6fc7ab4..9944c4b 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
@@ -21,10 +21,12 @@
         workload,this_week,next_week,
         weekly_type,is_deleted,is_complete
     </sql>
-    <select id="getList" resultType="map">
-        select pw.*,pm.person_name as name from project_weekly pw
+    <select id="getList" resultType="com.xqopen.kehui.project.dto.ProjectWeeklyDto">
+        select pw.*,pm.person_name as userName ,pi.project_name as projectName,pi.project_no as projectNo
+        from project_weekly pw
         left join system_user_login sl on cast(pw.user_id as BIGINT)=sl.id_
         left join personal_member pm on pm.id_ =sl.userinfo_id
+        left join project_info pi on pi.id_=cast(pw.project_id as BIGINT)
         where
         pw.is_deleted='0' and pw.is_complete='0'
         <if test="projectWeekly.getId!=null">
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
index c0b25ca..d25954e 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
@@ -42,7 +42,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
     /**
      * 新增周报填报
      *
-     * @param projectWeekly
+     * @param projectWeeklyAddReq
      * @return
      * @throws XQException
      */
@@ -103,6 +103,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
                 projectWeekly.setIsComplete("0");
                 projectWeekly.setIsDeleted("0");
                 projectWeekly.setUserId(String.valueOf(userId));
+                projectWeekly.setWeeklyType("0");
                 List<ProjectWeeklyDto> list = projectWeeklyService.getList(page, projectWeekly);
                 ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
                 listResp.setLs(list);
diff --git a/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java b/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java
index 256249a..d88f122 100644
--- a/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java
+++ b/src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java
@@ -4,7 +4,8 @@ import com.xqopen.kehui.project.entity.ProjectWeekly;
 import lombok.Data;
 
 @Data
-public class ProjectWeeklyDto  {
-    String name;
-    ProjectWeekly projectWeekly;
+public class ProjectWeeklyDto extends ProjectWeekly {
+    String userName;
+    String projectName;
+    String projectNo;
 }