diff --git a/src/main/java/com/xqopen/kehui/Api.java b/src/main/java/com/xqopen/kehui/Api.java
index 96f4e60..4ffe3f3 100644
--- a/src/main/java/com/xqopen/kehui/Api.java
+++ b/src/main/java/com/xqopen/kehui/Api.java
@@ -693,8 +693,9 @@ public class Api {
      * 部门周报填报管理
      */
     public static final String PROJECT_DEPARTMENT = PROJECT_PREFIX + "/departmentWeekly";
-    public static final String PROJECT_DEPARTMENT_EDIT= PROJECT_DEPARTMENT+"/{id}";
-    public static final String PROJECT_DEPARTMENT_SHOW= PROJECT_DEPARTMENT+"showById/{id}";
+    public static final String PROJECT_DEPARTMENT_EDIT= PROJECT_DEPARTMENT+"/update";
+    public static final String PROJECT_DEPARTMENT_SHOW= PROJECT_DEPARTMENT+"/showById";
+    public static final String PROJECT_DEPARTMENT_UPDATE= PROJECT_DEPARTMENT_SHOW+"/{id}";
 
 
 
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 963db6f..8a17ab1 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
@@ -59,7 +59,7 @@
         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_complete='0' and pw.dept_id=#{projectWeekly.deptId}
+        pw.is_complete='0' and pw.dept_id=#{projectWeekly.deptId} and pw.weekly_type = '1'
 
     </select>
     <select id="getDeptId" resultType="java.lang.String" parameterType="java.lang.String">
@@ -67,11 +67,12 @@
         from project_weekly
         where user_id = #{userId}
     </select>
-    <select id="showById" resultType="java.lang.Object" parameterType="java.lang.String">
+    <select id="showById" resultType="java.util.Map" parameterType="java.lang.String">
         select pm.person_name , pw.workload
         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 system_user_login sl on cast(pw.user_id as BIGINT)=sl.id_
+                 left join personal_member pm on pm.id_ =sl.userinfo_id
         where pw.id_=#{id}
     </select>
+
 </mapper>
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
index ee4f1ab..449893c 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
@@ -39,11 +39,13 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
     ISystemUserLoginService systemUserLoginService;
 
 
+    // 获取用户名和工作量
     @Override
-    @GetMapping(Api.PROJECT_DEPARTMENT_SHOW)
-    public String showById(@PathVariable("id") Long id) throws XQException {
+    @GetMapping(Api.PROJECT_DEPARTMENT_UPDATE)
+    public String showById(@PathVariable Long id) throws XQException {
             //根据项目id获取员工信息
             List<Object> list = projectDepartmentService.showById(id.toString());
+        System.out.println("list = " + list);
             return ApiResponse.fillSuccess(list);
     }
 
@@ -105,7 +107,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
 
     @Override
     @PutMapping(Api.PROJECT_DEPARTMENT_EDIT)
-    public String edit(Long userId, ProjectInfoInitDto initDto, Long id) throws XQException {
+    public String edit(@RequestHeader("userId") Long userId, @RequestBody ProjectWeeklyAddReq projectWeeklyAddReq) throws XQException {
         return null;
     }
 }
diff --git a/src/main/java/com/xqopen/kehui/project/api/ProjectDepartmentApi.java b/src/main/java/com/xqopen/kehui/project/api/ProjectDepartmentApi.java
index 7eeb400..c2e51c1 100644
--- a/src/main/java/com/xqopen/kehui/project/api/ProjectDepartmentApi.java
+++ b/src/main/java/com/xqopen/kehui/project/api/ProjectDepartmentApi.java
@@ -29,5 +29,5 @@ public interface ProjectDepartmentApi {
             @ApiImplicitParam(name = "token", value = "登录标识符", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"),
     })
-    String edit(Long userId, ProjectInfoInitDto initDto, Long id) throws XQException;
+    String edit(Long userId, ProjectWeeklyAddReq projectWeeklyAddReq) throws XQException;
 }