feats

src/main/java/com/yunzhi/nanyang/controller/TaPersonController.java

@@ -242,6 +242,6 @@ public class TaPersonController extends BaseController {
             taPerson.setIsOrgManager(sysUser.getIsOrgManager());
         }
 
-        return ResponseBean.success(currentPerson());
+        return ResponseBean.success(taPerson);
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaWorkMessageController.java

@@ -46,11 +46,13 @@ public class TaWorkMessageController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                @ApiParam("消息类型") @RequestParam(value ="messageType", required = false) String messageType) throws Exception{
+                                @ApiParam("消息类型") @RequestParam(value ="messageType", required = false) String messageType,
+                                @ApiParam("订单号") @RequestParam(value ="orderNo", required = false) String orderNo) throws Exception{
 
         IPage<TaWorkMessage> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaWorkMessage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isEmpty(messageType), "message_type", messageType);
+        queryWrapper.like(StringUtils.isEmpty(orderNo), "order_no", "%" + orderNo + "%");
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaWorkMessage> result = iTaWorkMessageService.page(pg, queryWrapper);

src/main/java/com/yunzhi/nanyang/entity/TaWorkMessage.java

@@ -52,6 +52,12 @@ public class TaWorkMessage implements Serializable {
     @ApiModelProperty(value = "距离")
     private Integer distance;
 
+    @ApiModelProperty(value = "订单ID")
+    private String orderId;
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 

src/main/java/com/yunzhi/nanyang/service/impl/TaDispatchServiceImpl.java

@@ -80,6 +80,8 @@ public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaD
             message.setMessageType("accept");
             message.setAcceptPerson(taWorkJob.getWorkerName());
             message.setAcceptTime(taWorkJob.getCreateDate());
+            message.setOrderId(taOrder.getOrderId());
+            message.setOrderNo(taOrder.getOrderNo());
             taWorkMessageMapper.insert(message);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/yunzhi/nanyang/service/impl/TaWorkMessageServiceImpl.java

@@ -35,6 +35,8 @@ public class TaWorkMessageServiceImpl extends BaseServiceImpl<TaWorkMessageMappe
             message.setAppointPerson(StringUtils.ifNull(taPerson.getNickName(), taPerson.getPhone()));
             message.setAppointTime(DateUtils.now());
             message.setAppointMachineryType(taOrder.getTypeName());
+            message.setOrderId(taOrder.getOrderId());
+            message.setOrderNo(taOrder.getOrderNo());
             save(message);
         } catch (Exception e) {
             e.printStackTrace();