周报

src/main/java/com/jeeplus/modules/projectplanweekly/entity/ProjectPlanWeekly.java

@@ -17,6 +17,21 @@ public class ProjectPlanWeekly extends DataEntity<ProjectPlanWeekly> {
     private String weeklyStatus; //0-为完成工作计划
     private String remarksStatus; //备注状态
     private String remarksReason; //备注原因
+    private String officeId;
+    private String companyId;
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
     private ProjectRecords projectRecords;
 
     public ProjectRecords getProjectRecords() {
@@ -29,6 +44,19 @@ public class ProjectPlanWeekly extends DataEntity<ProjectPlanWeekly> {
 
     private User user;
     private Office office;
+    private Office company;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public Office getCompany() {
+        return company;
+    }
+
+    public void setCompany(Office company) {
+        this.company = company;
+    }
 
     public Office getOffice() {
         return office;

src/main/java/com/jeeplus/modules/projectplanweekly/web/ProjectPlanWeeklyController.java

@@ -102,6 +102,8 @@ public class ProjectPlanWeeklyController extends BaseController {
                 projectPlanWeekly.setRemarksReason("");
                 projectPlanWeeklyService.updateWeekly(projectPlanWeekly);
             }else {
+                projectPlanWeekly.setOfficeId(UserUtils.getUser().getOffice().getId());
+                projectPlanWeekly.setCompanyId(UserUtils.getUser().getCompany().getId());
                 projectPlanWeeklyService.save(projectPlanWeekly);
             }
         }catch (Exception e){