Merge branch 'feat-calender' into develop

project-order/src/main/java/com/dituhui/pea/order/controller/EngineerCalendarController.java

@@ -7,10 +7,9 @@ import com.dituhui.pea.order.service.EngineerCalendarService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 @Slf4j
 @RestController
@@ -20,6 +19,9 @@ public class EngineerCalendarController {
     @Autowired
     EngineerCalendarService engineerCalendarService;
 
+    @Autowired
+    private HttpServletRequest request;
+
     @GetMapping("/engineer/calendar")
     public Result<?> getEngineerCalendar(@Validated EngineerCalendarDTO.Request reqDTO) {
         Result<?> res = null;
@@ -44,6 +46,7 @@ public class EngineerCalendarController {
 
     @GetMapping("/engineer/calendar/plan/detail")
     public Result<?> getCalendarPlanDetail(@Validated CalendarDetailDTO.Request reqDTO) {
+        log.info("==== request ===> {}", request);
         Result<?> res = null;
         try {
             res = engineerCalendarService.getPlanDetail(reqDTO);

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

@@ -108,6 +108,9 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
         rs.setTypeName(entity.getReason());
         rs.setStartTime(DateUtils.formatDateTime(entity.getStartTime()));
         rs.setEndTime(DateUtils.formatDateTime(entity.getEndTime()));
+        rs.setRemark(entity.getMemo());
+        // todo 操作员
+        // rs.setOperator()
         return Result.success(rs);
     }