yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

移动端对外交付详情接口

master
fanzongzhe 2 years ago
parent
5fec3f799f
commit
815aeed8ef
5 changed files with 78 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
  2. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
  3. 31
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
  4. 46
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java
  5. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppNotCompleteRecordVo.java
View File

@ -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("创建日期")

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
View File

@ -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}

31
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
View File

@ -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 = "";

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

@ -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);
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/NotCompleteRecordVo.java
View File

@ -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<>();

Write Preview
Loading…
Cancel
Save