From 815aeed8ef115ebe54bca304111dfb72adfa989f Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 27 Jun 2023 10:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E4=BA=A4=E4=BB=98=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNotCompleteRecordVo.java               |  1 +
 .../BusVehicleDataHandoverMapper.xml          |  3 +-
 .../BusVehicleDataHandoverService.java        | 31 +++++++++++++
 .../BusVehicleInformationHandoverService.java | 46 +++++++++++++++++--
 .../NotCompleteRecordVo.java                  |  1 +
 5 files changed, 78 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
index 561698e738..cfc7924efa 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
@@ -19,6 +19,7 @@ public class AppNotCompleteRecordVo implements Vo {
     private String customerName;
     private String createInfo;
     private String carModel;
+    private String billId;
     private List<AppVinListVo> vinList = new ArrayList<>();
     private String createName;
     @ApiModelProperty("创建日期")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
index ea62509ffb..eff824305d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
@@ -40,7 +40,8 @@
         bvh.customerName,
         bvh.model as carModel,
         bvh.createName,
-        bvh.createTime
+        bvh.createTime,
+        bvh.billNo as billId
         from bus_vehicle_data_handover as bvh
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
index f5d9346bc2..c78451d761 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
@@ -773,6 +773,23 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
         AppInitVo vo = new AppInitVo();
         List<AppListBean> list = new ArrayList<>();
         if (StringUtils.isNotBlank(dto.getBillId())) {
+            String billId = dto.getBillId();
+            List<BusVehicleDataHandover> data = getDataByBillNo(billId).getData();
+            data.removeAll(Collections.singleton(null));
+            if (!data.isEmpty()) {
+                for (BusVehicleDataHandover datum : data) {
+                    vo.setContractId(datum.getContractNo());
+                    vo.setOperaName(datum.getRecName());
+                    vo.setOperaDate(datum.getRecDate());
+                    vo.setCustomerName(datum.getCustomerName());
+                    AppListBean appListBean = new AppListBean();
+                    appListBean.setInfo(datum.getItems());
+                    appListBean.setCarRecordSid(datum.getSid());
+                    appListBean.setVin(datum.getVinNo());
+                    list.add(appListBean);
+                }
+            }
+            vo.setList(list);
             return rb.success().setData(vo);
         } else {
             List<String> sids = dto.getVinRecordSid();
@@ -845,6 +862,20 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
                 sids.add(listBean.getCarRecordSid());
             }
         }
+        int i = 0;
+        //判断是修改还是新增
+        for (String sid : sids) {
+            BusVehicleDataHandover handover = fetchBySid(sid);
+            if (handover.getCompleteStateKey().equals("002")) {
+                handover.setRecName(dto.getOperaName());
+                handover.setRecDate(dto.getOperaDate());
+                i = baseMapper.updateById(handover);
+            }
+        }
+        if (i > 0) {
+            return rb.success();
+        }
+
         String model = "";
         String contractNo = "";
         String customerName = "";
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java
index b36e2c420d..7062607b21 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java
@@ -676,9 +676,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         list.add(new AppManiFestBean(0, "环保清单", "environmentalList", "", new ArrayList<>()));
         list.add(new AppManiFestBean(0, "驾驶员卡", "dirverCard", "", new ArrayList<>()));
         list.add(new AppManiFestBean(0, "气瓶产品质量证明书（燃气车）", "gasCertificate", "", new ArrayList<>()));
-        System.out.println("====================================");
-        System.out.println(list);
-        System.out.println("=======================================");
         vo.setManiFestBeanList(list);
         return rb.success().setData(vo);
     }
@@ -693,6 +690,10 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         BusVehicleInformationHandover entity = fetchBySid(sid);
+        String receiverSid = entity.getReceiverSid();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        String orgPath = sysUserVo.getOrgSidPath();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         List<AppManiFestBean> maniFestBeanList = dto.getManiFestBeanList();
         for (AppManiFestBean appManiFestBean : maniFestBeanList) {
             if (appManiFestBean.getKey().equals("vehicLeKeyNum")) {
@@ -759,11 +760,13 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         BeanUtil.copyProperties(dto, information);
         information.setHandoverSid(sid);
         information.setHandoverNum("001");
+        information.setReceiverSid(receiverSid);
         information.setRecName(entity.getRecName());
         if (StringUtils.isNotBlank(dto.getUserSid())) {
             SysUserInfoVo data = sysUserFeign.selectUserInfoByUserSid(dto.getUserSid()).getData();
             if (data != null) {
                 information.setTransferName(data.getStaffName());
+                information.setTransferSid(dto.getUserSid());
             }
         }
         information.setIsFuelVehicle(entity.getIsFuelVehicle());
@@ -798,6 +801,21 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
             }
         }
         baseMapper.updateById(entity);
+        //消息推送
+        MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
+        messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
+        messagePushTransferDto.setMsgType("业务");
+        messagePushTransferDto.setMsgTitle("随车资料移交");
+        messagePushTransferDto.setMsgContent(sysUserVo.getName() + "推送的随车资料移交，请查看");
+        messagePushTransferDto.setMsgSource("随车资料管理");
+        messagePushTransferDto.setSenderSid(dto.getUserSid());
+        messagePushTransferDto.setSenderName(sysUserVo.getName());
+        messagePushTransferDto.setSenderDeptSid(sysOrganizationVo.getSid());
+        messagePushTransferDto.setSenderDeptName(sysOrganizationVo.getName());
+        messagePushTransferDto.setBusinessSid(sid);
+        messagePushTransferDto.setReceiveSids(receiverSid);
+        messagePushTransferDto.setReceiveNames(entity.getRecName());
+        messageFeign.pushTransferMessage(messagePushTransferDto);
         return rb.success().setData(dto.getSid());
     }
 
@@ -878,6 +896,10 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         BusVehicleInformationHandover handover = fetchBySid(sid);
+        String receiverSid = handover.getReceiverSid();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        String orgPath = sysUserVo.getOrgSidPath();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         List<BusVehicleInformation> informations = busVehicleInformationService.getByHandoverSid(sid);
         if (informations.size() == 1) {
             for (BusVehicleInformation information : informations) {
@@ -892,6 +914,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                 entity.setManual(1);
                 entity.setEnvironmentalList(1);
                 entity.setDirverCard(1);
+                entity.setTransferSid(dto.getUserSid());
+                entity.setReceiverSid(receiverSid);
+                entity.setRecName(handover.getRecName());
                 if (entity.getIsFuelVehicle() == 0) {
                     entity.setGasCertificate(1);
                 } else {
@@ -907,6 +932,21 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                 busVehicleInformationService.insert(entity);
             }
         }
+        //消息推送
+        MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
+        messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
+        messagePushTransferDto.setMsgType("业务");
+        messagePushTransferDto.setMsgTitle("随车资料移交");
+        messagePushTransferDto.setMsgContent(sysUserVo.getName() + "推送的随车资料移交，请查看");
+        messagePushTransferDto.setMsgSource("随车资料管理");
+        messagePushTransferDto.setSenderSid(dto.getUserSid());
+        messagePushTransferDto.setSenderName(sysUserVo.getName());
+        messagePushTransferDto.setSenderDeptSid(sysOrganizationVo.getSid());
+        messagePushTransferDto.setSenderDeptName(sysOrganizationVo.getName());
+        messagePushTransferDto.setBusinessSid(sid);
+        messagePushTransferDto.setReceiveSids(receiverSid);
+        messagePushTransferDto.setReceiveNames(handover.getRecName());
+        messageFeign.pushTransferMessage(messagePushTransferDto);
         return rb.success().setData(sid);
     }
 
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
index 94489387ba..33f20572ca 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
@@ -20,6 +20,7 @@ public class NotCompleteRecordVo implements Vo {
     private String customerName;
     private String createInfo;
     private String carModel;
+    private String billId;
     private List<VinListVo> vinList = new ArrayList<>();