diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index 3a32cdb6f4..88ab631b06 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java @@ -1,8 +1,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -83,4 +81,20 @@ public interface BusDiscountpackageHandoverFeign { @PostMapping("/appUploadPicture") public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandoverDto dto); + @ApiOperation("移动端详情页") + @GetMapping("/getDiscountPackageHandoverDetail/{sid}") + @ResponseBody + ResultBean getDiscountPackageHandoverDetail(@PathVariable("sid") String sid); + + @ApiOperation("移动端交接操作") + @PostMapping("/confirmPackageHandover") + @ResponseBody + public ResultBean confirmPackageHandover(@RequestBody AppBusDiscountpackageHandoverDto dto); + + + @ApiOperation("保存优惠包交接照片") + @PutMapping("/saveConfirmPackageHandoverImg") + @ResponseBody + public ResultBean> saveConfirmPackageHandoverImg(@RequestBody AppUploadPicture uploadPicture); + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java index eb1bf1de1f..35c9d93dff 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java @@ -1,8 +1,6 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -81,5 +79,20 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka return null; } + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return null; + } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoverDto dto) { + return null; + } + + @Override + public ResultBean> saveConfirmPackageHandoverImg(AppUploadPicture uploadPicture) { + return null; + } + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java index 6fe71de522..a8b5f6493f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java @@ -33,13 +33,16 @@ public class AppBusDiscountpackageHandoverVo implements Vo { private String model; // 车型名称 @ApiModelProperty("车辆台数") private String carNum; // 车辆台数 - @ApiModelProperty("优惠包数量") - private String discountNum; // 优惠包数量 - @ApiModelProperty("优惠包总价值") - private String price; // 接收人电话 - @ApiModelProperty("办理显示") - private Boolean showHandleBtn; // 办理显示 - @ApiModelProperty("上传显示") - private Boolean showUploadBtn; // 上传显示 + @ApiModelProperty("移交人") + private String receiveName; // 接收人姓名 + @ApiModelProperty("移交人电话") + private String receivePhone; // 接收人电话 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date receiveDate; // 接收时间 + @ApiModelProperty("待交接显示") + private Boolean showHandleBtn; // 待交接显示 + @ApiModelProperty("已交接显示") + private Boolean showUploadBtn; // 已交接显示 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java new file mode 100644 index 0000000000..107545d285 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversDetailVo.java @@ -0,0 +1,52 @@ +package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 11:15 + */ +@Data +public class AppBusDiscountpackageHandoversDetailVo implements Vo { + + private String sid; + private String orgPath; + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") + private String contractId; // 合同编号 + @ApiModelProperty("车型名称") + private String model; // 车型名称 + @ApiModelProperty("车辆台数") + private String carNumber; // 车辆台数 + @ApiModelProperty("车架号") + private String vins; // 车架号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("接收人姓名") + private String recName; // 接收人姓名 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("接收备注") + private String remarks; // 接收备注 + @ApiModelProperty("移交备注") + private String remarks2; // 移交备注 + @ApiModelProperty("优惠包交接优惠包列表") + private List discountPackageList; + @ApiModelProperty("业务关联附件表") + private List busFiles = new ArrayList<>(); + private String modelOrgPath; // + private String modelSid; // + private String configSid; // + private String saleOrderSid; // + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java new file mode 100644 index 0000000000..d030872b8c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoversListVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/6/19 11:44 + */ +@Data +public class AppBusDiscountpackageHandoversListVo implements Vo { + @ApiModelProperty("sid") + private String discountSid; // sid + @ApiModelProperty("价值") + private String price; // 价值 + @ApiModelProperty("数量") + private String number; // 数量 + @ApiModelProperty("优惠包说明") + private String explain; // 优惠包说明 + @ApiModelProperty("总价值") + private String totalPrice; // 总价值 + @ApiModelProperty("优惠包名称") + private String discountName; // 优惠包名 +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java new file mode 100644 index 0000000000..6153ccc3a4 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppUploadPicture.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 14:39 + */ +@Data +public class AppUploadPicture { + private String sid; + private List imgs = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java index ff5c429b67..072c42c156 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVos.java @@ -39,5 +39,6 @@ public class BusHandoverVos implements Vo { private Boolean showGcDownload; @ApiModelProperty("挂车确认按钮") private boolean showGcBtn2; - + private String procDefId; + private String procInstId; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java index 93a58550db..a5a378b711 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoversDetailVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,6 +24,7 @@ public interface BusDiscountpackageHandoverMapper extends BaseMapper selectAppPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + AppBusDiscountpackageHandoversDetailVo getDiscountPackageHandoverDetail(String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml index 1085c9f724..f1aaa7d27d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml @@ -34,22 +34,30 @@ customerName, vehModel AS model, vehCount AS carNum, - recName, - recPhone, - recTime, - CASE - `state` - WHEN 1 THEN - '待准备' - WHEN 2 THEN - '待交接' - WHEN 3 THEN - '已交接' - END AS nodeState + recTime as receiveDate, + transferName as receiveName, + transferPhone as receivePhone, + transferStateValue as nodeState FROM bus_discountpackage_handover ${ew.sqlSegment} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java index e4cc8ac6cc..2a4b81b514 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java @@ -1,9 +1,7 @@ package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -118,4 +116,19 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove busDiscountpackageHandoverService.appUploadPicture(dto); return rb.success(); } + + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return busDiscountpackageHandoverService.getDiscountPackageHandoverDetail(sid); + } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoverDto dto) { + return busDiscountpackageHandoverService.confirmPackageHandover(dto); + } + + @Override + public ResultBean> saveConfirmPackageHandoverImg(AppUploadPicture uploadPicture) { + return busDiscountpackageHandoverService.saveConfirmPackageHandoverImg(uploadPicture); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index 9e03afcfc8..626708bfde 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java @@ -8,14 +8,14 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverListDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList; import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService; +import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo; import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; import com.yxt.anrui.portal.api.sysrole.SysRoleVo; @@ -45,6 +45,7 @@ import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author Administrator @@ -72,6 +73,9 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); @@ -597,11 +601,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService wrapper.like("contractNo", query.getName()).or().like("customerName", query.getName())); } @@ -633,12 +640,12 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService buscenterFiles = buscenterFileService.selectByLinkSid(record.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); if (buscenterFiles.size() > 0) { @@ -646,25 +653,26 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid()); - if (listByMainSid.size() > 0) { - BigDecimal price = new BigDecimal(0); - int discountNum = 0; - for (BusDiscountpackageHandoverList handoverList : listByMainSid) { - if (null != handoverList) { - //优惠包数量 - String number = handoverList.getNumber(); - discountNum = discountNum + Integer.valueOf(number); - BigDecimal totalPrice = handoverList.getTotalPrice(); - price = price.add(totalPrice); - } - } - record.setDiscountNum(String.valueOf(discountNum)); - record.setPrice(String.valueOf(price)); } +// List listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(record.getSid()); +// if (listByMainSid.size() > 0) { +// BigDecimal price = new BigDecimal(0); +// int discountNum = 0; +// for (BusDiscountpackageHandoverList handoverList : listByMainSid) { +// if (null != handoverList) { +// //优惠包数量 +// String number = handoverList.getNumber(); +// discountNum = discountNum + Integer.valueOf(number); +// BigDecimal totalPrice = handoverList.getTotalPrice(); +// price = price.add(totalPrice); +// } +// } +// record.setDiscountNum(String.valueOf(discountNum)); +// record.setPrice(String.valueOf(price)); +// } } } PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -802,4 +810,94 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService getDiscountPackageHandoverDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppBusDiscountpackageHandoversDetailVo vo = baseMapper.getDiscountPackageHandoverDetail(sid); + List listVos = new ArrayList<>(); + List filePath = new ArrayList<>(); + if (null != vo) { + List listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(sid); + listByMainSid.removeAll(Collections.singleton(null)); + if (!listByMainSid.isEmpty()) { + for (BusDiscountpackageHandoverList handoverList : listByMainSid) { + AppBusDiscountpackageHandoversListVo handoversListVo = new AppBusDiscountpackageHandoversListVo(); + handoversListVo.setDiscountSid(sid); + handoversListVo.setExplain(handoverList.getPackageExplain()); + handoversListVo.setNumber(handoverList.getNumber()); + handoversListVo.setTotalPrice(String.valueOf(handoverList.getTotalPrice())); + handoversListVo.setPrice(String.valueOf(handoverList.getPrice())); + handoversListVo.setDiscountName(handoverList.getDiscountName()); + listVos.add(handoversListVo); + } + } + vo.setDiscountPackageList(listVos); + List fileList = buscenterFileService.selectByLinkSid(sid, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List handoverImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setBusFiles(handoverImages); + } + if (StringUtils.isNotBlank(vo.getContractId())) { + CommonContract contract = commonContractFeign.selectByNo(vo.getContractId()).getData(); + if (null != contract) { + if (StringUtils.isNotBlank(contract.getBusSid())) { + vo.setSaleOrderSid(contract.getBusSid()); + } + if (StringUtils.isNotBlank(contract.getModelSid())) { + vo.setModelSid(contract.getModelSid()); + } + if (StringUtils.isNotBlank(contract.getConfigSid())) { + vo.setConfigSid(contract.getConfigSid()); + } + } + } + if (StringUtils.isNotBlank(vo.getSaleOrderSid())) { + BusSalesOrderDetailsVo orderDetailsVo = busSalesOrderService.fetchDetailsVoBySid(vo.getSaleOrderSid()).getData(); + if (null != orderDetailsVo) { + String orgSidPath = orderDetailsVo.getOrgSidPath(); + vo.setModelOrgPath(orgSidPath); + } + } + } + return rb.success().setData(vo); + } + + + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoverDto dto) { + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandover entity = fetchBySid(dto.getSid()); + if (StringUtils.isNotBlank(dto.getRemarks())) { + entity.setRemarks(dto.getRemarks()); + } + entity.setRecTime(new Date()); + entity.setTransferStateValue("已移交"); + entity.setTransferStateKey("004"); + baseMapper.updateById(entity); + return rb.success(); + } + + public ResultBean> saveConfirmPackageHandoverImg(AppUploadPicture uploadPicture) { + ResultBean rb = ResultBean.fireFail(); + buscenterFileService.delByLinkSidOrType(uploadPicture.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + List imgs = uploadPicture.getImgs(); + if (!imgs.isEmpty()) { + buscenterFileService.saveAll(uploadPicture.getSid(), imgs, BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + } + List fileList = buscenterFileService.selectByLinkSid(uploadPicture.getSid(), BuscenterFileEnum.DISCOUNTPACKAGE_HANDOVER.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + List handoverImages = new ArrayList<>(); + if (!fileList.isEmpty()) { + handoverImages = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + } + return rb.success().setData(handoverImages); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml index fe327d7665..90c367a32f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml @@ -129,7 +129,9 @@ bh.carNum, bh.nodeState, bh.filePath, - bh.trailerFilePath + bh.trailerFilePath, + bh.procDefId, + bh.procInstId from bus_handover bh ${ew.sqlSegment} 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 6c310ef7b7..8155b4e016 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 @@ -262,7 +262,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java index 747a7c526b..9f0de5ef10 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java @@ -1,4 +1,5 @@ package com.yxt.anrui.fin.api.finvehicleinvoice; + import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -20,6 +21,8 @@ public class FinVehicleInvoiceExportVo implements Vo { private String transferState; @ExportEntityMap(CnName = "业务状态", EnName = "businessState") private String businessState; + @ExportEntityMap(CnName = "是否领票", EnName = "isTakeTicket") + private String isTakeTicket; @ExportEntityMap(CnName = "开票单位", EnName = "invoiceTitle") private String invoiceTitle; @ExportEntityMap(CnName = "开票类型", EnName = "invoiceType") @@ -38,5 +41,7 @@ public class FinVehicleInvoiceExportVo implements Vo { private String createTime; @ExportEntityMap(CnName = "发票代码", EnName = "invoiceCode") private String invoiceCode; + @ExportEntityMap(CnName = "发票号", EnName = "invoiceNo") + private String invoiceNo; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index bd638d8149..78209173ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -66,7 +66,7 @@ public interface FinVehicleInvoiceFeign { @PostMapping("/exportExcel") @ApiOperation(value = "车辆发票信息列表导出") @ResponseBody - public void exportExcel(@RequestBody FinVehicleInvoiceQuery query); + public void exportExcel(@RequestBody FinVehicleInvoiceQuery pq); @ApiOperation("作废") @PostMapping("/cancellation") @@ -113,4 +113,6 @@ public interface FinVehicleInvoiceFeign { @GetMapping("/selectByVinAndContractNo") @ResponseBody ResultBean selectByVinAndContractNo(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo); + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index a41deec5a7..57b8819a3d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -70,7 +70,7 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { } @Override - public void exportExcel(FinVehicleInvoiceQuery query) { + public void exportExcel(FinVehicleInvoiceQuery pq) { } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index da784e9d03..abab231fc6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -382,7 +382,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService privilegeQuery.setMenuUrl(params.getMenuUrl()); privilegeQuery.setUserSid(params.getCreateBySid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ + String data1 = defaultIdReltBean.getData(); + System.out.println(data1); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) orgPath = orgPath + "/"; int i1 = orgPath.indexOf("/"); @@ -402,13 +404,13 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } else if ("4".equals(orgLevelKey)) { orgPath = orgPath.substring(0, i4); qw.like("orgSidPath", orgPath); - } else if("5".equals(orgLevelKey)){ - qw.eq("createBySid",params.getCreateBySid()); - }else{ + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", params.getCreateBySid()); + } else { PagerVo p = new PagerVo<>(); return p; } - }else{ + } else { PagerVo p = new PagerVo<>(); return p; } @@ -870,7 +872,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService for (int i = 0; i < receiveSeleteVoList.size(); i++) { ReceiveSeleteVo receiveSeleteVo = receiveSeleteVoList.get(i); BigDecimal subscriptionMoneyAll = BigDecimal.ZERO; - if(StringUtils.isNotBlank(receiveSeleteVo.getSubscriptionMoneyAll())){ + if (StringUtils.isNotBlank(receiveSeleteVo.getSubscriptionMoneyAll())) { subscriptionMoneyAll = new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll()); } BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(subscriptionMoneyAll); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index dab1820df5..eb8ed7f8d7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -29,22 +29,22 @@ import java.util.List; @Mapper public interface FinVehicleInvoiceMapper extends BaseMapper { - //@Update("update fin_vehicle_invoice set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + //@Update("update fin_vehicle_invoice set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selByExcel(@Param(Constants.WRAPPER)QueryWrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); + List selectListVo(); + + List selByExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + + FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); FinVehicleInvoice selectByVinSid(String vinSid); - int cancellation(@Param("sid")String sid); + int cancellation(@Param("sid") String sid); FinInvoiceInformationVo invoiceInformation(@Param("sid") String sid); @@ -61,7 +61,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { FinVehicleInvoice selectByVinSidss(String vinSid); @Update("update fin_vehicle_invoice set transferStateKey = #{code},transferState = #{remarks} where sid = #{sid}") - void updateTransferState(@Param("sid") String sid,@Param("code") String code,@Param("remarks") String remarks); + void updateTransferState(@Param("sid") String sid, @Param("code") String code, @Param("remarks") String remarks); FinVehicleInvoice selectByVinAndContractNo(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index c14250e79b..16a90f3f52 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -104,26 +104,46 @@ + - SELECT DISTINCT - billingState, - transferState, - businessState, - invoiceTitle, - invoiceType, - contractNo, - customerName, - VIN, - invoicingName, - invoiceAmount, - createTime, - invoiceCode - FROM fin_vehicle_invoice + v.useOrgSid, + v.sid, + v.`state`, + v.billingStateKey, + v.billingState, + v.businessStateKey, + v.businessState, + v.transferStateKey, + v.transferState, + v.invoiceTitle, + v.invoiceType, + v.invoiceTypeKey, + v.contractNo, + v.customerName, + v.VIN as vinNo, + v.invoicingName, + v.invoiceAmount, + v.invoiceDate as createTime, + v.invoiceCode, + v.invoiceNo, + v.filePath, + v.address, + v.telPhone, + v.openingBank, + v.bankNum, + v.recipient, + v.transferTime, + so.orgSidPath, + v.isTakeTicket + FROM fin_vehicle_invoice as v + left join anrui_portal.sys_organization so on v.useOrgSid = so.sid ${ew.sqlSegment} + ORDER BY v.billingStateKey ASC,v.invoiceDate DESC @@ -223,7 +243,10 @@ \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index b409011201..b795aceae8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -20,6 +20,7 @@ import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -155,32 +156,35 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { } @Override - public void exportExcel(FinVehicleInvoiceQuery query) { - //得到所有要导出的数据 - List invoiceExportVoList = finVehicleInvoiceService.listExcel(query); + public void exportExcel(FinVehicleInvoiceQuery pq) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { - if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { - String createTime = invoiceExportVo.getCreateTime(); - try { - Date date = sdf.parse(createTime); - String createTimeBySdf = sdf.format(date); - invoiceExportVo.setCreateTime(createTimeBySdf); - } catch (ParseException e) { - e.printStackTrace(); + //得到所有要导出的数据 + List records = finVehicleInvoiceService.listExcel(pq); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (FinVehicleInvoiceExportVo invoiceExportVo : records) { + if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { + String createTime = invoiceExportVo.getCreateTime(); + try { + Date date = sdf.parse(createTime); + String createTimeBySdf = sdf.format(date); + invoiceExportVo.setCreateTime(createTimeBySdf); + } catch (ParseException e) { + e.printStackTrace(); + } } } + //定义导出的excel名字 + String excelName = "开票管理列表"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + //导出车辆管理列表 + ExportExcelUtils.export(fileNameURL, records, FinVehicleInvoiceExportVo.class, response); } - //定义导出的excel名字 - String excelName = "车辆发票信息列表"; - String fileNameURL = ""; - try { - fileNameURL = URLEncoder.encode(excelName, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - //导出车辆管理列表 - ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response); } @Override @@ -237,7 +241,7 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { @Override public ResultBean selectByVinAndContractNo(String vinSid, String contractNo) { - return finVehicleInvoiceService.selectByVinAndContractNo(vinSid,contractNo); + return finVehicleInvoiceService.selectByVinAndContractNo(vinSid, contractNo); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 0ac89eda55..6f8c948b67 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -38,10 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Project: anrui-fin(财务管理)
@@ -157,8 +154,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (v.invoiceDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.invoiceDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); return qw; } @@ -195,57 +192,74 @@ public class FinVehicleInvoiceService extends MybatisBaseService listExcel(FinVehicleInvoiceQuery query) { + QueryWrapper qw = new QueryWrapper<>(); - qw.eq("isDelete", "0"); + qw.eq("v.isDelete", "0"); + //层级筛选 + String orgSidPath = query.getOrgSidPath(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + String[] split = orgSidPath.split("/"); + String s = split[0] + "/" + split[1]; + // orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", s); + } else if ("3".equals(orgLevelKey)) { + qw.eq("v.useOrgSid", query.getCreateOrgSid()); + } + if (StringUtils.isNotBlank(query.getInvoiceTitle())) { - qw.like("invoiceTitle", query.getInvoiceTitle()); + qw.like("v.invoiceTitle", query.getInvoiceTitle()); } if (StringUtils.isNotBlank(query.getInvoiceType())) { - qw.like("invoiceType", query.getInvoiceType()); + qw.like("v.invoiceType", query.getInvoiceType()); } if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) { - qw.like("invoiceTypeKey", query.getInvoiceTypeKey()); + qw.like("v.invoiceTypeKey", query.getInvoiceTypeKey()); } if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("contractNo", query.getContractNo()); + qw.like("v.contractNo", query.getContractNo()); } if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.like("customerName", query.getCustomerName()); + qw.like("v.customerName", query.getCustomerName()); } if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("VIN", query.getVinNo()); + qw.like("v.VIN", query.getVinNo()); } if (StringUtils.isNotBlank(query.getTransferState())) { - qw.eq("transferState", query.getTransferState()); + qw.eq("v.transferState", query.getTransferState()); } if (StringUtils.isNotBlank(query.getBillingState())) { - qw.eq("billingState", query.getBillingState()); + qw.eq("v.billingState", query.getBillingState()); } if (StringUtils.isNotBlank(query.getTransferStateKey())) { - qw.eq("transferStateKey", query.getTransferStateKey()); + qw.eq("v.transferStateKey", query.getTransferStateKey()); } if (StringUtils.isNotBlank(query.getBillingStateKey())) { - qw.eq("billingStateKey", query.getBillingStateKey()); + qw.eq("v.billingStateKey", query.getBillingStateKey()); } if (StringUtils.isNotBlank(query.getInvoicingName())) { - qw.like("invoicingName", query.getInvoicingName()); + qw.like("v.invoicingName", query.getInvoicingName()); } if (StringUtils.isNotBlank(query.getInvoiceCode())) { - qw.like("invoiceCode", query.getInvoiceCode()); + qw.like("v.invoiceCode", query.getInvoiceCode()); } String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); - qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (v.invoiceDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.invoiceDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - qw.orderByDesc("createTime"); - List invoiceExportVoList = baseMapper.selByExcel(qw); - int id = 1; - for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { - invoiceExportVo.setRankNo(id); - id = id + 1; - } - return invoiceExportVoList; + + List records = baseMapper.selByExcel(qw); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + int id = 1; + for (FinVehicleInvoiceExportVo invoiceExportVo : records) { + invoiceExportVo.setRankNo(id); + id = id + 1; + } + } + return records; } public FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid) { @@ -395,7 +409,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService selectByVinSids(String vinSid) { ResultBean rb = ResultBean.fireFail(); VehicleInvoiceVo vehicleInvoiceVo = baseMapper.selectByVinSids(vinSid); - if(StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())){ + if (StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())) { List filePathList = Arrays.asList(vehicleInvoiceVo.getFilePath().split(",")); vehicleInvoiceVo.setInvoiceImages(filePathList); } @@ -423,10 +437,10 @@ public class FinVehicleInvoiceService extends MybatisBaseService finBillFileVos = finBillFileService.fetchFileByBillSid(billingSid); String transferFilesString = ""; - if (!finBillFileVos.isEmpty()){ + if (!finBillFileVos.isEmpty()) { for (FinBillFileVo finBillFileVo : finBillFileVos) { transferFilesString = transferFilesString + finBillFileVo.getFileUrl() + ","; } } - if (StringUtils.isNotBlank(transferFilesString)){ - busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0,transferFilesString.length() - 1)); + if (StringUtils.isNotBlank(transferFilesString)) { + busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0, transferFilesString.length() - 1)); } busTransferRecordsFeign.saveRecords(busTransferRecordsDto); //消息推送 @@ -501,8 +515,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService selectByVinAndContractNo(String vinSid, String contractNo) { ResultBean rb = ResultBean.fireFail(); - FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinAndContractNo(vinSid,contractNo); + FinVehicleInvoice finVehicleInvoice = baseMapper.selectByVinAndContractNo(vinSid, contractNo); return rb.success().setData(finVehicleInvoice); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java index e6750f8c12..9a38109d55 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java @@ -21,7 +21,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo { @ApiModelProperty("销售订单sid") private String salesOrderSid; // 销售订单sid @ApiModelProperty("交接状态 1待准备，2待交接，3已交接") - private String nodeSate; // 交接状态 + private String nodeState; // 交接状态 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createDate; // 合同编号 @@ -33,13 +33,17 @@ public class AppBusDiscountpackageHandoversVo implements Vo { private String model; // 车型名称 @ApiModelProperty("车辆台数") private String carNum; // 车辆台数 - @ApiModelProperty("接收人姓名") - private String recName; // 接收人姓名 - @ApiModelProperty("接收人电话") - private String recPhone; // 接收人电话 + @ApiModelProperty("移交人") + private String receiveName; // 接收人姓名 + @ApiModelProperty("移交人电话") + private String receivePhone; // 接收人电话 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date receiveDate; // 接收时间 @ApiModelProperty("待交接显示") private Boolean showHandleBtn; // 待交接显示 @ApiModelProperty("已交接显示") - private Boolean showDownloadBtn; // 已交接显示 + private Boolean showUploadBtn; // 已交接显示 + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java index 1b7332070e..4fb9fbaec1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; +import java.util.List; /** * @author Administrator @@ -31,9 +32,20 @@ public interface AppDiscountPackageHandoverFegin { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("移动端优惠包交接详情编辑回显") + @ApiOperation("移动端优惠包交接详情") + @GetMapping("/getDiscountPackageHandoverDetail") + @ResponseBody + public ResultBean getDiscountPackageHandoverDetail(@RequestParam("sid") String sid); + + + @ApiOperation("编辑初始化") @GetMapping("/getDiscountHandoverInfo/{sid}") @ResponseBody + public ResultBean getDiscountHandoverInitInfo(@PathVariable("sid") String sid); + + @ApiOperation("移动端优惠包交接详情编辑回显") + @GetMapping("/getDiscountHandoverInfor/{sid}") + @ResponseBody public ResultBean getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException; @ApiOperation("移动端交接操作") @@ -46,5 +58,15 @@ public interface AppDiscountPackageHandoverFegin { @ResponseBody public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException; + @ApiOperation("移动端交接操作") + @PostMapping("/confirmPackageHandover") + @ResponseBody + public ResultBean confirmPackageHandover(@RequestBody AppBusDiscountpackageHandoversDto dto); + + + @ApiOperation("保存优惠包交接照片") + @PutMapping("/saveConfirmPackageHandoverImg") + @ResponseBody + public ResultBean> confirmPackageHandoverImg(@RequestBody UploadPicture uploadPicture); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java index 3523aa0ed5..fe0e7bc79e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; +import java.util.List; /** * @author Administrator @@ -18,6 +19,16 @@ public class AppDiscountPackageHandoverFeginFallback implements AppDiscountPacka return null; } + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return null; + } + + @Override + public ResultBean getDiscountHandoverInitInfo(String sid) { + return null; + } + @Override public ResultBean getDiscountHandoverInfo(String sid) { return null; @@ -32,4 +43,14 @@ public class AppDiscountPackageHandoverFeginFallback implements AppDiscountPacka public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) { return null; } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoversDto dto) { + return null; + } + + @Override + public ResultBean> confirmPackageHandoverImg(UploadPicture uploadPicture) { + return null; + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java new file mode 100644 index 0000000000..e3339b1bbc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoverInitVo.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 13:43 + */ +@Data +public class BusDiscountpackageHandoverInitVo implements Vo { + private String sid; + private String orgPath; + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") + private String contractId; // 合同编号 + @ApiModelProperty("车型名称") + private String model; // 车型名称 + @ApiModelProperty("车辆台数") + private String carNumber; // 车辆台数 + @ApiModelProperty("车架号") + private String vins; // 车架号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("接收人姓名") + private String recName; // 接收人姓名 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("移交备注") + private String remarks; // 移交备注 + @ApiModelProperty("接收备注") + private String remarks2; // 接收备注 + @ApiModelProperty("优惠包交接优惠包列表") + private List discountPackageList; + @ApiModelProperty("业务关联附件表") + private List busFiles = new ArrayList<>(); + private String modelOrgPath; // + private String modelSid; // + private String configSid; // + private String saleOrderSid; // +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java new file mode 100644 index 0000000000..75eb0d7941 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversDetailVo.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 10:39 + */ +@Data +public class BusDiscountpackageHandoversDetailVo implements Vo { + + private String sid; + private String orgPath; + @ApiModelProperty("userSid") + private String userSid; // userSid + @ApiModelProperty("合同编号") + private String contractId; // 合同编号 + @ApiModelProperty("车型名称") + private String model; // 车型名称 + @ApiModelProperty("车辆台数") + private String carNumber; // 车辆台数 + @ApiModelProperty("车架号") + private String vins; // 车架号 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("接收人姓名") + private String recName; // 接收人姓名 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("接收时间") + private Date recTime; // 接收时间 + @ApiModelProperty("接收备注") + private String remarks; // 接收备注 + @ApiModelProperty("移交备注") + private String remarks2; // 移交备注 + @ApiModelProperty("优惠包交接优惠包列表") + private List discountPackageList; + @ApiModelProperty("业务关联附件表") + private List busFiles = new ArrayList<>(); + private String saleOrderSid; // + private String modelOrgPath; // + private String modelSid; // + private String configSid; // +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java new file mode 100644 index 0000000000..80b30a6328 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/6/19 12:02 + */ +@Data +public class BusDiscountpackageHandoversListVo implements Vo { + @ApiModelProperty("sid") + private String discountSid; // sid + @ApiModelProperty("价值") + private String price; // 价值 + @ApiModelProperty("数量") + private String number; // 数量 + @ApiModelProperty("优惠包说明") + private String explain; // 优惠包说明 + @ApiModelProperty("总价值") + private String totalPrice; // 总价值 + @ApiModelProperty("优惠包名称") + private String discountName; // 优惠包名 +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java new file mode 100644 index 0000000000..82464b3fef --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/UploadPicture.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/6/19 14:36 + */ +@Data +public class UploadPicture { + private String sid; + private List imgs = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java index c4a9f19c60..0cb67f61c4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageHandover; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversDto; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversQuery; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversVo; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppDiscountPackageHandoverFegin; +import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -14,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; +import java.util.List; /** * @author Administrator @@ -34,6 +32,16 @@ public class AppDiscountPackageHandoverRest implements AppDiscountPackageHandove return appDiscountPackageHandoverService.listPage(pq); } + @Override + public ResultBean getDiscountPackageHandoverDetail(String sid) { + return appDiscountPackageHandoverService.getDiscountPackageHandoverDetail(sid); + } + + @Override + public ResultBean getDiscountHandoverInitInfo(String sid) { + return appDiscountPackageHandoverService.getDiscountHandoverInitInfo(sid); + } + @Override public ResultBean getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException { return appDiscountPackageHandoverService.getDiscountHandoverInfo(sid); @@ -48,4 +56,14 @@ public class AppDiscountPackageHandoverRest implements AppDiscountPackageHandove public ResultBean uploadPicture(AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException { return appDiscountPackageHandoverService.uploadPicture(dto); } + + @Override + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoversDto dto) { + return appDiscountPackageHandoverService.confirmPackageHandover(dto); + } + + @Override + public ResultBean> confirmPackageHandoverImg(UploadPicture uploadPicture) { + return appDiscountPackageHandoverService.confirmPackageHandoverImg(uploadPicture); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java index dddfbeeace..bc518220fc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageHandover/AppDiscountPackageHandoverService.java @@ -2,14 +2,11 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageHandover; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverDto; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery; -import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo; +import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.*; import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversDto; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversQuery; -import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.AppBusDiscountpackageHandoversVo; +import com.yxt.anrui.terminal.api.autoservice.discountPackageHandover.*; import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -44,12 +41,12 @@ public class AppDiscountPackageHandoverService { public ResultBean> listPage(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = new PagerQuery<>(); - BeanUtil.copyProperties(pagerQuery,pq); + BeanUtil.copyProperties(pagerQuery, pq); ResultBean> voResultBean = busDiscountpackageHandoverFeign.getDiscountHandoverList(pq); PagerVo vo = new PagerVo<>(); if (voResultBean.getSuccess()) { PagerVo data = voResultBean.getData(); - BeanUtil.copyProperties(data,vo); + BeanUtil.copyProperties(data, vo); } return rb.success().setData(vo); } @@ -100,4 +97,50 @@ public class AppDiscountPackageHandoverService { System.out.println(phDto); return busDiscountpackageHandoverFeign.appUploadPicture(phDto); } + + /** + * 移动端详情页 + * + * @param + * @return + */ + public ResultBean getDiscountPackageHandoverDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandoversDetailVo vo = new BusDiscountpackageHandoversDetailVo(); + AppBusDiscountpackageHandoversDetailVo data = busDiscountpackageHandoverFeign.getDiscountPackageHandoverDetail(sid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, vo); + } + return rb.success().setData(vo); + } + + public ResultBean confirmPackageHandover(AppBusDiscountpackageHandoversDto dto) { + ResultBean rb = ResultBean.fireFail(); + AppBusDiscountpackageHandoverDto handoverDto = new AppBusDiscountpackageHandoverDto(); + BeanUtil.copyProperties(dto, handoverDto); + busDiscountpackageHandoverFeign.confirmPackageHandover(handoverDto); + return rb.success(); + } + + public ResultBean getDiscountHandoverInitInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandoverInitVo vo = new BusDiscountpackageHandoverInitVo(); + AppBusDiscountpackageHandoversDetailVo data = busDiscountpackageHandoverFeign.getDiscountPackageHandoverDetail(sid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, vo); + } + return rb.success().setData(vo); + } + + public ResultBean> confirmPackageHandoverImg(UploadPicture uploadPicture) { + ResultBean> rb = ResultBean.fireFail(); + AppUploadPicture dtoApp = new AppUploadPicture(); + List strings = new ArrayList<>(); + BeanUtil.copyProperties(uploadPicture, dtoApp); + ResultBean> listResultBean = busDiscountpackageHandoverFeign.saveConfirmPackageHandoverImg(dtoApp); + if (listResultBean.getSuccess()) { + strings = listResultBean.getData(); + } + return rb.success().setData(strings); + } }