Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
0d0ea09212
  1. 18
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitDto.java
  2. 25
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitVo.java
  3. 16
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListBean.java
  4. 18
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppUploadDto.java
  5. 21
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java
  6. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java
  7. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java
  8. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java
  9. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  11. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java
  12. 235
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
  13. 65
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java
  14. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl
  15. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
  16. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
  17. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue
  18. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
  19. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
  20. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
  21. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
  22. 4
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  23. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitDto.java
  24. 22
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java
  25. 16
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehListBean.java
  26. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehUploadDto.java
  27. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java
  28. 20
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java
  29. 20
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java
  30. 40
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java

18
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitDto.java

@ -0,0 +1,18 @@
package com.yxt.anrui.buscenter.api.busvehicledatahandover;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/6/26 14:37
*/
@Data
public class AppInitDto implements Dto {
private String billId;
private List<String> vinRecordSid = new ArrayList<>();
}

25
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppInitVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.buscenter.api.busvehicledatahandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/6/26 10:01
*/
@Data
public class AppInitVo implements Vo {
private String userSid;
private String orgPath;
private String contractId;
private String customerName;
private String operaName;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date operaDate;
private List<AppListBean> list;
}

16
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppListBean.java

@ -0,0 +1,16 @@
package com.yxt.anrui.buscenter.api.busvehicledatahandover;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/6/26 10:02
*/
@Data
public class AppListBean implements Vo {
private String carRecordSid;
private String vin;
private String info;
}

18
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/AppUploadDto.java

@ -0,0 +1,18 @@
package com.yxt.anrui.buscenter.api.busvehicledatahandover;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/6/26 9:01
*/
@Data
public class AppUploadDto implements Dto {
private String billId;
private List<String> imgs = new ArrayList<>();
}

21
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeign.java

@ -49,7 +49,7 @@ public interface BusVehicleDataHandoverFeign {
public ResultBean<BusDetailsVo> details(@PathVariable("sid") String sid);
@ApiOperation("根据单据编号获得记录")
@GetMapping("/getOneByBillNo")
@GetMapping("/getDataByBillNo")
@ResponseBody
public ResultBean<List<BusVehicleDataHandover>> getDataByBillNo(@RequestParam("billNo") String billNo);
@ -105,4 +105,23 @@ public interface BusVehicleDataHandoverFeign {
@ResponseBody
ResultBean<PagerVo<AppCompleteRecordVo>> getCarDocsConfirmList(@RequestBody PagerQuery<AppListQuery> pagerQuery);
@ApiOperation(("查看图片"))
@GetMapping("/confirmCarDocsRecord")
public ResultBean<List<String>> getCarDocsRecordImg(@RequestParam("billId") String billId);
@ApiOperation(("上传图片"))
@PutMapping("/saveCarDocsRecordImg")
public ResultBean saveCarDocsRecordImg(@RequestBody AppUploadDto dto);
@ApiOperation(("编辑初始化/详情"))
@PostMapping("/initCarDocsRecord")
@ResponseBody
public ResultBean<AppInitVo> initCarDocsRecord(@RequestBody AppInitDto dto);
@ApiOperation("新增")
@PostMapping("/confirmCarDocsRecord")
public ResultBean confirmCarDocsRecord(@RequestBody AppInitVo dto);
}

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicledatahandover/BusVehicleDataHandoverFeignFallback.java

@ -91,4 +91,24 @@ public class BusVehicleDataHandoverFeignFallback implements BusVehicleDataHandov
public ResultBean<PagerVo<AppCompleteRecordVo>> getCarDocsConfirmList(PagerQuery<AppListQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<List<String>> getCarDocsRecordImg(String billId) {
return null;
}
@Override
public ResultBean saveCarDocsRecordImg(AppUploadDto dto) {
return null;
}
@Override
public ResultBean<AppInitVo> initCarDocsRecord(AppInitDto dto) {
return null;
}
@Override
public ResultBean confirmCarDocsRecord(AppInitVo dto) {
return null;
}
}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java

@ -5,6 +5,7 @@ import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
@ -47,5 +48,8 @@ public class BusVehicleInformation extends BaseEntity {
private String vehicleHandoverData; //
@ApiModelProperty("移交备注")
private String transferRemarks; // 移交备注
@ApiModelProperty("接收人sid")
private String receiverSid;
@ApiModelProperty("移交人sid")
private String transferSid;
}

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

@ -18,6 +18,8 @@ import java.util.Date;
public class BusVehicleInformationHandoverDetailsVo implements Vo {
private String sid;
private String createBySid;
private String orgSidPath;
@ApiModelProperty("车辆sid")
private String vehicleSid; // 车辆sid
@ApiModelProperty("是否是燃气车 0不是1是")

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

@ -1,6 +1,5 @@
package com.yxt.anrui.buscenter.api.busvehicleinformationhandover;
import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
@ -20,6 +19,7 @@ import java.util.List;
public class BusVehicleInformationHandoverDto implements Dto {
private String sid;
private String orgSidPath;
@ApiModelProperty("移交状态key002待移交 001未移交 004已移交 003移交中")
private String transferStateKey;
@ApiModelProperty("移交状态")
@ -58,8 +58,6 @@ public class BusVehicleInformationHandoverDto implements Dto {
private Boolean complete; // ture/false 完成/未完成
@ApiModelProperty("是否修改状态")
private Boolean modifyState; // ture/false 是/否
@ApiModelProperty("使用组织全路径")
private String orgSidPath;
@ApiModelProperty("接收人sid")
private String receiverSid;

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -929,6 +929,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (organizationVoResultBean.getData() != null) {
dto.setUseOrgName(organizationVoResultBean.getData().getName());
}
dto.setOrgSidPath(busDeliveredApply.getOrgSidPath());
dto.setReceiverSid(busDeliveredApply.getCreateBySid());
busVehicleInformationHandoverService.saveOrUpdate(dto);
}
}

20
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverRest.java

@ -109,4 +109,24 @@ public class BusVehicleDataHandoverRest implements BusVehicleDataHandoverFeign {
public ResultBean<PagerVo<AppCompleteRecordVo>> getCarDocsConfirmList(PagerQuery<AppListQuery> pagerQuery) {
return busVehicleDataHandoverService.getCarDocsConfirmList(pagerQuery);
}
@Override
public ResultBean<List<String>> getCarDocsRecordImg(String billId) {
return busVehicleDataHandoverService.getCarDocsRecordImg(billId);
}
@Override
public ResultBean saveCarDocsRecordImg(AppUploadDto dto) {
return busVehicleDataHandoverService.saveCarDocsRecordImg(dto);
}
@Override
public ResultBean<AppInitVo> initCarDocsRecord(AppInitDto dto) {
return busVehicleDataHandoverService.initCarDocsRecord(dto);
}
@Override
public ResultBean confirmCarDocsRecord(AppInitVo dto) {
return busVehicleDataHandoverService.confirmCarDocsRecord(dto);
}
}

235
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java

@ -698,4 +698,239 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
PagerVo<AppCompleteRecordVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
/**
* 上传图片
*
* @param dto
* @return
*/
public ResultBean saveCarDocsRecordImg(AppUploadDto dto) {
ResultBean rb = ResultBean.fireFail();
String billId = dto.getBillId();
List<BusVehicleDataHandover> data = getDataByBillNo(billId).getData();
data.removeAll(Collections.singleton(null));
if (!data.isEmpty()) {
for (BusVehicleDataHandover handover : data) {
String saveSid = handover.getSid();
buscenterFileService.delByLinkSidOrType(saveSid, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType());
List<String> imgs = dto.getImgs();
if (!imgs.isEmpty()) {
buscenterFileService.saveAll(saveSid, imgs, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType());
}
}
}
return rb.success();
}
/**
* 查看图片
*
* @param billId
* @return
*/
public ResultBean<List<String>> getCarDocsRecordImg(String billId) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<BusVehicleDataHandover> data = getDataByBillNo(billId).getData();
data.removeAll(Collections.singleton(null));
if (!data.isEmpty()) {
for (BusVehicleDataHandover datum : data) {
String sid = datum.getSid();
if (StringUtils.isNotBlank(datum.getLinkSid())) {
//交车资料确认单
List<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.ENTRUST_CONFIRM_IMAGES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
return rb.success().setData(entrustConfirmImages);
}
} else {
//交车资料确认单
List<BuscenterFile> fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.VEHICLE_SECOND_DATA_HANDOVER.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> entrustConfirmImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
return rb.success().setData(entrustConfirmImages);
}
}
}
}
return rb.success();
}
/**
* 编辑初始化/详情
*
* @param dto
* @return
*/
public ResultBean<AppInitVo> initCarDocsRecord(AppInitDto dto) {
ResultBean<AppInitVo> rb = ResultBean.fireFail();
AppInitVo vo = new AppInitVo();
List<AppListBean> list = new ArrayList<>();
if (StringUtils.isNotBlank(dto.getBillId())) {
return rb.success().setData(vo);
} else {
List<String> sids = dto.getVinRecordSid();
vo.setOperaDate(new Date());
for (String sid : sids) {
StringBuffer sb = new StringBuffer();
BusVehicleDataHandover entity = fetchBySid(sid);
vo.setContractId(entity.getContractNo());
vo.setCustomerName(entity.getCustomerName());
String linkSid = entity.getLinkSid();
List<BusHandoverItems> handoverItems = busHandoverItemsService.getItemsListByMainSid(linkSid).getData();
handoverItems.removeAll(Collections.singleton(null));
AppListBean dataListVo = new AppListBean();
if (!handoverItems.isEmpty()) {
for (BusHandoverItems handoverItem : handoverItems) {
if (handoverItem.getVinSid().equals(entity.getVinSid())) {
String itemValue = handoverItem.getItemKey();
if (!itemValue.contains("001")) {
sb.append("发票").append("、");
}
if (!itemValue.contains("002")) {
sb.append("合格证").append("、");
}
if (!itemValue.contains("003")) {
sb.append("车钥匙").append("、");
}
if (!itemValue.contains("004")) {
sb.append("一致性证书").append("、");
}
if (!itemValue.contains("005")) {
sb.append("申请表").append("、");
}
if (!itemValue.contains("006")) {
sb.append("保修手册、说明书").append("、");
}
if (!itemValue.contains("007")) {
sb.append("环保清单").append("、");
}
if (!itemValue.contains("008")) {
sb.append("驾驶员卡").append("、");
}
if (!itemValue.contains("009")) {
if (handoverItem.getIsFuelVehicle().equals("0")) {
sb.append("气瓶检测合格证").append("、");
}
}
dataListVo.setVin(handoverItem.getVinNo());
dataListVo.setCarRecordSid(sid);
if (sb.toString().length() > 0) {
sb.delete(sb.length() - 1, sb.length());
}
}
dataListVo.setInfo(sb.toString());
}
}
list.add(dataListVo);
vo.setList(list);
}
}
return rb.success().setData(vo);
}
public ResultBean confirmCarDocsRecord(AppInitVo dto) {
ResultBean rb = ResultBean.fireFail();
List<AppListBean> listBeans = dto.getList();
List<String> sids = new ArrayList<>();
if (!listBeans.isEmpty()) {
for (AppListBean listBean : listBeans) {
sids.add(listBean.getCarRecordSid());
}
}
String model = "";
String contractNo = "";
String customerName = "";
if (!sids.isEmpty()) {
for (String sid : sids) {
BusVehicleDataHandover entity = fetchBySid(sid);
entity.setCompleteStateKey("002");
entity.setCompleteStateValue("已完成");
model = entity.getModel();
contractNo = entity.getContractNo();
customerName = entity.getCustomerName();
baseMapper.updateById(entity);
}
}
String userOrgSid = "";
String billNo = "";
String userOrgName = "";
String createName = "";
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath());
if (orgSidByPath.getSuccess()) {
userOrgSid = orgSidByPath.getData();
//交车资料确认单编号
billNo = getApplyCode(userOrgSid);
ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
if (organizationVo.getSuccess()) {
SysOrganizationVo organizationVoData = organizationVo.getData();
if (null != organizationVoData) {
userOrgName = organizationVoData.getName();
}
}
}
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (sysUserVoResultBean.getSuccess()) {
SysUserVo data = sysUserVoResultBean.getData();
if (null != data) {
createName = data.getName();
}
}
List<String> newSids = new ArrayList<>();
if (!listBeans.isEmpty()) {
for (AppListBean vinData : listBeans) {
String recordSid = vinData.getCarRecordSid();
BusVehicleDataHandover handover = fetchBySid(recordSid);
String vinSid = handover.getVinSid();
BusVehicleDataHandover newEntity = new BusVehicleDataHandover();
newSids.add(newEntity.getSid());
newEntity.setCreateBySid(dto.getUserSid());
newEntity.setRecDate(dto.getOperaDate());
newEntity.setRecName(dto.getOperaName());
newEntity.setUseOrgSid(userOrgSid);
newEntity.setBillNo(billNo);
newEntity.setUseOrgName(userOrgName);
newEntity.setVinNo(vinData.getVin());
newEntity.setVinSid(vinSid);
newEntity.setContractNo(dto.getContractId());
newEntity.setCustomerName(dto.getCustomerName());
newEntity.setModel(model);
newEntity.setItems(vinData.getInfo());
newEntity.setCreateName(createName);
newEntity.setCompleteStateValue("已完成");
newEntity.setCompleteStateKey("002");
newEntity.setOrgSidPath(dto.getOrgPath());
baseMapper.insert(newEntity);
}
}
BusVehicleDataHandoverPdfVo pdfVo = new BusVehicleDataHandoverPdfVo();
List<BusDataListPdfVo> pdfVos = new ArrayList<>();
pdfVo.setBillNo(billNo);
pdfVo.setContractNo(contractNo);
pdfVo.setCustomerName(customerName);
if (!listBeans.isEmpty()) {
int sNo = 1;
for (AppListBean dataVo : listBeans) {
BusDataListPdfVo dataPdfVo = new BusDataListPdfVo();
dataPdfVo.setSNo(String.valueOf(sNo++));
dataPdfVo.setVinNo(dataVo.getVin());
dataPdfVo.setItems(dataVo.getInfo());
pdfVos.add(dataPdfVo);
}
}
pdfVo.setPdfVos(pdfVos);
String s = commonCreatePdf(pdfVo);
String filePath = s.substring(docPdfComponent.getUploadTemplateUrl().length());
if (!newSids.isEmpty()) {
for (String newSid : newSids) {
BusVehicleDataHandover handover = fetchBySid(newSid);
handover.setDownloadPath(filePath);
baseMapper.updateById(handover);
}
}
return rb.success();
}
}

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

@ -30,6 +30,7 @@ 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.MessageFeign;
import com.yxt.messagecenter.api.message.MessagePushTransferDto;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -68,6 +69,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private MessageFeign messageFeign;
/**
* 新增或修改
*
@ -79,6 +83,11 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
if (StringUtils.isNotBlank(dto.getSid())) {
String sid = dto.getSid();
BusVehicleInformationHandover entity = fetchBySid(sid);
//接收人sid
String receiverSid = entity.getReceiverSid();
//接收人姓名
String recName = entity.getRecName();
//移交人sid
String transferSid = dto.getCreateBySid();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(transferSid).getData();
String orgPath = dto.getOrgSidPath();
@ -87,7 +96,12 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
BusVehicleInformationDto informationDto = dto.getBusVehicleInformation();
//判断是不是一次交接还是二次
List<BusVehicleInformation> informations = busVehicleInformationService.getByHandoverSid(sid);
if (null != informations && !informations.isEmpty() && informations.size() < 2) {
//判断是否已经交接过两次
if (informations.size() == 2) {
return rb.success().setMsg("已经完成二次交接,请勿重复交接");
}
informations.removeAll(Collections.singleton(null));
if (!informations.isEmpty() && informations.size() < 2) {
for (BusVehicleInformation information : informations) {
BusVehicleInformation twiceInformation = new BusVehicleInformation();
if ("001".equals(information.getHandoverNum())) {
@ -115,6 +129,21 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
busVehicleInformationService.insert(twiceInformation);
}
}
//消息推送
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(receiverSid);
messagePushTransferDto.setReceiveNames(recName);
messageFeign.pushTransferMessage(messagePushTransferDto);
} else if (informations.size() != 2) {
//一次交接
BusVehicleInformation newInformation = new BusVehicleInformation();
@ -125,7 +154,9 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
newInformation.setHandoverNum("001");
//接收人
newInformation.setRecName(dto.getRecName());
newInformation.setReceiverSid(receiverSid);
//移交人
newInformation.setTransferSid(transferSid);
newInformation.setTransferName(informationDto.getTransferName());
newInformation.setTransferRemarks(informationDto.getTransferRemarks());
newInformation.setHandoverSid(sid);
@ -170,23 +201,21 @@ 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);
//消息推送
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(receiverSid);
messagePushTransferDto.setReceiveNames(recName);
messageFeign.pushTransferMessage(messagePushTransferDto);
}
List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(dto.getSid());
if (null != informationList && informationList.size() > 0) {

29
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl

@ -612,7 +612,19 @@
</w:rPr>
<w:t>一、时间:</w:t>
</w:r>
<w:r>
<w:rPr>
<w:rFonts w:ascii="仿宋" w:fareast="仿宋" w:h-ansi="仿宋" w:cs="仿宋"/>
<wx:font wx:val="仿宋"/>
<w:spacing w:val="7"/>
<w:sz w:val="23"/>
<w:sz-cs w:val="23"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00602C30" wsp:rsidRDefault="00000000">
<w:pPr>
<w:spacing w:before="201" w:line="328" w:line-rule="exact"/>
@ -646,6 +658,17 @@
</w:rPr>
<w:t>、地点:</w:t>
</w:r>
<w:r>
<w:rPr>
<w:rFonts w:ascii="仿宋" w:fareast="仿宋" w:h-ansi="仿宋" w:cs="仿宋"/>
<wx:font wx:val="仿宋"/>
<w:spacing w:val="7"/>
<w:sz w:val="23"/>
<w:sz-cs w:val="23"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00602C30" wsp:rsidRDefault="00000000">
<w:pPr>
@ -906,7 +929,7 @@
<w:sz-cs w:val="23"/>
<w:u w:val="single"/>
</w:rPr>
<w:t></w:t>
<w:t> </w:t>
</w:r>
<w:r>
<w:rPr>
@ -968,7 +991,7 @@
<w:sz-cs w:val="23"/>
<w:u w:val="single"/>
</w:rPr>
<w:t></w:t>
<w:t> </w:t>
</w:r>
<w:r>
<w:rPr>
@ -989,7 +1012,7 @@
<w:sz-cs w:val="23"/>
<w:u w:val="single"/>
</w:rPr>
<w:t></w:t>
<w:t> </w:t>
</w:r>
<w:r>
<w:rPr>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue

@ -88,7 +88,7 @@
<span>{{ scope.row.collectionBankNum }}</span>
</template>
</el-table-column>
<el-table-column label="收款银行名称" align="center" width="130">
<el-table-column label="收款账户名称" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.receivingName }}</span>
</template>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@ -108,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
<span>收款账户名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue

@ -96,7 +96,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
<span>收款账户名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@ -75,7 +75,7 @@
<span>{{ scope.row.collectionBankNum }}</span>
</template>
</el-table-column>
<el-table-column label="收款银行名称" align="center" width="130">
<el-table-column label="收款账户名称" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.receivingName }}</span>
</template>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@ -77,7 +77,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
<span>收款账户名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue

@ -97,7 +97,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
<span>收款账户名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue

@ -106,7 +106,7 @@
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
<span>收款账户名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>

4
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -504,7 +504,6 @@ public class FlowableRest implements FlowableFeign {
List<FlowElement> flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(),
dto.getFormVariables());
boolean contains = false;
boolean adminSecondsContains = false;
for (int i = 0; i < flowElements.size(); i++) {
FlowElement flowElement = flowElements.get(i);
String id = flowElement.getId();
@ -562,9 +561,6 @@ public class FlowableRest implements FlowableFeign {
if (contains) {
break;
}
if (adminSecondsContains) {
break;
}
}
if (contains) {
dto.setUserSid(nextUserSid);

18
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitDto.java

@ -0,0 +1,18 @@
package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/6/26 14:37
*/
@Data
public class VehInitDto implements Dto {
private String billId;
private List<String> vinRecordSid = new ArrayList<>();
}

22
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehInitVo.java

@ -0,0 +1,22 @@
package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/6/26 10:01
*/
@Data
public class VehInitVo implements Vo {
private String userSid;
private String orgPath;
private String contractId;
private String customerName;
private String operaName;
private String operaDate;
private List<VehListBean> list;
}

16
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehListBean.java

@ -0,0 +1,16 @@
package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/6/26 10:02
*/
@Data
public class VehListBean implements Vo {
private String carRecordSid;
private String vin;
private String info;
}

18
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehUploadDto.java

@ -0,0 +1,18 @@
package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/6/26 9:25
*/
@Data
public class VehUploadDto implements Dto {
private String billId;
private List<String> imgs = new ArrayList<>();
}

18
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java

@ -106,4 +106,22 @@ public interface VehicleInformationHandoverFeign {
@ResponseBody
ResultBean<PagerVo<CompleteRecordVo>> getCarDocsConfirmList(@RequestBody PagerQuery<ListQuery> pagerQuery);
@ApiOperation(("上传图片"))
@PutMapping("/saveCarDocsRecordImg")
public ResultBean saveCarDocsRecordImg(@RequestBody VehUploadDto dto);
@ApiOperation(("查看图片"))
@GetMapping("/confirmCarDocsRecord")
public ResultBean<List<String>> getCarDocsRecordImg(@RequestParam("billId") String billId);
@ApiOperation(("编辑初始化/详情"))
@PostMapping("/initCarDocsRecord")
@ResponseBody
public ResultBean<VehInitVo> initCarDocsRecord(@RequestBody VehInitDto dto);
@ApiOperation("新增")
@PostMapping("/confirmCarDocsRecord")
public ResultBean confirmCarDocsRecord(@RequestBody VehInitVo dto);
}

20
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java

@ -95,4 +95,24 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati
public ResultBean<PagerVo<CompleteRecordVo>> getCarDocsConfirmList(PagerQuery<ListQuery> pagerQuery) {
return null;
}
@Override
public ResultBean saveCarDocsRecordImg(VehUploadDto dto) {
return null;
}
@Override
public ResultBean<List<String>> getCarDocsRecordImg(String billId) {
return null;
}
@Override
public ResultBean<VehInitVo> initCarDocsRecord(VehInitDto dto) {
return null;
}
@Override
public ResultBean confirmCarDocsRecord(VehInitVo dto) {
return null;
}
}

20
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java

@ -104,4 +104,24 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove
public ResultBean<PagerVo<CompleteRecordVo>> getCarDocsConfirmList(PagerQuery<ListQuery> pagerQuery) {
return vehicleInformationHandoverService.getCarDocsConfirmList(pagerQuery);
}
@Override
public ResultBean saveCarDocsRecordImg(VehUploadDto dto) {
return vehicleInformationHandoverService.saveCarDocsRecordImg(dto);
}
@Override
public ResultBean<List<String>> getCarDocsRecordImg(String billId) {
return vehicleInformationHandoverService.getCarDocsRecordImg(billId);
}
@Override
public ResultBean<VehInitVo> initCarDocsRecord(VehInitDto dto) {
return vehicleInformationHandoverService.initCarDocsRecord(dto);
}
@Override
public ResultBean confirmCarDocsRecord(VehInitVo dto) {
return vehicleInformationHandoverService.confirmCarDocsRecord(dto);
}
}

40
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java

@ -322,4 +322,44 @@ public class VehicleInformationHandoverService {
}
return rb.success().setData(pagerVo);
}
public ResultBean saveCarDocsRecordImg(VehUploadDto dto) {
ResultBean rb = ResultBean.fireFail();
AppUploadDto appDto = new AppUploadDto();
BeanUtil.copyProperties(dto, appDto);
busVehicleDataHandoverFeign.saveCarDocsRecordImg(appDto);
return rb.success();
}
public ResultBean<List<String>> getCarDocsRecordImg(String billId) {
ResultBean<List<String>> rb = ResultBean.fireFail();
ResultBean<List<String>> resultBean = busVehicleDataHandoverFeign.getCarDocsRecordImg(billId);
if (resultBean.getSuccess()) {
List<String> data = resultBean.getData();
return rb.success().setData(data);
}
return rb.success();
}
public ResultBean<VehInitVo> initCarDocsRecord(VehInitDto dto) {
ResultBean<VehInitVo> rb = ResultBean.fireFail();
VehInitVo vo = new VehInitVo();
AppInitDto appDto = new AppInitDto();
BeanUtil.copyProperties(dto, appDto);
ResultBean<AppInitVo> resultBean = busVehicleDataHandoverFeign.initCarDocsRecord(appDto);
if (resultBean.getSuccess()) {
AppInitVo data = resultBean.getData();
BeanUtil.copyProperties(data, vo);
return rb.success().setData(vo);
}
return rb.success();
}
public ResultBean confirmCarDocsRecord(VehInitVo dto) {
ResultBean rb = ResultBean.fireFail();
AppInitVo appDto = new AppInitVo();
BeanUtil.copyProperties(dto, appDto);
ResultBean resultBean = busVehicleDataHandoverFeign.confirmCarDocsRecord(appDto);
return rb.success();
}
}

Loading…
Cancel
Save