个人周报填报查询修改

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">

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);

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;
 }