Merge remote-tracking branch 'origin/develop' into develop

project-gateway/pom.xml

@@ -62,6 +62,14 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>11</source>
+					<target>11</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file

project-order/src/main/java/com/dituhui/pea/order/dto/param/EngineerCalendar.java

@@ -24,7 +24,16 @@ public class EngineerCalendar {
     /**
      * 事件类型
      */
-    private String type;
+    private String eventType;
+    /**
+     * 事件
+     */
+    private String event;
+    /**
+     * 事件名称
+     */
+    private String content;
+
     /**
      * 开始时间
      */

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java

@@ -362,7 +362,10 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
                 List<EngineerCalendar> engineerCalendars = capacityEngineerCalendars.stream().map(entity -> {
                     EngineerCalendar engineerCalendar = new EngineerCalendar();
                     engineerCalendar.setDate(Date.from(instant));
-                    engineerCalendar.setType(entity.getType());
+                    engineerCalendar.setEventType(entity.getType());
+                    engineerCalendar.setEvent(entity.getReason());
+                    engineerCalendar.setContent(entity.getReason());
+                    engineerCalendar.setContent(entity.getReason());
                     Instant startInstant = entity.getStartTime().atZone(ZoneId.of("+8")).toInstant();
                     engineerCalendar.setBeginTime(Date.from(startInstant));
                     Instant endInstant = entity.getEndTime().atZone(ZoneId.of("+8")).toInstant();
@@ -380,7 +383,9 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
                 engineerCalendar.setEndTime(Date.from(endInstant));
                 engineerCalendar.setDate(Date.from(instant));
                 if (!workDayList.contains(String.valueOf(dayOfWeek))) {
-                    engineerCalendar.setType("REST");
+                    engineerCalendar.setEventType("REST");
+                    engineerCalendar.setEvent("休息");
+                    engineerCalendar.setContent("休息");
                 }
                 calendars.add(engineerCalendar);
             }