修改展示问题

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -309,8 +309,8 @@ public class BmsEventOrderService {
         CareEventOrderKeyApply apply = this.careEventOrderKeyApplyService.getById(applyId);
         UpdateWrapper<CareEventOrderKeyApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(CareEventOrderKeyApply::getId,applyId)
+                .set(CareEventOrderKeyApply::getKeyPass,RandomUtil.randomNumbers(6))
                 .set(CareEventOrderKeyApply::getStatus,KeyAuthEnum.AUTHED.getValue());
-        //TODO 增加日志
         CareEventOrderHandleHis his = new CareEventOrderHandleHis();
         his.setOrgId(apply.getOrgId());
         his.setStationId(apply.getStationId());

src/main/java/com/care/common/vo/order/ChambEventOrderVO.java

@@ -2,6 +2,7 @@ package com.care.common.vo.order;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -62,10 +63,12 @@ public class ChambEventOrderVO implements Serializable {
 
 
     @ApiModelProperty("到达时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date daodaTime;
 
 
     @ApiModelProperty("离开时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date likaiTime;
 
 
@@ -78,9 +81,11 @@ public class ChambEventOrderVO implements Serializable {
 
 
     @ApiModelProperty("createTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
 
     @ApiModelProperty("modifyTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date modifyTime;
 }

src/main/java/com/care/keeper/controller/KeeperEventApiController.java

@@ -11,6 +11,7 @@ import com.care.keeper.service.KeeperApiService;
 import com.care.keeper.service.KeeperPassportService;
 import com.care.keeper.vo.HouseContactVO;
 import com.care.keeper.vo.KeeperInfoVO;
+import com.care.keeper.vo.LikaiConfimVO;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -138,8 +139,8 @@ public class KeeperEventApiController {
 
     @PostMapping("/likai")
     @ApiOperation(tags = {"事件处理"},value = "离开确认")
-    public Result<Object> liKaiConfirm(@RequestParam("chambOrderId") Long chambOrderId,@RequestParam("remark") String remark,@RequestParam("urls") String urls){
-        if (this.keeperApiService.liKaiConfirm(chambOrderId,remark,urls)){
+    public Result<Object> liKaiConfirm(@RequestBody LikaiConfimVO likaiConfimVO){
+        if (this.keeperApiService.liKaiConfirm(likaiConfimVO.getChambOrderId(),likaiConfimVO.getRemark(),likaiConfimVO.getUrls())){
             return  Result.success("离开确认成功！");
         }else{
             return  Result.error("操作失败！");

src/main/java/com/care/keeper/service/KeeperApiService.java

@@ -162,6 +162,7 @@ public class KeeperApiService {
             contacts.forEach(item -> {
                 HouseContactVO vo = new HouseContactVO();
                 BeanUtil.copyProperties(item,vo);
+                vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
                 vos.add(vo);
             });
         }
@@ -251,6 +252,7 @@ public class KeeperApiService {
         Date date = DateUtil.date();
         UpdateWrapper<CareEventOrderChamb> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(CareEventOrderChamb::getId,orderChambId)
+                .set(CareEventOrderChamb::getStatus,ChambOrderStatusEnum.DOING.getValue())
                 .set(CareEventOrderChamb::getDaodaTime,date)
                 .set(CareEventOrderChamb::getModifyTime,date);
         flag = this.careEventOrderChambService.update(updateWrapper);

src/main/java/com/care/keeper/vo/LikaiConfimVO.java

@@ -0,0 +1,15 @@
+package com.care.keeper.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/6/12
+ * @Desc:
+ */
+@Data
+public class LikaiConfimVO {
+    private Long chambOrderId;
+    private String remark;
+    private String urls;
+}