Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java

@@ -51,5 +51,6 @@ public class BusVehicleInformationHandover extends BaseEntity {
     private Integer isFuelVehicle; // 是否是燃气车 0不是1是
     @ApiModelProperty("使用组织全路径")
     private String orgSidPath;
-
+    @ApiModelProperty("接收人sid")
+    private String receiverSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java

@@ -60,4 +60,7 @@ public class BusVehicleInformationHandoverDto implements Dto {
     private Boolean modifyState; // ture/false 是/否
     @ApiModelProperty("使用组织全路径")
     private String orgSidPath;
+    @ApiModelProperty("接收人sid")
+    private String receiverSid;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -19,14 +19,18 @@ import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.*;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.MessagePushTransferDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,6 +65,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
     @Autowired
     private BusSalesOrderService busSalesOrderService;
 
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
     /**
      * 新增或修改
      *
@@ -72,6 +79,10 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         if (StringUtils.isNotBlank(dto.getSid())) {
             String sid = dto.getSid();
             BusVehicleInformationHandover entity = fetchBySid(sid);
+            String transferSid = dto.getCreateBySid();
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(transferSid).getData();
+            String orgPath = dto.getOrgSidPath();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             BusVehicleInformationDto informationDto = dto.getBusVehicleInformation();
             //判断是不是一次交接还是二次
@@ -159,6 +170,23 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                 str.delete(str.length() - 1, str.length());
                 busVehicleInformation.setVehicleHandoverData(str.toString());
                 busVehicleInformationService.updateById(busVehicleInformation);
+
+//                //消息推送
+//                MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
+//                messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
+//                messagePushTransferDto.setMsgType("业务");
+//                messagePushTransferDto.setMsgTitle("随车资料移交");
+//                messagePushTransferDto.setMsgContent(sysUserVo.getName() + "推送的随车资料移交，请查看");
+//                messagePushTransferDto.setMsgSource("随车资料管理");
+//                messagePushTransferDto.setSenderSid(transferSid);
+//                messagePushTransferDto.setSenderName(sysUserVo.getName());
+//                messagePushTransferDto.setSenderDeptSid(sysOrganizationVo.getSid());
+//                messagePushTransferDto.setSenderDeptName(sysOrganizationVo.getName());
+//                messagePushTransferDto.setBusinessSid(sid);
+//                messagePushTransferDto.setReceiveSids(sysUserVo1.getSid());
+//                messagePushTransferDto.setReceiveNames(sysUserVo1.getName());
+//                messageFeign.pushTransferMessage(messagePushTransferDto);
+
             }
             List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(dto.getSid());
             if (null != informationList && informationList.size() > 0) {