增加返回字段

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckLeaveVO.java

@@ -37,6 +37,10 @@ public class CollectTruckLeaveVO {
     private String beginTime;
     @ApiModelProperty(value = "请假结束时间", example = "")
     private String endTime;
+    @ApiModelProperty(value = "请假原因", example = "")
+    private String remark;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
     @ApiModelProperty(value = "创建时间", example = "")
     private String createTime;
     @ApiModelProperty(value = "修改时间", example = "")

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckController.java

@@ -78,7 +78,7 @@ public class AppDriverCollectTruckController {
         return Result.ok();
     }
 
-    @ApiOperation(value = "更新拉运货物意愿", notes = "<br>By:艾庆国")
+    @ApiOperation(value = "更新接受距货源地最远距离", notes = "<br>By:艾庆国")
     @PostMapping("/updateGoodsType")
     public Result<Void> updateGoodsType(@RequestBody @Validated CollectTruckReportGoodsTypeUpdateParam param) {
         collectTruckReportService.updateGoodsType(param);

performance-web/src/main/java/com/clx/performance/model/collect/CollectTruckLeave.java

@@ -34,6 +34,7 @@ public class CollectTruckLeave implements HasKey<Integer> {
     private LocalDateTime beginTime;                //请假开始时间
     private LocalDateTime endTime;                  //请假结束时间
     private String remark;                          //请假原因
+    private LocalDateTime reportTime;               //上报时间
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间
 

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckLeaveServiceImpl.java

@@ -17,6 +17,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 @Slf4j
 @Service
 public class CollectTruckLeaveServiceImpl implements CollectTruckLeaveService {
@@ -42,6 +44,8 @@ public class CollectTruckLeaveServiceImpl implements CollectTruckLeaveService {
         collectTruckLeave.setBeginTime(LocalDateTimeUtils.parseTime(param.getBeginTime()));
         collectTruckLeave.setEndTime(LocalDateTimeUtils.parseTime(param.getEndTime()));
         collectTruckLeave.setRemark(param.getRemark());
+        collectTruckLeave.setReportTime(LocalDateTime.now());
+        collectTruckLeave.setCreateTime(collectTruckLeave.getReportTime());
         collectTruckLeaveDao.saveEntity(collectTruckLeave);
     }