调整项目结构

work20220325/.idea/encodings.xml

@@ -3,9 +3,9 @@
   <component name="Encoding" defaultCharsetForPropertiesFiles="GBK">
     <file url="file://$PROJECT_DIR$/main.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/person" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/person/Person.cpp" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/person/TeachAssistant.h" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/person/base/Person.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/person/students/Graduate.cpp" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/person/students/TeachAssistant.h" charset="GBK" />
     <file url="PROJECT" charset="GBK" />
   </component>
 </project>

work20220325/CMakeLists.txt

@@ -7,4 +7,4 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     add_compile_options(-finput-charset=GBK -fexec-charset=GBK)
 endif ()
 
-add_executable(work20220325 main.cpp person/Person.cpp person/Person.h date/Date.cpp date/Date.h person/students/Student.cpp person/students/Student.h person/teachers/Teacher.cpp person/teachers/Teacher.h person/students/Graduate.cpp person/students/Graduate.h date/Date.cpp date/Date.h person/students/Student.cpp person/students/Student.h person/teachers/Teacher.cpp person/teachers/Teacher.h person/students/Graduate.cpp person/students/Graduate.h person/students/TeachAssistant.cpp person/students/TeachAssistant.h)
+add_executable(work20220325 main.cpp person/base/Person.cpp person/base/Person.h date/Date.cpp date/Date.h person/students/Student.cpp person/students/Student.h person/teachers/Teacher.cpp person/teachers/Teacher.h person/students/Graduate.cpp person/students/Graduate.h date/Date.cpp date/Date.h person/students/Student.cpp person/students/Student.h person/teachers/Teacher.cpp person/teachers/Teacher.h person/students/Graduate.cpp person/students/Graduate.h person/TeachAssistant.cpp person/TeachAssistant.h)

work20220325/main.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
-#include "person/Person.h"
+#include "person/base/Person.h"
 #include "person/students/Graduate.h"
-#include "person/students/TeachAssistant.h"
+#include "person/TeachAssistant.h"
 
 int main() {
     /*

work20220325/person/TeachAssistant.cpp

@@ -13,3 +13,5 @@ std::string TeachAssistant::toString() {
            << Teacher::toString();
     return output.str();
 }
+
+TeachAssistant::TeachAssistant(const TeachAssistant &teachAssistant) : Graduate(teachAssistant), Teacher(teachAssistant), Person(teachAssistant) {}

work20220325/person/TeachAssistant.h

@@ -1,11 +1,11 @@
 #ifndef WORK20220325_TEACHASSISTANT_H
 #define WORK20220325_TEACHASSISTANT_H
 
-#include "Student.h"
+#include "students/Student.h"
-#include "../teachers/Teacher.h"
+#include "teachers/Teacher.h"
-#include "Graduate.h"
+#include "students/Graduate.h"
 
-class TeachAssistant : public Graduate  , Teacher {
+class TeachAssistant : public Graduate, Teacher {
 public:
     TeachAssistant(int classId, const Person &person, const std::string &subject, const Teacher &adviser,
                    const std::string &job, const std::string &department);
@@ -14,6 +14,7 @@ public:
 
     std::string toString();
 
+    TeachAssistant(const TeachAssistant &teachAssistant);
 };
 
 

work20220325/person/base/Person.h

@@ -2,7 +2,7 @@
 #define WORK20220325_PERSON_H
 
 #include <string>
-#include "../date/Date.h"
+#include "../../date/Date.h"
 
 class Person {
 protected:

work20220325/person/students/Student.h

@@ -2,7 +2,7 @@
 #define WORK20220325_STUDENT_H
 
 
-#include "../Person.h"
+#include "../base/Person.h"
 
 class Student : virtual public Person {
 protected:

work20220325/person/teachers/Teacher.h

@@ -2,7 +2,7 @@
 #define WORK20220325_TEACHER_H
 
 
-#include "../Person.h"
+#include "../base/Person.h"
 
 class Teacher : virtual Person {
 protected: