diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceExportVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceExportVo.java new file mode 100644 index 0000000000..94909bbc64 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceExportVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.base.api.basemodelmodprice; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.utils.ExportEntityMap; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + + +/** + * @author dimengzhe + * @date 2021/9/30 16:25 + * @description + */ +@Data +public class BaseModelModpriceExportVo implements Vo { + private static final long serialVersionUID = -1722170460354213687L; + + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "车型编码", EnName = "vehicleTypeCode") + private String vehicleTypeCode; // 分公司 + @ExportEntityMap(CnName = "配置编码", EnName = "configCode") + private String configCode; + @ExportEntityMap(CnName = "调整后全款销售指导价（元）", EnName = "guidedPrice") + private String guidedPrice; + @ExportEntityMap(CnName = "调整后贷款销售指导价（元）", EnName = "manufactorSettlementPrice") + private String manufactorSettlementPrice; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java index 8c4f233fd1..edaff9cae1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.api.basemodelmodprice; import com.yxt.anrui.base.api.basemodelmodprice.flow.*; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleExportQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -34,8 +35,11 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; +import java.io.IOException; +import java.text.ParseException; import java.util.List; /** @@ -66,7 +70,7 @@ public interface BaseModelModpriceFeign { @ApiOperation("新增保存") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@Valid @RequestBody BaseModelModpriceDto dto); - + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids); @@ -104,4 +108,17 @@ public interface BaseModelModpriceFeign { @ApiOperation(value = "终止任务") @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody BaseModelModPriceTaskQuery query); + + @ApiOperation(value = "导入") + @PostMapping("/getExcelInfo") + @ResponseBody + public ResultBean getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException; + + + @PostMapping("/downloadExcel") + @ApiOperation(value = "下载模板") + @ResponseBody + public void downloadExcel(); + + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java index 75b196443e..9967044d29 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java @@ -35,7 +35,10 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.text.ParseException; import java.util.List; /** @@ -110,4 +113,14 @@ public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign { public ResultBean breakProcess(BaseModelModPriceTaskQuery query) { return null; } + + @Override + public ResultBean getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException { + return null; + } + + @Override + public void downloadExcel() { + + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportReturn.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportReturn.java new file mode 100644 index 0000000000..29345dd307 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportReturn.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basemodelmodprice; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/4/18 13:55 + */ +@Data +@ApiModel(value = "车型调价申请车型表 导入视图数据对象回显", description = "车型调价申请车型表 导入视图数据对象回显") +public class BaseModelModpriceImportReturn implements Vo { + + @ApiModelProperty("校验结果") + private String checkResult; // 校验结果 + + private List importVoList; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportVo.java new file mode 100644 index 0000000000..9a0bb50dee --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.basemodelmodprice; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/4/18 9:52 + */ +@ApiModel(value = "车型调价申请车型表 导入视图数据对象", description = "车型调价申请车型表 导入视图数据对象") +@Data +public class BaseModelModpriceImportVo implements Vo { + + @ApiModelProperty("序号") + private String rankNo; // 序号 + @ApiModelProperty("车型编码") + private String vehicleTypeCode; // 车型编码 + @ApiModelProperty("配置编码") + private String configCode; // 配置编码 + @ApiModelProperty("调整后全款销售指导价（元）") + private String guidedPrice; // 现全款销售指导价 + @ApiModelProperty("调整后贷款销售指导价（元）") + private String manufactorSettlementPrice; // 现贷款销售指导价 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java index dae1fe96ee..e5bda4a6b0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java @@ -91,4 +91,6 @@ public interface BaseModelModpriceModelFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); + + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index bf8bf995f1..b39e7f8519 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -114,9 +114,9 @@ public interface BaseTrailerFeign { @PostMapping("/trailerOut/{sid}") ResultBean trailerOut(@PathVariable("sid") String sid); - @ApiOperation("查询主车的挂车信息") + @ApiOperation("查询主车的挂车信息/上装信息") @GetMapping("/trailerList") - ResultBean trailerList(@RequestParam("vinSid") String vinSid); + ResultBean trailerList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo); @ApiOperation("根据挂车车架号获取一条记录") @GetMapping("/fetchByGcVinNo/{gcVinNo}") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java index 20b8b6cf46..f9e0f02e94 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java @@ -85,7 +85,7 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign { } @Override - public ResultBean trailerList(String vinSid) { + public ResultBean trailerList(String vinSid,String contractNo) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java index 9a300390fd..286a8e178d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.api.basetrailer; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import lombok.Data; import java.util.ArrayList; @@ -18,4 +19,6 @@ public class TraliveredVo { private String modelName; private List list = new ArrayList<>(); + + private List vehillModelList = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java index fa83a57d61..015ee96fa4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java @@ -52,7 +52,6 @@ public class BaseVehicleModel extends BaseEntity { @ApiModelProperty("产品线key值") private String productLine; - @ApiModelProperty("产品线value值") private String productLineValue; @ApiModelProperty(value = "排放标准key值") private String emissionStandard; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java index 1fbc74ac9c..6f9c0fd579 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java @@ -27,9 +27,6 @@ package com.yxt.anrui.base.api.basevehinstallmodel; import com.yxt.common.core.vo.Vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -108,4 +105,7 @@ public class BaseVehinstallmodelDetailsVo implements Vo { @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("销售订单中上装价格") + private String topPrice; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java index ab87bceb3f..1d0d72ca66 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java @@ -52,6 +52,8 @@ import java.math.BigDecimal; @Data public class BaseVehmodelConfigDto implements Dto { + @ApiModelProperty("修改时间") + private String modifyTime; // 修改时间 @ApiModelProperty("业务员sid") private String staffSid; // 业务员sid @ApiModelProperty("用户sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java index 7d68311441..02da2ae89c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java @@ -1,11 +1,14 @@ package com.yxt.anrui.base.api.basevehmodelconfig; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author dimengzhe * @Date 2022/4/29 10:59 @@ -34,4 +37,8 @@ public class BaseVehmodelVo implements Vo { @ApiModelProperty("sid") private String modelConfigSid; + + @ApiModelProperty("最新更新时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date modifyTime; // 最新更新时间 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java index 5c2c9d8dc8..1c7951299d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java @@ -28,16 +28,37 @@ package com.yxt.anrui.base.biz.basemodelmodprice; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basemodelmodprice.*; import com.yxt.anrui.base.api.basemodelmodprice.flow.*; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleExportVo; +import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -58,77 +79,108 @@ import java.util.List; @RequestMapping("v1/basemodelmodprice") public class BaseModelModpriceRest implements BaseModelModpriceFeign { - @Autowired - private BaseModelModpriceService baseModelModpriceService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseModelModpriceService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增修改保存") - @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BaseModelModpriceDto dto){ - return baseModelModpriceService.saveOrUpdateAll(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private BaseModelModpriceService baseModelModpriceService; + @Autowired + private HttpServletResponse response; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseModelModpriceService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增修改保存") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BaseModelModpriceDto dto) { + return baseModelModpriceService.saveOrUpdateAll(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return baseModelModpriceService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return baseModelModpriceService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid){ - return baseModelModpriceService.fetchAll(sid); - } - - /*****************************车型调价流程****************************************************/ - - @Override - public ResultBean submitBaseModelModPrice(SubmitBaseModelModPriceDto dto) { - return baseModelModpriceService.submitBaseModelModPrice(dto); - } - - @Override - public ResultBean complete(BaseModelModPriceCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId()); - bv.setFormVariables(BeanUtil.beanToMap(query)); - return baseModelModpriceService.complete(bv); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return baseModelModpriceService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return baseModelModpriceService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean taskReject(BaseModelModPriceTaskQuery query) { - return baseModelModpriceService.taskReject(query); - } - - @Override - public ResultBean revokeProcess(BaseModelModPriceTaskQuery query) { - return baseModelModpriceService.revokeProcess(query); - } - - @Override - public ResultBean breakProcess(BaseModelModPriceTaskQuery query) { - return baseModelModpriceService.breakProcess(query); - } + public ResultBean fetchBySid(@PathVariable("sid") String sid) { + return baseModelModpriceService.fetchAll(sid); + } + + /*****************************车型调价流程****************************************************/ + + @Override + public ResultBean submitBaseModelModPrice(SubmitBaseModelModPriceDto dto) { + return baseModelModpriceService.submitBaseModelModPrice(dto); + } + + @Override + public ResultBean complete(BaseModelModPriceCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId()); + bv.setFormVariables(BeanUtil.beanToMap(query)); + return baseModelModpriceService.complete(bv); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return baseModelModpriceService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return baseModelModpriceService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean taskReject(BaseModelModPriceTaskQuery query) { + return baseModelModpriceService.taskReject(query); + } + + @Override + public ResultBean revokeProcess(BaseModelModPriceTaskQuery query) { + return baseModelModpriceService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(BaseModelModPriceTaskQuery query) { + return baseModelModpriceService.breakProcess(query); + } + + @Override + public ResultBean getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException { + + return baseModelModpriceService.getExcelInfo(fileName, file); + } + + @Override + public void downloadExcel() { + List list = new ArrayList<>(); + int i = 1; + while (i <= 10) { + BaseModelModpriceExportVo exportVo = new BaseModelModpriceExportVo(); + exportVo.setRankNo(i); + list.add(exportVo); + i++; + } + //定义导出的excel名字 + String excelName = "调价车型价格导入模板"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, list, BaseModelModpriceExportVo.class, response); + } + + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 4f0213942a..0a6fddb358 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.biz.basemodelmodprice; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.text.StrBuilder; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -64,10 +65,21 @@ import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.io.InputStream; import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -129,10 +141,10 @@ public class BaseModelModpriceService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); if (!userVoResultBean.getSuccess()) { @@ -150,7 +162,7 @@ public class BaseModelModpriceService extends MybatisBaseService baseModelModpriceModels = dto.getBaseModelModpriceModels(); if (StringUtils.isBlank(sid)) {//新增 BaseModelModprice baseModelModprice = new BaseModelModprice(); - BeanUtil.copyProperties(dto, baseModelModprice,"sid"); + BeanUtil.copyProperties(dto, baseModelModprice, "sid"); baseModelModprice.setCreateBySid(dto.getCreateBySid()); baseModelModprice.setNodeState("待提交"); baseModelModprice.setOrgSidPath(orgSidPath); @@ -167,7 +179,7 @@ public class BaseModelModpriceService extends MybatisBaseService getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException { + ResultBean rb = ResultBean.fireFail(); + if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { + return rb.fail().setMsg("上传文件不正确"); + } + int[] resultCell = new int[]{0, 1, 2, 3, 4}; + List resultList = new ArrayList<>(); + boolean isExcel2003 = true; + if (fileName.matches("^.+\\.(?i)(xlsx)$")) { + isExcel2003 = false; + } + InputStream is = file.getInputStream(); + Workbook wb = null; + if (isExcel2003) { + wb = new HSSFWorkbook(is); + } else { + wb = new XSSFWorkbook(is); + } + Sheet sheet = wb.getSheetAt(0); + BaseModelModpriceImportReturn importReturn = getSheetVal(sheet, resultCell); + resultList = importReturn.getImportVoList(); + System.out.println("结果是--->" + resultList); + importReturn.setImportVoList(resultList); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String currentTime = simpleDateFormat.format(System.currentTimeMillis()); + if (null != resultList) { + int size = resultList.size(); + importReturn.setCheckResult(currentTime + " " + "上报成功" + String.valueOf(size) + "条记录。"); + return rb.success().setData(importReturn); + } else { + return rb.fail().setData(importReturn); + } + } + + public BaseModelModpriceImportReturn getSheetVal(Sheet sheet, int[] resultCell) throws ParseException { + BaseModelModpriceImportReturn importReturn = new BaseModelModpriceImportReturn(); + List importVoList = new ArrayList<>(); + int[] resultIndex = new int[resultCell.length]; + BaseModelModpriceImportVo importVo; + StringBuilder sb = new StringBuilder(); + ArrayList rowList = new ArrayList<>(); + + for (int r = 1; r <= sheet.getLastRowNum(); r++) { + Row row = sheet.getRow(r); + if (row == null) { + continue; + } + importVo = new BaseModelModpriceImportVo(); + for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) { + String trim = new String(); + try { + trim = getCellVal(row.getCell(i)).toString().trim(); + String temp = getCellVal(row.getCell(i)).toString().trim(); + for (int j = 0; j < resultCell.length; j++) { + if (i == resultCell[j]) { + switch (i) { + case 0: + importVo.setRankNo(temp); + rowList.add(temp); + break; + case 1: + importVo.setVehicleTypeCode(temp); + break; + case 2: + importVo.setConfigCode(temp); + break; + case 3: + importVo.setGuidedPrice(temp); + break; + case 4: + importVo.setManufactorSettlementPrice(temp); + break; + default: + break; + } + } else { + continue; + } + } + } catch (Exception e) { + if (StringUtils.isBlank(trim)) { + String word = new String(); + switch (i) { + case 0: + word = "序号"; + break; + case 1: + word = "车型编码"; + break; + case 2: + word = "配置编码"; + break; + case 3: + word = "调整后全款销售指导价（元）"; + break; + case 4: + word = "调整后贷款销售指导价（元）"; + break; + default: + break; + } + String checkResult = "第" + (r) + "行" + word + "为空"; + sb.append(checkResult).append(";"); + continue; + } + } + } + importVoList.add(importVo); + + } + + HashSet hashSet = new HashSet<>(); + HashMap map = new HashMap<>(); + for (BaseModelModpriceImportVo modpriceImportVo : importVoList) { + if (StringUtils.isNotBlank(modpriceImportVo.getVehicleTypeCode()) + && StringUtils.isNotBlank(modpriceImportVo.getConfigCode()) + && StringUtils.isNotBlank(modpriceImportVo.getGuidedPrice()) + && StringUtils.isNotBlank(modpriceImportVo.getManufactorSettlementPrice()) + ) { + //如果车型编码+配置编码存在,则判断金额是否相等 + if (map.containsKey(modpriceImportVo.getVehicleTypeCode() + modpriceImportVo.getConfigCode())) { + String guidedAndManuFactor = map.get(modpriceImportVo.getVehicleTypeCode() + modpriceImportVo.getConfigCode()); + String[] split = guidedAndManuFactor.split(","); + String oldGuided = split[0]; + String oldManuFactor = split[1]; + if (!oldGuided.equals(modpriceImportVo.getGuidedPrice()) || !oldManuFactor.equals(modpriceImportVo.getManufactorSettlementPrice())) { + hashSet.add(modpriceImportVo.getVehicleTypeCode() + modpriceImportVo.getConfigCode()); + } + } else { //如果车型编码+配置编码不存在，则存入map + map.put(modpriceImportVo.getVehicleTypeCode() + modpriceImportVo.getConfigCode(), modpriceImportVo.getGuidedPrice() + "," + modpriceImportVo.getManufactorSettlementPrice()); + } + } + } + Iterator iterator = hashSet.iterator(); + while (iterator.hasNext()) { + String next = iterator.next(); + sb.append("第"); + for (BaseModelModpriceImportVo modpriceImportVo : importVoList) { + if (StringUtils.isNotBlank(modpriceImportVo.getVehicleTypeCode()) + && StringUtils.isNotBlank(modpriceImportVo.getConfigCode()) + && StringUtils.isNotBlank(modpriceImportVo.getGuidedPrice()) + && StringUtils.isNotBlank(modpriceImportVo.getManufactorSettlementPrice()) + ) { + if ((modpriceImportVo.getVehicleTypeCode() + modpriceImportVo.getConfigCode()).equals(next)) { + sb.append(modpriceImportVo.getRankNo() + "行、"); + } + } + } + sb.delete(sb.length() - 1, sb.length()); + sb.append("相同车型编码、配置编码对应的销售指导价不同;"); + } + HashSet rowSet = new HashSet<>(rowList); + if (rowSet.size() != rowList.size()) { + StringBuilder sbd = new StringBuilder(); + Set set = new HashSet<>(); + Set duplicateElements = new HashSet<>(); + for (String rankNo : rowList) { + if (!set.add(rankNo)) { + duplicateElements.add(rankNo); + } + } + for (String duplicateElement : duplicateElements) { + sbd.append(duplicateElement).append("、"); + } + sbd.delete(sbd.length() - 1, sbd.length()); + sb.append(sbd.toString() + "序号有重复").append(";"); + } + importReturn.setImportVoList(importVoList); + if (StringUtils.isNotBlank(sb.toString())) { + sb.delete(sb.length() - 1, sb.length()); + importReturn.setCheckResult(sb.toString()); + importReturn.setImportVoList(null); + return importReturn; + } + return importReturn; + } + + public Object getCellVal(Cell cell) { + Object obj = null; + if (cell != null) { + switch (cell.getCellTypeEnum()) { + case BOOLEAN: + obj = cell.getBooleanCellValue(); + break; + case ERROR: + obj = cell.getErrorCellValue(); + break; + case NUMERIC: + obj = cell.getNumericCellValue(); + break; + case STRING: + obj = cell.getStringCellValue(); + break; + default: + break; + } + } + return obj; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index 6159a527b6..f2175a27ea 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java @@ -111,8 +111,8 @@ public class BaseTrailerRest implements BaseTrailerFeign { } @Override - public ResultBean trailerList(String vinSid) { - return baseTrailerService.trailerList(vinSid); + public ResultBean trailerList(String vinSid,String contractNo) { + return baseTrailerService.trailerList(vinSid,contractNo); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index d496264ce6..0e4d1d7530 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -29,56 +29,47 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basetrailer.*; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; -import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; -import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; -import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; -import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService; import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService; -import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService; +import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService; +import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign; -import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto; -import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -86,11 +77,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -103,7 +92,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -163,6 +151,10 @@ public class BaseTrailerService extends MybatisBaseService createQueryWrapper(BaseTrailerQuery query) { // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -716,16 +708,43 @@ public class BaseTrailerService extends MybatisBaseService trailerList(String vinSid) { + public ResultBean trailerList(String vinSid,String contractNo) { ResultBean rb = ResultBean.fireFail(); + //查询销售订单的上装价格 + String price = ""; + ResultBean detailsVoResultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(contractNo); + if(detailsVoResultBean.getData() != null){ + if(detailsVoResultBean.getData().getTopInfo() != null){ + price = detailsVoResultBean.getData().getTopInfo().getTopPrice(); + } + } TraliveredVo traliveredVo = new TraliveredVo(); + List vehillModelList = new ArrayList<>(); //根据车辆sid查询车架号以及车型信息 BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid); traliveredVo.setVinNo(baseVehicle.getVinNo()); traliveredVo.setModelName(baseVehicle.getModelName()); List voList = baseMapper.trailerList(vinSid); voList.removeAll(Collections.singleton(null)); - traliveredVo.setList(voList); + if(!voList.isEmpty()){ + traliveredVo.setList(voList); + } + //查询车辆的上装配置 + List baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(baseVehicle.getCreateOrgSid(), baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length()-8)); + baseVehinstallsList.removeAll(Collections.singleton(null)); + for (int i = 0; i < baseVehinstallsList.size(); i++) { + BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = new BaseVehinstallmodelDetailsVo(); + BaseVehinstall baseVehinstall = baseVehinstallsList.get(i); + String topSid = baseVehinstall.getMainSid(); + BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(topSid); + BeanUtil.copyProperties(baseVehinstallmodel,baseVehinstallmodelDetailsVo); + baseVehinstallmodelDetailsVo.setTopPrice(price); + vehillModelList.add(baseVehinstallmodelDetailsVo); + } + vehillModelList.removeAll(Collections.singleton(null)); + if(!vehillModelList.isEmpty()){ + traliveredVo.setVehillModelList(vehillModelList); + } return rb.success().setData(traliveredVo); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 43ab2649f7..6ecaeb2b0f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3849,7 +3849,7 @@ public class BaseVehicleService extends MybatisBaseService trailerVos = data.getList(); if (trailerVos != null && trailerVos.size() > 0){ for (TrailerVo trailerVo : trailerVos) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java index e57e7183c2..6390861091 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java @@ -133,7 +133,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid); - @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice} where sid = #{sid}") + @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice},modifyTime = now() where sid = #{sid}") void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice, @Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice, @Param("sid") String sid); IPage selVehModelByUseOrgSidAll(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index f1ac567515..88803f2c6c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -219,7 +219,7 @@ - update bus_sales_order_vehicle set temporaryNo = #{temporaryNo} where sid = #{sid} + update bus_sales_order_vehicle + set temporaryNo = #{temporaryNo} + where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 96a03ebf48..02c0447523 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -226,4 +226,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectByNoAndVinSids(String contractNo) { + return baseMapper.selectByNoAndVinSids(contractNo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java index 9c2037d16c..8afe91e6ba 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java @@ -10,13 +10,9 @@ public class AppBillApplicationPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("客户名称") private String name; - @ApiModelProperty("组织全路径") private String orgPath; - @ApiModelProperty("是否欠款开票") - private String isArrears; // 是否欠款开票 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java index 3cee863a83..fe52d3c697 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java @@ -51,6 +51,8 @@ public class FinBillApplicationQuery implements Query { @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid + @ApiModelProperty("组织全路径") + private String orgPath; // 组织全路径 @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty(value = "销售类型key") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java index 567b9ccd72..4f0a23a93e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java @@ -69,5 +69,4 @@ public class FinBillTrailerDto implements Dto { private String billAppSid; // 开票申请单sid @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 - } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 973cd81bbf..487f55f596 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -151,6 +151,10 @@ public class FinBillApplicationService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getOrgPath())){ + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + query.setUseOrgSid(useOrgSid); + } qw.ne("fba.billStateKey", "003"); qw.eq("fba.useOrgSid", query.getUseOrgSid()); qw.eq("fba.createBySid", query.getCreateBySid()); @@ -369,6 +373,7 @@ public class FinBillApplicationService extends MybatisBaseService trailerVoList = data.getList(); for (TrailerVo trailerVo : trailerVoList) { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); @@ -1113,11 +1118,6 @@ public class FinBillApplicationService extends MybatisBaseService iPage = baseMapper.getInvoicedApplyList(page, qw, name); List records = iPage.getRecords(); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index f81f46d6a7..e3215c5437 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -163,8 +163,6 @@ public class ScmApplyInboundDto implements Dto { private String orgSid; @ApiModelProperty("销售指导价") private String guidedPrice; // 销售指导价 - @ApiModelProperty("价格") - private String price; // 价格 @ApiModelProperty("最新更新时间") private String newUpdateDate; // 最新更新时间 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index b455d4bc26..74e1ada794 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -162,10 +162,8 @@ public class ScmApplyInboundVo implements Vo { private String configSid; @ApiModelProperty("部门sid") private String orgSid; - @ApiModelProperty("销售指导价") - private String guidedPrice; // 销售指导价 - @ApiModelProperty("价格") - private String price; // 价格 + @ApiModelProperty("全款/贷款销售指导价") + private String guidedPrice; // 全款/贷款销售指导价 @ApiModelProperty("最新更新时间") private String newUpdateDate; // 最新更新时间 } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 976453807a..10653b3801 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -21,6 +21,8 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail; @@ -141,6 +143,8 @@ public class ScmApplyInboundService extends MybatisBaseService listPage(PagerQuery pq) { ScmApplyInboundQuery query = pq.getParams(); @@ -246,9 +250,6 @@ public class ScmApplyInboundService extends MybatisBaseService list = scmApplyInboundVehicleService.selectListByAppSid(sid); List scmFileVos = scmFileService.fetchByMainSid(sid); for (ScmFileVo scmFileVo : scmFileVos) { @@ -405,6 +414,11 @@ public class ScmApplyInboundService extends MybatisBaseService vehicleList = dto.getVehicleList(); ScmApplyInbound scmApplyInbound1 = fetchBySid(busSid); if (StringUtils.isBlank(busSid)) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java index 74854edba1..d38e4d52fa 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java @@ -63,6 +63,8 @@ public class BillApplicationIInfoDto implements Dto { private String orgPath; @ApiModelProperty("流程实列id") private String procInsId; + @ApiModelProperty("流程状态") + private String nodeState; @ApiModelProperty("合同sid") private String contractSid; @ApiModelProperty("合同编号") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index 746dca2938..5f18dd8863 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -55,14 +55,10 @@ public class BillApplicationIInfoVo implements Vo { private List registerContractImages; @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; - @ApiModelProperty("任务id") - private String taskId; @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("组织全路径") private String orgPath; - @ApiModelProperty("流程实列id") - private String procInsId; @ApiModelProperty("合同sid") private String contractSid; @ApiModelProperty("合同编号") @@ -71,4 +67,11 @@ public class BillApplicationIInfoVo implements Vo { private String billNo; // 单据编号 @ApiModelProperty("是否可以编辑开票价") private Boolean isCanEdit; // 是否可以编辑开票价 + + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("流程实列id") + private String procInsId; + @ApiModelProperty("流程状态") + private String nodeState; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java index 234712d8fc..82a4e24f5d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java @@ -14,8 +14,6 @@ public class BillApplicationPageQuery implements Query { private String userSid; @ApiModelProperty("客户名称") private String name; - @ApiModelProperty("分公司sid") - private String useOrgSid; - @ApiModelProperty("是否欠款开票") - private String isArrears; + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java index 902a5d0e89..5075063ec2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java @@ -9,6 +9,9 @@ import lombok.Data; public class BillApplicationPageVo implements Vo { private static final long serialVersionUID = -6197889357871997515L; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("合同sid") @JsonProperty("contractSid") private String contractSid; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java index 47742d639c..bea73207df 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-fin(开票挂车信息)
* File: FinBillTrailerDto.java
@@ -68,5 +70,6 @@ public class FinBillTrailerDto implements Dto { private String billAppSid; // 开票申请单sid @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 - + @ApiModelProperty("合格证图片") + private List files; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java index e4fd67d221..74bde6e29e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-fin(开票挂车信息)
* File: FinBillTrailerVo.java
@@ -62,5 +64,6 @@ public class FinBillTrailerVo implements Vo { private String billAppSid; // 开票申请单sid @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 - + @ApiModelProperty("合格证图片") + private List files; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index 63fe061dc9..bda3bcc11b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java @@ -133,8 +133,13 @@ public interface AppBusDeliveredApplyFeign { @ResponseBody ResultBean getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query); - @ApiOperation("主车的挂车信息") + @ApiOperation("主车的挂车信息/上装信息") @GetMapping("/tralieredDetailsList") @ResponseBody - ResultBean tralieredDetailsList(@RequestParam("vinSid") String vinSid); + ResultBean tralieredDetailsList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo")String contractNo); + + @ApiOperation("待补充车辆") + @GetMapping("/appendRetrievalCars") + @ResponseBody + public ResultBean> appendRetrievalCars(@SpringQueryMap DeliveredDetailssQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index a1866b7e4f..a2355f5481 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java @@ -124,7 +124,12 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe } @Override - public ResultBean tralieredDetailsList(String vinSid) { + public ResultBean tralieredDetailsList(String vinSid,String contractNo) { + return null; + } + + @Override + public ResultBean> appendRetrievalCars(DeliveredDetailssQuery query) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java new file mode 100644 index 0000000000..293bf4fd68 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.retrieval; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/18 11:50 + * @Description + */ +@Data +public class DeliveredDetailssQuery { + + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("当前申请页面已选车辆的sid:app需要排除") + private List vinSelectsid = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java index 3d58dd82b0..0cbd5a13ab 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java @@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -15,6 +16,9 @@ public class DeliveredTralierVo { @ApiModelProperty("车型信息") private List modeInfo; - @ApiModelProperty("挂车列表信息") - private List> handCarInfo; + @ApiModelProperty("挂车/上装列表信息") + private List> handCarInfo = new ArrayList<>(); + + private List titles = new ArrayList<>(); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 1cfd9b66a1..832c249ea7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -66,12 +66,36 @@ public class InvoicedService { public ResultBean> getInvoicedApplyList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> resultBean = finBillApplicationFeign.getInvoicedApplyList(pq); - List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BillApplicationPageVo.class)).collect(Collectors.toList()); + BillApplicationPageQuery params = pagerQuery.getParams(); + FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery(); + finBillApplicationQuery.setCreateBySid(params.getUserSid()); + finBillApplicationQuery.setCustomerName(params.getName()); + finBillApplicationQuery.setOrgPath(params.getOrgPath()); + PagerQuery pcq = new PagerQuery<>(); + pcq.setParams(finBillApplicationQuery); + ResultBean> resultBean = finBillApplicationFeign.listPage(pcq); + List records = resultBean.getData().getRecords(); + List billApplicationPageVos = new ArrayList<>(); PagerVo v = new PagerVo<>(); - BeanUtil.copyProperties(resultBean.getData(), v); - v.setRecords(voList); + for (FinBillApplicationVo record : records) { + BillApplicationPageVo billApplicationPageVo = new BillApplicationPageVo(); + billApplicationPageVo.setSaleType(record.getSaleTypeValue()); + billApplicationPageVo.setBillUnit(record.getOpenTickUnitName()); + billApplicationPageVo.setCustomerName(record.getCustomerName()); + billApplicationPageVo.setModel(record.getModelName()); + billApplicationPageVo.setApplyName(record.getCreateByName()); + billApplicationPageVo.setApplyDate(record.getApplyDate()); + billApplicationPageVo.setNum(record.getNum().toString()); + billApplicationPageVo.setContractNo(record.getContractNo()); + billApplicationPageVo.setSid(record.getSid()); + if (record.getNodeState().equals("待提交") || record.getNodeState().equals("发起申请")){ + billApplicationPageVo.setShowUpData(true); + }else { + billApplicationPageVo.setShowUpData(false); + } + billApplicationPageVos.add(billApplicationPageVo); + } + v.setRecords(billApplicationPageVos); return rb.success().setData(v); } @@ -84,6 +108,21 @@ public class InvoicedService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); + vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney()); + vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath()); + vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue()); + vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName()); + vo.setSellerName(finBillApplicationDetailsVo.getStaffName()); + vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName()); + vo.setName(finBillApplicationDetailsVo.getCustomerName()); + vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney()); + vo.setOpenTickTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey()); + vo.setOpenTickTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue()); + vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName()); + vo.setInvoiceStateKey(finBillApplicationDetailsVo.getBillStateKey()); + vo.setInvoiceState(finBillApplicationDetailsVo.getBillStateValue()); + vo.setContractId(finBillApplicationDetailsVo.getContractNo()); + vo.setDate(finBillApplicationDetailsVo.getApplyDate()); vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); //车辆信息 @@ -108,6 +147,10 @@ public class InvoicedService { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); + String hgzImageUrl = finBillTrailer.getHgzImageUrl(); + List files = new ArrayList<>(); + files.add(hgzImageUrl); + finBillTrailerVo.setFiles(files); finBillTrailerVos.add(finBillTrailerVo); } } @@ -140,7 +183,6 @@ public class InvoicedService { vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); }else { vo.setIsCanEdit(true); - vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } return rb.success().setData(vo); } @@ -148,7 +190,27 @@ public class InvoicedService { public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) { FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); BeanUtil.copyProperties(dto, finBillApplicationDto); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + finBillApplicationDto.setUseOrgSid(useOrgSid); + finBillApplicationDto.setCreateBySid(dto.getUserSid()); + finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney()); + finBillApplicationDto.setOrgSidPath(dto.getOrgPath()); + finBillApplicationDto.setSaleTypeValue(dto.getSaleType()); + finBillApplicationDto.setSaleDeptName(dto.getSellerName()); + finBillApplicationDto.setStaffName(dto.getSellerName()); + finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + finBillApplicationDto.setCustomerName(dto.getName()); + finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); + finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey()); + finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue()); + finBillApplicationDto.setOpenTickName(dto.getOpenTickName()); + finBillApplicationDto.setBillStateKey(dto.getInvoiceStateKey()); + finBillApplicationDto.setBillStateValue(dto.getInvoiceState()); + finBillApplicationDto.setContractNo(dto.getContractId()); + finBillApplicationDto.setApplyDate(dto.getDate()); finBillApplicationDto.setCreateBySid(dto.getUserSid()); + finBillApplicationDto.setNodeState(dto.getNodeState()); + finBillApplicationDto.setBillNo(dto.getBillNo()); String publishInfo = dto.getPublishInfo(); finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-"))); finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-"))); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 8484950af7..0fabf9b94d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -132,7 +132,12 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { } @Override - public ResultBean tralieredDetailsList(String vinSid) { - return appBusDeliveredApplyService.tralieredDetailsList(vinSid); + public ResultBean tralieredDetailsList(String vinSid,String contractNo) { + return appBusDeliveredApplyService.tralieredDetailsList(vinSid,contractNo); + } + + @Override + public ResultBean> appendRetrievalCars(DeliveredDetailssQuery query) { + return appBusDeliveredApplyService.appendRetrievalCars(query); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index ff3f208a3e..0170ffc1b3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -30,8 +30,10 @@ import com.alibaba.fastjson.JSON; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; +import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.*; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -266,149 +268,200 @@ public class AppBusDeliveredApplyService { return rb.success().setData(data); } - public ResultBean tralieredDetailsList(String vinSid) { + public ResultBean tralieredDetailsList(String vinSid, String contractNo) { ResultBean rb = ResultBean.fireFail(); DeliveredTralierVo deliveredTralierVo = new DeliveredTralierVo(); - ResultBean resultBean = baseTrailerFeign.trailerList(vinSid); + ResultBean resultBean = baseTrailerFeign.trailerList(vinSid, contractNo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } TraliveredVo traliveredVo = resultBean.getData(); + //车型信息 List modelInfo = new ArrayList<>(); + //挂车/上装列表的拼接list List> handCarInfo = new ArrayList<>(); + List titles = new ArrayList<>(); String vinNo = traliveredVo.getVinNo(); modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 2)); String modelName = traliveredVo.getModelName(); modelInfo.add(getConfigValueSpanSize("车型", modelName, 2)); deliveredTralierVo.setModeInfo(modelInfo); List list = traliveredVo.getList(); - for (int i = 0; i < list.size(); i++) { - TrailerVo trailerVo = list.get(i); - List configVoList = new ArrayList<>(); - //挂车车架号 - String trailerVinNo = trailerVo.getTrailerVinNo(); - configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1)); - //成交价 - String dealPrice = trailerVo.getDealPrice(); - configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1)); - //车辆品牌 - String brandName = trailerVo.getBrandName(); - configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1)); - //车辆型号 - String carModelName = trailerVo.getCarModelName(); - configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1)); - //生产厂商名称 - String manufacturerName = trailerVo.getManufacturerName(); - configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2)); - //挂车类型 - String trailerTypeValue = trailerVo.getTrailerTypeValue(); + List vehillModelList = traliveredVo.getVehillModelList(); + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + String title = "挂车" + i + 1; + titles.add(title); + TrailerVo trailerVo = list.get(i); + List configVoList = new ArrayList<>(); + //挂车车架号 + String trailerVinNo = trailerVo.getTrailerVinNo(); + configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1)); + //成交价 + String dealPrice = trailerVo.getDealPrice(); + configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1)); + //车辆品牌 + String brandName = trailerVo.getBrandName(); + configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1)); + //车辆型号 + String carModelName = trailerVo.getCarModelName(); + configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1)); + //生产厂商名称 + String manufacturerName = trailerVo.getManufacturerName(); + configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2)); + //挂车类型 + String trailerTypeValue = trailerVo.getTrailerTypeValue(); - configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2)); - //外观尺寸 - String appearanceSizeAll = ""; - String appearanceSizeLong = trailerVo.getAppearanceSizeLong(); - if (StringUtils.isNotBlank(appearanceSizeLong)) { - appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,"; - }else{ - appearanceSizeAll = appearanceSizeAll + "长 mm,"; - } - String appearanceSizeWide = trailerVo.getAppearanceSizeWide(); - if (StringUtils.isNotBlank(appearanceSizeWide)) { - appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,"; - }else{ - appearanceSizeAll = appearanceSizeAll + "宽 mm,"; - } - //高 - String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh(); - if (StringUtils.isNotBlank(appearanceSizeHigh)) { - appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,"; - }else{ - appearanceSizeAll = appearanceSizeAll + "高 mm,"; - } - //总高 - String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh(); - if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) { - appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh+"mm"; - }else{ - appearanceSizeAll = appearanceSizeAll + "总高 mm"; - } - //外观尺寸 - configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2)); - //内部尺寸 - String insideSizeAll = ""; - String insideSizeLong = trailerVo.getInsideSizeLong(); - if (StringUtils.isNotBlank(insideSizeLong)) { - insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,"; - } else { - insideSizeAll = insideSizeAll + "长 mm,"; - } - String insideSizeWide = trailerVo.getInsideSizeWide(); - if (StringUtils.isNotBlank(insideSizeWide)) { - insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,"; - } else { - insideSizeAll = insideSizeAll + "宽 mm,"; - } - String insideSizeHigh = trailerVo.getInsideSizeHigh(); - if (StringUtils.isNotBlank(insideSizeHigh)) { - insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm"; - } else { - insideSizeAll = insideSizeAll + "高 mm"; - } - configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2)); - String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh(); - configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2)); - //大梁尺寸 - String girderSizeAll = ""; - String girderSizeHigh = trailerVo.getGirderSizeHigh(); - if (StringUtils.isNotBlank(girderSizeHigh)) { - girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,"; - }else{ - girderSizeAll = girderSizeAll + "高度 mm,"; - } - String girderSizeWide = trailerVo.getGirderSizeWide(); - if (StringUtils.isNotBlank(girderSizeWide)) { - girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,"; - }else{ - girderSizeAll = girderSizeAll + "宽度 mm,"; - } - String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate(); - if (StringUtils.isNotBlank(girderSizeStandPlate)) { - girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm"; - }else{ - girderSizeAll = girderSizeAll + "立板 mm"; + configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2)); + //外观尺寸 + String appearanceSizeAll = ""; + String appearanceSizeLong = trailerVo.getAppearanceSizeLong(); + if (StringUtils.isNotBlank(appearanceSizeLong)) { + appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,"; + } else { + appearanceSizeAll = appearanceSizeAll + "长 mm,"; + } + String appearanceSizeWide = trailerVo.getAppearanceSizeWide(); + if (StringUtils.isNotBlank(appearanceSizeWide)) { + appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,"; + } else { + appearanceSizeAll = appearanceSizeAll + "宽 mm,"; + } + //高 + String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh(); + if (StringUtils.isNotBlank(appearanceSizeHigh)) { + appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,"; + } else { + appearanceSizeAll = appearanceSizeAll + "高 mm,"; + } + //总高 + String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh(); + if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) { + appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh + "mm"; + } else { + appearanceSizeAll = appearanceSizeAll + "总高 mm"; + } + //外观尺寸 + configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2)); + //内部尺寸 + String insideSizeAll = ""; + String insideSizeLong = trailerVo.getInsideSizeLong(); + if (StringUtils.isNotBlank(insideSizeLong)) { + insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,"; + } else { + insideSizeAll = insideSizeAll + "长 mm,"; + } + String insideSizeWide = trailerVo.getInsideSizeWide(); + if (StringUtils.isNotBlank(insideSizeWide)) { + insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,"; + } else { + insideSizeAll = insideSizeAll + "宽 mm,"; + } + String insideSizeHigh = trailerVo.getInsideSizeHigh(); + if (StringUtils.isNotBlank(insideSizeHigh)) { + insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm"; + } else { + insideSizeAll = insideSizeAll + "高 mm"; + } + configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2)); + String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh(); + configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2)); + //大梁尺寸 + String girderSizeAll = ""; + String girderSizeHigh = trailerVo.getGirderSizeHigh(); + if (StringUtils.isNotBlank(girderSizeHigh)) { + girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,"; + } else { + girderSizeAll = girderSizeAll + "高度 mm,"; + } + String girderSizeWide = trailerVo.getGirderSizeWide(); + if (StringUtils.isNotBlank(girderSizeWide)) { + girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,"; + } else { + girderSizeAll = girderSizeAll + "宽度 mm,"; + } + String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate(); + if (StringUtils.isNotBlank(girderSizeStandPlate)) { + girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm"; + } else { + girderSizeAll = girderSizeAll + "立板 mm"; + } + configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2)); + //牵引销 + String towPin = trailerVo.getTowPin(); + configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2)); + //板簧 + String plateSpring = trailerVo.getPlateSpring(); + configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2)); + //车桥 + String axle = trailerVo.getAxle(); + configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2)); + //轮胎及钢圈 + String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle(); + configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2)); + //底板 + String floorSize = trailerVo.getFloorSize(); + if (StringUtils.isNotBlank(floorSize)) { + configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2)); + } else { + configVoList.add(getConfigValueSpanSize("底板(底盘)", " mm", 2)); + } + + //门扇要求 + String doorFanRequirement = trailerVo.getDoorFanRequirement(); + configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1)); + //箱体颜色 + String boxColor = trailerVo.getBoxColor(); + configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1)); + //更多配置 + String moreConfig = trailerVo.getMoreConfig(); + configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2)); + handCarInfo.add(configVoList); } - configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2)); - //牵引销 - String towPin = trailerVo.getTowPin(); - configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2)); - //板簧 - String plateSpring = trailerVo.getPlateSpring(); - configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2)); - //车桥 - String axle = trailerVo.getAxle(); - configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2)); - //轮胎及钢圈 - String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle(); - configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2)); - //底板 - String floorSize = trailerVo.getFloorSize(); - if(StringUtils.isNotBlank(floorSize)){ - configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2)); - }else{ - configVoList.add(getConfigValueSpanSize("底板(底盘)", " mm", 2)); + } + if (!vehillModelList.isEmpty()) { + for (int i = 0; i < vehillModelList.size(); i++) { + String title = "上装" + i + 1; + titles.add(title); + BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = vehillModelList.get(i); + List configVoList = new ArrayList<>(); + //成交价2个格 + String topPrice = baseVehinstallmodelDetailsVo.getTopPrice(); + configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2)); + //车辆功能 + String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); + configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); + //上装名称 + String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue(); + configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1)); + //委改方式 + String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue(); + configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1)); + //委改厂 + configVoList.add(getConfigValueSpanSize("委改厂", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); + //外廓尺寸 + configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1)); + //颜色 + configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1)); + //板材材质 + configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1)); + //板材厚度 + configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1)); + //篷布滑道 + configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1)); + //冷藏冷机 + configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1)); + //自卸液压盖版 + configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1)); + //底板加热 + configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1)); + //更多配置2个格 + configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2)); + handCarInfo.add(configVoList); } - //门扇要求 - String doorFanRequirement = trailerVo.getDoorFanRequirement(); - configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1)); - //箱体颜色 - String boxColor = trailerVo.getBoxColor(); - configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1)); - //更多配置 - String moreConfig = trailerVo.getMoreConfig(); - configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2)); - handCarInfo.add(configVoList); } + deliveredTralierVo.setHandCarInfo(handCarInfo); return rb.success().setData(deliveredTralierVo); } @@ -424,4 +477,13 @@ public class AppBusDeliveredApplyService { } return configInfoSpanSize; } + + public ResultBean> appendRetrievalCars(DeliveredDetailssQuery query) { + ResultBean> rb = ResultBean.fireFail(); + DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery(); + BeanUtil.copyProperties(query, deliverDetailsQuery); + ResultBean> selectInfo = busDeliveredFeign.selectInfo(deliverDetailsQuery); + List voList = Optional.ofNullable(selectInfo.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CarListVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } } \ No newline at end of file