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 edaff9cae1..3bb880f21d 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,7 +26,6 @@ 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,9 +33,12 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.text.ParseException; @@ -109,11 +111,10 @@ public interface BaseModelModpriceFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody BaseModelModPriceTaskQuery query); - @ApiOperation(value = "导入") - @PostMapping("/getExcelInfo") + @ApiOperation(value = "") + @RequestMapping(value = "/getExcelInfo", method = RequestMethod.POST) @ResponseBody - public ResultBean getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException; - + public ResultBean getExcelInfo(@RequestParam("sid") String sid, @RequestParam("file") MultipartFile file, @RequestParam("request")HttpServletRequest request,@RequestParam("response")HttpServletResponse response)throws IOException,ParseException; @PostMapping("/downloadExcel") @ApiOperation(value = "下载模板") @@ -121,4 +122,8 @@ public interface BaseModelModpriceFeign { public void downloadExcel(); + @ApiOperation(value = "下载模板") + @GetMapping("/downloadModPriceExcel") + public void downloadModPriceExcel(HttpServletResponse response); + } \ 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 9967044d29..c54be19263 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 @@ -37,6 +37,8 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; import java.util.List; @@ -115,7 +117,7 @@ public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign { } @Override - public ResultBean getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException { + public ResultBean getExcelInfo(String sid, MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException, ParseException { return null; } @@ -123,4 +125,10 @@ public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign { public void downloadExcel() { } + @Override + public void downloadModPriceExcel(HttpServletResponse response) { + + } + + } \ 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 index 29345dd307..4742b43517 100644 --- 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 @@ -19,7 +19,8 @@ public class BaseModelModpriceImportReturn implements Vo { @ApiModelProperty("校验结果") private String checkResult; // 校验结果 - + @ApiModelProperty("校验返回结果集合") + private List checkResultList; // 校验结果 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 index 9a0bb50dee..d3d92605e0 100644 --- 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 @@ -18,11 +18,21 @@ public class BaseModelModpriceImportVo implements Vo { private String rankNo; // 序号 @ApiModelProperty("车型编码") private String vehicleTypeCode; // 车型编码 + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 @ApiModelProperty("配置编码") private String configCode; // 配置编码 + @ApiModelProperty("常用配置") + private String configName; // 常用配置 + @ApiModelProperty("更多配置") + private String otherConfig; // 更多配置 + @ApiModelProperty("现行全款销售指导价（元）") + private String oldGuidedPrice; // 现全款销售指导价 + @ApiModelProperty("现行贷款销售指导价（元）") + private String oldManufactorSettlementPrice; // 现贷款销售指导价 @ApiModelProperty("调整后全款销售指导价（元）") private String guidedPrice; // 现全款销售指导价 @ApiModelProperty("调整后贷款销售指导价（元）") private String manufactorSettlementPrice; // 现贷款销售指导价 - + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java index d89065cdb8..63f75e20d4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java @@ -214,9 +214,13 @@ public interface BaseModelConfigMapper extends BaseMapper { List checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid); - List getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid") String orgSid,@Param("label") String label); + List getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid") String orgSid, @Param("label") String label); ModelConfigVo getStockModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid); - BaseModelConfigVo selectByConfigName(@Param("sid") String sid,@Param("configName") String configName); + BaseModelConfigVo selectByConfigName(@Param("sid") String sid, @Param("configName") String configName); + + @Select("Select * from base_model_config where configCode = #{configCode}") + BaseModelConfig getConfigByConfigCode(@Param("configCode") String configCode); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 29d7a0b8fc..ae419bcd18 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -1150,4 +1150,8 @@ public class BaseModelConfigService extends MybatisBaseService getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException { + public ResultBean getExcelInfo(String sid,MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException, ParseException { - return baseModelModpriceService.getExcelInfo(fileName, file); + return baseModelModpriceService.getExcelInfo(sid,file,request,response); } @Override public void downloadExcel() { List list = new ArrayList<>(); - int i = 1; - while (i <= 10) { BaseModelModpriceExportVo exportVo = new BaseModelModpriceExportVo(); - exportVo.setRankNo(i); + exportVo.setRankNo(1); list.add(exportVo); - i++; - } //定义导出的excel名字 String excelName = "调价车型价格导入模板"; String fileNameURL = ""; @@ -182,5 +168,31 @@ public class BaseModelModpriceRest implements BaseModelModpriceFeign { ExportExcelUtils.export(fileNameURL, list, BaseModelModpriceExportVo.class, response); } + @Override + public void downloadModPriceExcel(HttpServletResponse response) { + try { + InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/excel/调价申请模板.xls"); + //获取要下载的模板名称 + String fileName = "调价申请模板.xls"; + response.setHeader("content-type", "application/octet-stream"); + response.setContentType("application/octet-stream"); + // 下载文件能正常显示中文 + fileName = URLEncoder.encode(fileName, "UTF-8"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setHeader("fileName", fileName); + response.setHeader("Access-Control-Expose-Headers", "filename"); + + OutputStream out = response.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = resourceAsStream.read(b)) != -1) { + out.write(b, 0, len); + } + out.close(); + resourceAsStream.close(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } } 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 a8c6077e71..e51f6717c6 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 @@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basemodelmodprice.*; import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery; import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery; @@ -39,9 +40,14 @@ import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto; import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel; import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto; import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo; +import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; +import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService; +import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigMapper; +import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -64,20 +70,25 @@ import com.yxt.common.core.vo.PagerVo; 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.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItem; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; 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.ss.usermodel.*; 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 org.springframework.web.multipart.commons.CommonsMultipartFile; -import java.io.IOException; -import java.io.InputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.math.BigDecimal; +import java.nio.file.Files; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -117,6 +128,12 @@ public class BaseModelModpriceService extends MybatisBaseService listPageVo(PagerQuery pq) { BaseModelModpriceQuery query = pq.getParams(); @@ -533,11 +550,19 @@ public class BaseModelModpriceService extends MybatisBaseService getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException { + public ResultBean getExcelInfo(String sid, MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException, ParseException { ResultBean rb = ResultBean.fireFail(); + + String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录 + File tempFile = new File(temp); + if (!tempFile.exists()) { + tempFile.mkdirs(); + } + String fileName = file.getOriginalFilename(); 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; @@ -552,7 +577,7 @@ public class BaseModelModpriceService extends MybatisBaseService" + resultList); importReturn.setImportVoList(resultList); @@ -563,18 +588,33 @@ public class BaseModelModpriceService extends MybatisBaseService stringList = new ArrayList<>(); + for (String s : split) { + stringList.add(s); + } + importReturn.setCheckResultList(stringList); + return rb.success().setData(importReturn); } } - public BaseModelModpriceImportReturn getSheetVal(Sheet sheet, int[] resultCell) throws ParseException { + public BaseModelModpriceImportReturn getSheetVal(Sheet sheet, int[] resultCell, String sid) 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<>(); - + String append1 = ""; + String append2 = ""; + String append3 = ""; + StringBuilder sb1 = new StringBuilder(); + sb1.append(append1); + StringBuilder sb2 = new StringBuilder(); + sb2.append(append2); + StringBuilder sb3 = new StringBuilder(); + sb3.append(append3); for (int r = 1; r <= sheet.getLastRowNum(); r++) { Row row = sheet.getRow(r); if (row == null) { @@ -585,6 +625,9 @@ public class BaseModelModpriceService extends MybatisBaseService modelList = baseVehicleModelService.selectBycreateOrg(sid); + HashMap map = new HashMap<>(); + if (modelList != null && modelList.size() != 0) { + for (BaseVehicleModel bvm : modelList) { + map.put(bvm.getVehicleTypeCode(), bvm); + if (StringUtils.isNotBlank(bvm.getSid())) { + modelSid = bvm.getSid(); + BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchById(modelSid); + if (null != baseVehicleModel && StringUtils.isNotBlank(baseVehicleModel.getVehicleType())) { + vehType = baseVehicleModel.getVehicleType(); + } + //根据车型sid查询关联配置 + List configSids = baseVehmodelConfigService.selectModelConfigSidByModelSid(modelSid); + if (null != configSids) { + for (String s : configSids) { + configSid = s; + BaseModelConfig config = baseModelConfigService.fetchById(s); + if (null != config && StringUtils.isNotBlank(config.getConfigCode())) { + configCode = config.getConfigCode(); + } + if (!configCode.equals(importVo.getConfigCode())) { + append2 = "第" + importVo.getRankNo() + "行配置编码不存在;"; + } + BaseVehmodelVo vehmodelVo = baseVehmodelConfigService.selectOne(modelSid, configSid, sid).getData(); + if (null != vehmodelVo) { + if (StringUtils.isNotBlank(vehmodelVo.getModelName())) { + importVo.setModelName(vehmodelVo.getModelName()); + } + if (StringUtils.isNotBlank(vehmodelVo.getConfigName())) { + importVo.setConfigName(vehmodelVo.getConfigName()); + } + if (StringUtils.isNotBlank(vehmodelVo.getGuidedPrice())) { + importVo.setOldGuidedPrice(vehmodelVo.getGuidedPrice()); + } + if (StringUtils.isNotBlank(vehmodelVo.getManufactorSettlementPrice())) { + importVo.setOldManufactorSettlementPrice(vehmodelVo.getManufactorSettlementPrice()); + } + if (StringUtils.isNotBlank(vehmodelVo.getOtherConfig())) { + importVo.setOtherConfig(vehmodelVo.getOtherConfig()); + } + } + } + } + } + } + if (!map.containsKey(importVo.getVehicleTypeCode())) { + append1 = "第" + importVo.getRankNo() + "行车辆编码不存在;"; + } + sb1.append(append1); + sb2.append(append2); + } else { + append3 = "第" + importVo.getRankNo() + "行车型编码不存在;"; + } + } importVoList.add(importVo); - } HashSet hashSet = new HashSet<>(); @@ -700,6 +802,17 @@ public class BaseModelModpriceService extends MybatisBaseService { - //@Update("update base_model_modprice_model 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); - - @Select("select * from base_model_modprice_model") - List selectListVo(); + //@Update("update base_model_modprice_model set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from base_model_modprice_model where mainSid = #{sid}") + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_model_modprice_model") + List selectListVo(); + + @Select("select * from base_model_modprice_model where mainSid = #{sid}") List fetchByMainSid(String sid); - @Delete("delete from base_model_modprice_model where mainSid = #{sid}") - int delByMainSid(String sid); + @Delete("delete from base_model_modprice_model where mainSid = #{sid}") + int delByMainSid(String sid); + + BaseModelModpriceModel getOneByModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml index 9ef55caed6..f7b02f4e3f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml @@ -1,13 +1,24 @@ - - - - - + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java index 993a1970e1..3c6db886e1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java @@ -60,102 +60,108 @@ import java.util.List; */ @Service public class BaseModelModpriceModelService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BaseModelModpriceModelQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BaseModelModpriceModelQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(BaseModelModpriceModelQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getMainSid())) { - qw.eq("mainSid", query.getMainSid()); - } - - if (StringUtils.isNotBlank(query.getModelSid())) { - qw.eq("modelSid", query.getModelSid()); - } - - if (StringUtils.isNotBlank(query.getVehicleAlias())) { - qw.eq("vehicleAlias", query.getVehicleAlias()); - } - - if (StringUtils.isNotBlank(query.getConfigSid())) { - qw.eq("configSid", query.getConfigSid()); - } - - if (StringUtils.isNotBlank(query.getConfigName())) { - qw.eq("configName", query.getConfigName()); - } - - if (StringUtils.isNotBlank(query.getCostPrice())) { - qw.eq("costPrice", query.getCostPrice()); - } - - if (StringUtils.isNotBlank(query.getGuidedPrice())) { - qw.eq("guidedPrice", query.getGuidedPrice()); - } - - if (StringUtils.isNotBlank(query.getIncOrDecInPrice())) { - qw.eq("incOrDecInPrice", query.getIncOrDecInPrice()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BaseModelModpriceModelQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BaseModelModpriceModelQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BaseModelModpriceModelDto dto){ - BaseModelModpriceModel entity = new BaseModelModpriceModel(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BaseModelModpriceModelVo fetchByIdVo(String id){ - BaseModelModpriceModel entity = this.fetchById(id); - BaseModelModpriceModelVo vo = new BaseModelModpriceModelVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + public PagerVo listPage(PagerQuery pq) { + BaseModelModpriceModelQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(BaseModelModpriceModelQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(BaseModelModpriceModelQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getMainSid())) { + qw.eq("mainSid", query.getMainSid()); + } + + if (StringUtils.isNotBlank(query.getModelSid())) { + qw.eq("modelSid", query.getModelSid()); + } + + if (StringUtils.isNotBlank(query.getVehicleAlias())) { + qw.eq("vehicleAlias", query.getVehicleAlias()); + } + + if (StringUtils.isNotBlank(query.getConfigSid())) { + qw.eq("configSid", query.getConfigSid()); + } + + if (StringUtils.isNotBlank(query.getConfigName())) { + qw.eq("configName", query.getConfigName()); + } + + if (StringUtils.isNotBlank(query.getCostPrice())) { + qw.eq("costPrice", query.getCostPrice()); + } + + if (StringUtils.isNotBlank(query.getGuidedPrice())) { + qw.eq("guidedPrice", query.getGuidedPrice()); + } + + if (StringUtils.isNotBlank(query.getIncOrDecInPrice())) { + qw.eq("incOrDecInPrice", query.getIncOrDecInPrice()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BaseModelModpriceModelQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BaseModelModpriceModelQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BaseModelModpriceModelDto dto) { + BaseModelModpriceModel entity = new BaseModelModpriceModel(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BaseModelModpriceModelVo fetchByIdVo(String id) { + BaseModelModpriceModel entity = this.fetchById(id); + BaseModelModpriceModelVo vo = new BaseModelModpriceModelVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } public List fetchByMainSid(String sid) { - return baseMapper.fetchByMainSid(sid); + return baseMapper.fetchByMainSid(sid); } - public int delByMainSid(String sid) { - return baseMapper.delByMainSid(sid); - } + public int delByMainSid(String sid) { + return baseMapper.delByMainSid(sid); + } - public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) { - return null; - } + public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) { + return null; + } - public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) { - return null; - } + public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) { + return null; + } + + public BaseModelModpriceModel getOneByModelSidAndConfigSid(String modelSid, String configSid) { + return baseMapper.getOneByModelSidAndConfigSid(modelSid, configSid); + } } \ No newline at end of file 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 6ecaeb2b0f..708532ea73 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 @@ -519,9 +519,12 @@ public class BaseVehicleService extends MybatisBaseService qw = new QueryWrapper<>(); List sids = pagerQuery.getSids(); + if (sids != null) { - if (sids.size() != 0) { - qw.in("bv.sid", sids); + for (String sid : sids) { + if (sids.size() != 0) { + qw.in("bv.sid", sid); + } } } if (pagerQuery != null) { @@ -1171,10 +1174,10 @@ public class BaseVehicleService extends MybatisBaseService exiCarBuildQueryWrapper(ExiCarQuery params) { QueryWrapper qw = new QueryWrapper<>(); //本分公司 - if(StringUtils.isNotBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getOrgPath())) { String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); qw.eq("bv.createOrgSid", orgSid); - }else{ + } else { if (StringUtils.isNotBlank(params.getUserSid())) { String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); qw.eq("bv.createOrgSid", orgSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java index 3027cb3da3..502f4a1ded 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java @@ -38,7 +38,7 @@ public interface BaseVehicleModelMapper extends BaseMapper { * @param qw * @return */ - IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw,@Param("createOrgSid") String createOrgSid); + IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw, @Param("createOrgSid") String createOrgSid); /** * 详情以及修改回显接口 @@ -160,5 +160,11 @@ public interface BaseVehicleModelMapper extends BaseMapper { int selectCount(); - String getCode(@Param("modelSid") String modelSid,@Param("createOrgSid") String createOrgSid); + String getCode(@Param("modelSid") String modelSid, @Param("createOrgSid") String createOrgSid); + + @Select("select sid,modelName from base_vehicle_model where vehicleTypeCode = #{vehicleTypeCode}") + BaseVehicleModel selectByvehicleTypeCode(@Param("vehicleTypeCode") String vehicleTypeCode); + + @Select("select * from base_vehicle_model where createOrg = #{sid} AND isDelete = 0") + List selectBycreateOrg(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index 0ef5c5dfeb..31555ecf32 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java @@ -695,4 +695,15 @@ public class BaseVehicleModelService extends MybatisBaseService selectBycreateOrg(String sid) { + return baseMapper.selectBycreateOrg(sid); + } } \ No newline at end of file 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 6390861091..e5ec012ae0 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 @@ -137,4 +137,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice, @Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice, @Param("sid") String sid); IPage selVehModelByUseOrgSidAll(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Select("SELECT configurationItemsSid FROM base_vehmodel_config WHERE modelSid = #{modelSid}") + List selectModelConfigSidByModelSid(@Param("modelSid") String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 9c2b152076..29ddea83f9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -926,4 +926,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService selectModelConfigSidByModelSid(String modelSid) { + return baseMapper.selectModelConfigSidByModelSid(modelSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index b7c34b2f5f..bc9a436c35 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -45,6 +45,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.lang.reflect.InvocationTargetException; import java.util.List; /** @@ -167,6 +168,11 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean getBillInfo(@SpringQueryMap AppOrderInitQuery appOrderInitQuery); + @ApiOperation("重新发起") + @GetMapping("/rePublishSaleOrder/{saleOrderSid}") + @ResponseBody + public ResultBean rePublishSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid) throws InvocationTargetException, IllegalAccessException; + /** * 新增保存销售订单信息 * @@ -196,7 +202,7 @@ public interface BusSalesOrderFeign { @ApiOperation("初始化销售订单补充说明") @GetMapping("/getOrderRemarksInfo") @ResponseBody - ResultBean getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid); + ResultBean getOrderRemarksInfo(@RequestParam("saleOrderSid") String saleOrderSid); @ApiOperation("更新销售订单合同编号") @PutMapping("/updateContractNoBySid") @@ -252,17 +258,17 @@ public interface BusSalesOrderFeign { @ApiOperation("查询该合同下的该辆车架号的车辆sid") @GetMapping("/getVinSidByConSid") @ResponseBody - ResultBean getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo); + ResultBean getVinSidByConSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinNo") String vinNo); @ApiOperation("查询该合同下的单车成交价") @GetMapping("/selectByContractNo") @ResponseBody - ResultBean selectByContractNo(@RequestParam("contractNo")String contractNo); + ResultBean selectByContractNo(@RequestParam("contractNo") String contractNo); @ApiOperation("查询该合同下的销售订单") @GetMapping("/selectOrderByContractNo") @ResponseBody - ResultBean selectOrderByContractNo(@RequestParam("contractNo")String contractNo); + ResultBean selectOrderByContractNo(@RequestParam("contractNo") String contractNo); @ApiOperation("销售订单的虚拟订金删除") @DeleteMapping("/deleteVirtualDepositList") @@ -287,15 +293,15 @@ public interface BusSalesOrderFeign { @ApiOperation(value = "查询客户的临时编码") @GetMapping("/selectTemporaryNo") @ResponseBody - ResultBean selectTemporaryNo(@RequestParam("vehSid")String vehSid, @RequestParam("contractNo")String contractNo); + ResultBean selectTemporaryNo(@RequestParam("vehSid") String vehSid, @RequestParam("contractNo") String contractNo); @ApiOperation(value = "出库初始化，根据车辆sid查询销售订单是否存在，若存在返回相关数据") @GetMapping("/selectOrderOne") @ResponseBody - ResultBean selectOrderOne(@RequestParam("vinSid")String vinSid); + ResultBean selectOrderOne(@RequestParam("vinSid") String vinSid); @ApiOperation("生成销售订单PDF") @PostMapping("/createPdf") @ResponseBody - public ResultBean createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName); + public ResultBean createPdf(@RequestParam("sid") String sid, @RequestParam("userName") String userName); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 493daca62d..0114468008 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -40,6 +40,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.lang.reflect.InvocationTargetException; import java.util.List; /** @@ -150,6 +151,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { return null; } + @Override + public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { + return null; + } + @Override public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java index 70e644ce1e..fbc25a0ea8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java @@ -64,4 +64,6 @@ public class AppBusSalesOrderQuery implements Query { @ApiModelProperty("当前组织机构全路径sid") private String orgPath; + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index a99487547a..bae1f457e1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -130,7 +130,7 @@ public class AppBusSalesOrderVo implements Vo { private boolean showApplyBtn; @ApiModelProperty("是否显示录入车架号") private boolean showInputBtn; - + private boolean showRePublishBtn; @ApiModelProperty("车型信息") private AppModelInfoVo modelInfo; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java index 4c6d989d30..5f8a88ca89 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java @@ -35,4 +35,23 @@ public class AppOrderPriceInfoVo implements Vo { @ApiModelProperty("xx日期限内") private String payDepositDays; + + + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装价格") + private String szPrice; + @ApiModelProperty("价格折让（元/台）") + private String priceDiscount; + @ApiModelProperty("中介返利（元/台）") + private String zjReturnPrice; + @ApiModelProperty("优惠套餐（元/台）") + private String pkgPrice; + @ApiModelProperty("实际成交价（元/台）") + private String realPrice; + @ApiModelProperty("差额") + private String diffPrice; + + + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java index 2fa1787973..f411043cf8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java @@ -87,4 +87,6 @@ public interface BusDepositFictitiousMapper extends BaseMapper getStringList(String salesOrderSid); + + List getListByDepositSid(@Param("depositSid") String depositSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml index 507c36bbea..2e860fd8e1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml @@ -66,4 +66,10 @@ left join bus_sales_order bo on bo.sid = bd.salesOrderSid where bo.sid = #{salesOrderSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java index d4408cac4b..258ccf873c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java @@ -110,4 +110,8 @@ public class BusDepositFictitiousService extends MybatisBaseService getStringList(String salesOrderSid) { return baseMapper.getStringList(salesOrderSid); } + + public List getListByDepositSid(String depositSid) { + return baseMapper.getListByDepositSid(depositSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index b03026cf0a..070c2a88cd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -54,6 +54,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import java.lang.reflect.InvocationTargetException; import java.util.List; /** @@ -215,6 +216,13 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return rb.success().setData(vo); } + @Override + public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { + + return busSalesOrderService.rePublishSaleOrder(saleOrderSid); + } + + @Override @ApiOperation("App新增/修改销售订单单据") public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6e9b6efffb..2b7a44909e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -75,6 +75,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; @@ -161,6 +162,7 @@ import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -172,6 +174,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.math.BigInteger; import java.net.HttpURLConnection; @@ -1746,6 +1749,9 @@ public class BusSalesOrderService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), ""); for (AppBusSalesOrderVo record : pagging.getRecords()) { + if (pq.getParams().getType().equals("2")) { + record.setShowRePublishBtn(true); + } ResultBean commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid()); if (commonContractVoResultBean.getData() != null) { record.setContractId(commonContractVoResultBean.getData().getContractNo()); @@ -2802,6 +2808,24 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid); + SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); + if (solutionsDetailsVo != null) { + if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) { + if (!"02".equals(solutionsDetailsVo.getTypeKey())) { + //判断实收和单台订金 + if(new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit())<0){ + return rb.setMsg("金融方案中实收金额小于单台订金"); + } + } + } else {//担保贷款 + return rb.setMsg("金融方案中实收金额小于单台订金"); + } + } + } return rb.success(); } @@ -3178,6 +3202,7 @@ public class BusSalesOrderService extends MybatisBaseService0){ + //如果中介返利小于0，乘以-1 + zjAll = zjAll.multiply(new BigDecimal(-1)); + zjReturnPrice = "-￥"+zjAll.toString(); + }else{ + zjReturnPrice = "￥"+zjAll.toString(); + } + priceInfo.setZjReturnPrice(zjReturnPrice); + } + + } + } //计算单台折让 BigDecimal bigDecimalSing = new BigDecimal("0"); @@ -3330,8 +3378,14 @@ public class BusSalesOrderService extends MybatisBaseService stringList = new ArrayList<>(); if (!list.isEmpty()) { - for (BusDepositFictitiousDetailsVo v : list) { - String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，"; + for (int j = 0;j payPathList = Arrays.asList(v.getPayPath().split(",")); @@ -3340,7 +3394,7 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid); + List list = new ArrayList<>(); + if (solutionsDetailsVoResultBean.getData() != null) { + SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); + //挂车 + if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) { + if(priceInfo != null){ + priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount()); + } + } + + } + + if(priceInfo != null){ + if(StringUtils.isNotBlank(topPriice)){ + priceInfo.setSzPrice(topPriice); + } + //价格折让 = 销售合同价（整体成交价）-销售指导价（整体指导价） + //销售合同价-销售指导价 + BigDecimal all = BigDecimal.ZERO; + if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){ + all = new BigDecimal(priceInfo.getSingleFinalPrice()); + } + if(StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())){ + all = all.subtract(new BigDecimal(priceInfo.getSingleGuildPrice())); + } + String priceAll = ""; + if(all.compareTo(BigDecimal.ZERO) <0){ + //如果价格折让小于0，乘以-1 + all = all.multiply(new BigDecimal(-1)); + priceAll = "-￥"+all.toString(); + }else{ + priceAll = "￥"+all.toString(); + } + priceInfo.setPriceDiscount(priceAll); + //优惠套餐 = 优惠套餐总额/台数（保留到个位） + String pkgPrice = ""; + BigDecimal oneAll = BigDecimal.ZERO; + if(StringUtils.isNotBlank(vo.getTotaldiscount())){ + //总优惠/台数 + oneAll = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber())); + if(oneAll.compareTo(BigDecimal.ZERO) >0){ + //如果小于0，乘以-1 + oneAll = oneAll.multiply(new BigDecimal(-1)); + pkgPrice = "-￥"+oneAll.toString(); + }else{ + pkgPrice = "￥"+oneAll.toString(); + } + priceInfo.setPkgPrice(pkgPrice); + } + //实际成交 = 销售指导价-价格折让-中介返利-优惠套餐 + BigDecimal realAll = BigDecimal.ZERO; + if(StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())){ + realAll = realAll.add(new BigDecimal(priceInfo.getSingleGuildPrice())); + } + realAll = realAll.add(all).add(zjAll.multiply(new BigDecimal(-1))).add(oneAll.multiply(new BigDecimal(-1))); + priceInfo.setRealPrice("￥"+realAll.toString()); + //差额 = 实际成交价-销售指导价 + BigDecimal diffAll = BigDecimal.ZERO; + diffAll = realAll.subtract(new BigDecimal(priceInfo.getSingleGuildPrice())); + priceInfo.setDiffPrice(diffAll.toString()); + } + return rb.success().setData(vo); } @@ -4360,6 +4479,8 @@ public class BusSalesOrderService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); if (!voResultBean.getSuccess()) { @@ -5027,7 +5148,6 @@ public class BusSalesOrderService extends MybatisBaseService系列-全款/贷款销售订单 - String orgName = busSalesOrder.getOrgName(); String customerName = busSalesOrder.getCustomerName(); String typeValue = ""; if("1".equals(busSalesOrder.getPayTypeKey())){ @@ -5035,7 +5155,18 @@ public class BusSalesOrderService extends MybatisBaseService系列-"+typeValue; + String xilie = ""; + BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid()); + ResultBean vehicleModelResultBean = baseVehicleModelFeign.selectDetails(busSalesOrderModel.getModelSid()); + if(vehicleModelResultBean.getData() != null){ + xilie = vehicleModelResultBean.getData().getProductLineValue(); + } + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()); + String orgName = ""; + if(organizationResultBean.getData() != null){ + orgName = organizationResultBean.getData().getName(); + } + String orderNames = orgName+"<"+customerName+">"+xilie+"-"+typeValue; variables.put("orderNames",orderNames); return variables; } @@ -5910,13 +6041,230 @@ public class BusSalesOrderService extends MybatisBaseService rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { + ResultBean rb = ResultBean.fireFail(); + String newSalesOrderSid = ""; + boolean saleOrderSave = false; + //根据销售订单sid查询销售订单主表信息并复制 + BusSalesOrder busSalesOrder = this.fetchBySid(saleOrderSid); + if (null != busSalesOrder) { + BusSalesOrder newSalesOrder = new BusSalesOrder(); + newSalesOrderSid = newSalesOrder.getSid(); + Date createTime = newSalesOrder.getCreateTime(); + Date modifyTime = newSalesOrder.getModifyTime(); + BeanUtils.copyProperties(newSalesOrder, busSalesOrder); + newSalesOrder.setSid(newSalesOrderSid); + newSalesOrder.setCreateDate(null); + newSalesOrder.setNodeState(null); + newSalesOrder.setProcDefId(null); + newSalesOrder.setProcDefId(null); + newSalesOrder.setProcDefId(null); + newSalesOrder.setNodeId(null); + newSalesOrder.setProcInstId(null); + newSalesOrder.setTaskId(null); + newSalesOrder.setOneBillMoney(null); + newSalesOrder.setCreateTime(createTime); + newSalesOrder.setModifyTime(modifyTime); + saleOrderSave = this.save(newSalesOrder); + } + //根据销售订单sid 复制销售订单-订金信息 + List busSalesOrderDeposits = busSalesOrderDepositService.getListByOrderSid(saleOrderSid); + if (null != busSalesOrderDeposits) { + for (BusSalesOrderDeposit busSalesOrderDeposit : busSalesOrderDeposits) { + if (null != busSalesOrderDeposit) { + //获取订金信息sid + String OldDepositSid = busSalesOrderDeposit.getSid(); + BusSalesOrderDeposit newSalesOrderDeposit = new BusSalesOrderDeposit(); + String depositSid = newSalesOrderDeposit.getSid(); + Date depositCreateTime = newSalesOrderDeposit.getCreateTime(); + Date depositModifyTime = newSalesOrderDeposit.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderDeposit, busSalesOrderDeposit); + newSalesOrderDeposit.setSid(depositSid); + newSalesOrderDeposit.setCreateTime(depositCreateTime); + newSalesOrderDeposit.setModifyTime(depositModifyTime); + newSalesOrderDeposit.setSalesOrderSid(newSalesOrderSid); + boolean depositSave = busSalesOrderDepositService.save(newSalesOrderDeposit); + //根据订金信息sid查虚拟订单与订金信息关联表 + List fictitious = busDepositFictitiousService.getListByDepositSid(OldDepositSid); + if (null != fictitious) { + for (BusDepositFictitious busDepositFictitious : fictitious) { + if (null != busDepositFictitious) { + BusDepositFictitious newObject = new BusDepositFictitious(); + String sid = newObject.getSid(); + Date createTime = newObject.getCreateTime(); + Date modifyTime = newObject.getModifyTime(); + BeanUtils.copyProperties(newObject, busDepositFictitious); + newObject.setSid(sid); + newObject.setCreateTime(createTime); + newObject.setModifyTime(modifyTime); + newObject.setDepositSid(newSalesOrderDeposit.getSid()); + boolean save = busDepositFictitiousService.save(newObject); + } + } + } + } + } + } + //根据销售订单sid复制销售订单-主车优惠明细 + List busSalesOrderDiscounts = busSalesOrderDiscountService.selectBySaleOrderSid(saleOrderSid); + if (null != busSalesOrderDiscounts) { + for (BusSalesOrderDiscount busSalesOrderDiscount : busSalesOrderDiscounts) { + if (null != busSalesOrderDiscount) { + BusSalesOrderDiscount newSalesOrderDiscount = new BusSalesOrderDiscount(); + String discountSid = newSalesOrderDiscount.getSid(); + Date discountCreateTime = newSalesOrderDiscount.getCreateTime(); + Date discountModifyTime = newSalesOrderDiscount.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderDiscount, busSalesOrderDiscount); + newSalesOrderDiscount.setSid(discountSid); + newSalesOrderDiscount.setCreateTime(discountCreateTime); + newSalesOrderDiscount.setModifyTime(discountModifyTime); + newSalesOrderDiscount.setSalesOrderSid(newSalesOrderSid); + boolean discountSave = busSalesOrderDiscountService.save(newSalesOrderDiscount); + } + } + } + + //销售订单-保险信息 + List busSalesOrderInsurances = busSalesOrderInsuranceService.selectBySaleOrderSid(saleOrderSid); + if (null != busSalesOrderInsurances) { + for (BusSalesOrderInsurance busSalesOrderInsurance : busSalesOrderInsurances) { + if (null != busSalesOrderInsurance) { + BusSalesOrderInsurance newSalesOrderInsurance = new BusSalesOrderInsurance(); + String insuranceSid = newSalesOrderInsurance.getSid(); + Date insuranceCreateTime = newSalesOrderInsurance.getCreateTime(); + Date insuranceModifyTime = newSalesOrderInsurance.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderInsurance, busSalesOrderInsurance); + newSalesOrderInsurance.setSid(insuranceSid); + newSalesOrderInsurance.setCreateTime(insuranceCreateTime); + newSalesOrderInsurance.setModifyTime(insuranceModifyTime); + newSalesOrderInsurance.setSalesOrderSid(newSalesOrderSid); + boolean insurancetSave = busSalesOrderInsuranceService.save(newSalesOrderInsurance); + } + } + } + //销售订单-上装配置 + List busSalesOrderMakeups = busSalesOrderMakeupService.selectListByOrderSid(saleOrderSid); + if (null != busSalesOrderMakeups) { + for (BusSalesOrderMakeup busSalesOrderMakeup : busSalesOrderMakeups) { + if (null != busSalesOrderMakeup) { + BusSalesOrderMakeup newSalesOrderMakeup = new BusSalesOrderMakeup(); + String makeupSid = newSalesOrderMakeup.getSid(); + Date makeupCreateTime = newSalesOrderMakeup.getCreateTime(); + Date makeupModifyTime = newSalesOrderMakeup.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderMakeup, busSalesOrderMakeup); + newSalesOrderMakeup.setSid(makeupSid); + newSalesOrderMakeup.setCreateTime(makeupCreateTime); + newSalesOrderMakeup.setModifyTime(makeupModifyTime); + newSalesOrderMakeup.setSalesOrderSid(newSalesOrderSid); + boolean makeupSave = busSalesOrderMakeupService.save(newSalesOrderMakeup); + } + } + } + //销售订单-主车车型 + List busSalesOrderModels = busSalesOrderModelService.selectListByOrderSid(saleOrderSid); + if (null != busSalesOrderModels) { + for (BusSalesOrderModel busSalesOrderModel : busSalesOrderModels) { + if (null != busSalesOrderModel) { + BusSalesOrderModel newSalesOrderModel = new BusSalesOrderModel(); + String modelSid = newSalesOrderModel.getSid(); + Date modelCreateTime = newSalesOrderModel.getCreateTime(); + Date modelModifyTime = newSalesOrderModel.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderModel, busSalesOrderModel); + newSalesOrderModel.setSid(modelSid); + newSalesOrderModel.setCreateTime(modelCreateTime); + newSalesOrderModel.setModifyTime(modelModifyTime); + newSalesOrderModel.setSalesOrderSid(newSalesOrderSid); + boolean makeupSave = busSalesOrderModelService.save(newSalesOrderModel); + } + } + } + //销售订单-价格信息 + List busSalesOrderPrices = busSalesOrderPriceService.selectListByOrderSid(saleOrderSid); + if (null != busSalesOrderPrices) { + for (BusSalesOrderPrice busSalesOrderPrice : busSalesOrderPrices) { + if (null != busSalesOrderPrice) { + BusSalesOrderPrice newSalesOrderPrice = new BusSalesOrderPrice(); + String priceSid = newSalesOrderPrice.getSid(); + Date createTime = newSalesOrderPrice.getCreateTime(); + Date modifyTime = newSalesOrderPrice.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderPrice, busSalesOrderPrice); + newSalesOrderPrice.setSid(priceSid); + newSalesOrderPrice.setCreateTime(createTime); + newSalesOrderPrice.setModifyTime(modifyTime); + newSalesOrderPrice.setSalesOrderSid(newSalesOrderSid); + boolean priceSave = busSalesOrderPriceService.save(newSalesOrderPrice); + } + } + } + // 销售订单-车辆信息 + List busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSid(saleOrderSid); + if (null != busSalesOrderVehicles) { + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + if (null != busSalesOrderVehicle) { + BusSalesOrderVehicle newSalesOrderVehicle = new BusSalesOrderVehicle(); + String sid = newSalesOrderVehicle.getSid(); + Date createTime = newSalesOrderVehicle.getCreateTime(); + Date modifyTime = newSalesOrderVehicle.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderVehicle, busSalesOrderVehicle); + newSalesOrderVehicle.setSid(sid); + newSalesOrderVehicle.setCreateTime(createTime); + newSalesOrderVehicle.setModifyTime(modifyTime); + newSalesOrderVehicle.setSalesOrderSid(newSalesOrderSid); + boolean vehicleSave = busSalesOrderVehicleService.save(newSalesOrderVehicle); + } + } + } + // 销售订单-订单提交时补充的返利信息 + List busSalesOrderSubmits = busSalesOrderSubmitService.selectListByOrderSid(saleOrderSid); + if (null != busSalesOrderSubmits) { + for (BusSalesOrderSubmit busSalesOrderSubmit : busSalesOrderSubmits) { + if (null != busSalesOrderSubmit) { + BusSalesOrderSubmit newSalesOrderSubmit = new BusSalesOrderSubmit(); + String sid = newSalesOrderSubmit.getSid(); + Date createTime = newSalesOrderSubmit.getCreateTime(); + Date modifyTime = newSalesOrderSubmit.getModifyTime(); + BeanUtils.copyProperties(newSalesOrderSubmit, busSalesOrderSubmit); + newSalesOrderSubmit.setSid(sid); + newSalesOrderSubmit.setCreateTime(createTime); + newSalesOrderSubmit.setModifyTime(modifyTime); + newSalesOrderSubmit.setSalesOrderSid(newSalesOrderSid); + boolean vehicleSave = busSalesOrderSubmitService.save(newSalesOrderSubmit); + } + } + } + // 销售订单-采购订单信息 + List busSalesVehicleOrders = busSalesVehicleOrderService.selectByOrderSid(saleOrderSid); + if (null != busSalesVehicleOrders) { + for (BusSalesVehicleOrder busSalesVehicleOrder : busSalesVehicleOrders) { + if (null != busSalesVehicleOrder) { + BusSalesVehicleOrder newObject = new BusSalesVehicleOrder(); + String sid = newObject.getSid(); + Date createTime = newObject.getCreateTime(); + Date modifyTime = newObject.getModifyTime(); + BeanUtils.copyProperties(newObject, busSalesVehicleOrder); + newObject.setSid(sid); + newObject.setCreateTime(createTime); + newObject.setModifyTime(modifyTime); + newObject.setSalesOrderSid(newSalesOrderSid); + boolean save = busSalesVehicleOrderService.save(newObject); + } + } + } + if (saleOrderSave) { + return rb.success().setMsg("重新发起成功，请在待办理列表进行修改提交。"); + } else { + return rb.success().setMsg("重新发起失败"); + } + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java index 7eef270ed0..a05b97ffe0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java @@ -99,4 +99,6 @@ public interface BusSalesOrderDepositMapper extends BaseMapper selectByTotalValue(String sid); int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid,@Param("bigDecimalSum")BigDecimal bigDecimalSum); + + List getListByOrderSid(@Param("saleOrderSid")String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml index 18d4e1f34d..4a7e4e32a1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml @@ -83,6 +83,13 @@ where salesOrderSid = #{sid} + + update bus_sales_order_deposit set depositAll = #{depositSum}, diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index b906936677..b28033fcc1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -431,4 +431,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService getListByOrderSid(String saleOrderSid) { + return baseMapper.getListByOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java index 90fe093377..4b792f3974 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java @@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -101,7 +102,7 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper discountList(String contractNo); List selectListByContractNo(String contractNo); + + List selectBySaleOrderSid(@Param("saleOrderSid") String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml index 89da3e11c5..d9c6193247 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml @@ -66,4 +66,8 @@ left join bus_sales_order bo on bo.sid = bd.salesOrderSid where bo.contractNo = #{contractNo} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java index 6fb5287aac..1730c9ad2c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java @@ -212,4 +212,8 @@ public class BusSalesOrderDiscountService extends MybatisBaseService selectListByContractNo(String contractNo) { return baseMapper.selectListByContractNo(contractNo); } + + public List selectBySaleOrderSid(String saleOrderSid) { + return baseMapper.selectBySaleOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java index bf3bc3e655..36bb43e147 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java @@ -32,6 +32,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderIn import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderInsuranceMapper.java
@@ -78,4 +80,7 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml index d0a1d42fbd..d48b962774 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml @@ -55,4 +55,10 @@ from bus_sales_order_insurance where salesOrderSid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java index b13dd0284c..be6aca23e1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java @@ -39,6 +39,8 @@ import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderInsuranceService.java
@@ -157,4 +159,8 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService selectBySaleOrderSid(String saleOrderSid) { + return baseMapper.selectListByOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java index 59d6f87554..f5c529afb8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java @@ -31,6 +31,9 @@ import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * Project: anrui-buscenter(业务管理)
@@ -83,4 +86,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index c5e3a2287b..6aab2d55bf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -100,4 +100,8 @@ + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index aa6a9c17dd..bc14c53ad9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -259,4 +259,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService selectListByOrderSid(String saleOrderSid) { + return baseMapper.selectListByOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java index 5fb2fed2ce..1e3dee308a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; +import java.util.List; /** * Project: anrui-buscenter(业务管理)
@@ -91,4 +92,6 @@ public interface BusSalesOrderModelMapper extends BaseMapper AppOrderModelInfoVo selectModel(String sid); BusSalesOrderModel selectByOrderSid(String sid); + + List selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml index 0bc93124f3..c5e3385498 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml @@ -81,4 +81,10 @@ from bus_sales_order_model where salesOrderSid = #{sid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 90d890d8c3..f8fc81332a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -780,4 +780,8 @@ public class BusSalesOrderModelService extends MybatisBaseService selectListByOrderSid(String saleOrderSid) { + return baseMapper.selectListByOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java index 324b47a141..ca9fd13c83 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java @@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; +import java.util.List; /** * Project: anrui-buscenter(业务管理)
@@ -93,4 +94,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper AppOrderPriceInfoVo selectPrice(String sid); BusSalesOrderPrice selectByContractNoOne(String contractNo); + + List selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml index 31f4c26275..0057b397cc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml @@ -67,4 +67,10 @@ left join bus_sales_order bo on bo.sid = bsp.salesOrderSid where bo.contractNo = #{contractNo} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java index 8bf65bc113..ef89822997 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java @@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.List; /** * Project: anrui-buscenter(业务管理)
@@ -205,4 +206,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService selectListByOrderSid(String saleOrderSid) { + return baseMapper.selectListByOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java index ff97c2452c..871f34323c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java @@ -3,6 +3,9 @@ package com.yxt.anrui.buscenter.biz.bussalesordersubmit; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Author dimengzhe @@ -13,4 +16,6 @@ import org.apache.ibatis.annotations.Mapper; public interface BusSalesOrderSubmitMapper extends BaseMapper { BusSalesOrderSubmit seletByOrderSid(String businessSid); + + List selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml index 5e9320b8ca..feaa9ace8d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml @@ -6,4 +6,10 @@ from bus_sales_order_submit where salesOrderSid = #{businessSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java index 2704666a81..2b000a08ca 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java @@ -8,6 +8,7 @@ import com.yxt.common.base.utils.StringUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.List; /** * @Author dimengzhe @@ -59,4 +60,8 @@ public class BusSalesOrderSubmitService extends MybatisBaseService selectListByOrderSid(String saleOrderSid) { + return baseMapper.selectListByOrderSid(saleOrderSid); + } } 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 02c0447523..b51a8ce2d3 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 @@ -230,4 +230,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectByNoAndVinSids(String contractNo) { return baseMapper.selectByNoAndVinSids(contractNo); } + + public List selectListByOrderSid(String saleOrderSid) { + return baseMapper.selectByOrderSid(saleOrderSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java index ca7e2b0f29..f548ec2f6d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java @@ -88,4 +88,5 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper selectLists(String sid); List selectByOrderSid(String salesOrderSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java index 80fe4c31c9..af7f5be60f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java @@ -201,4 +201,5 @@ public class BusSalesVehicleOrderService extends MybatisBaseService selectByOrderSid(String salesOrderSid) { return baseMapper.selectByOrderSid(salesOrderSid); } + } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index b3881c2a0c..625a6bf017 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -75,6 +75,10 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.sql.Timestamp; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; @@ -506,17 +510,23 @@ public class FlowTaskService extends MybatisBaseService taskList = taskQuery.listPage(p, pageSize); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java index 75f58cc4c6..bb90bf54be 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java @@ -59,4 +59,9 @@ public class FlowTaskFinishVo implements Vo { @ApiModelProperty("流程名称") private String flowableName; + @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("发起人sid") + @JsonProperty("createUserSid") + private String startUserSid; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 72a9429b8c..5b1e44bb46 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -51,6 +51,7 @@ import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.ConstantUtils; +import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -58,6 +59,11 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -428,17 +434,24 @@ public class FlowableService extends MybatisBaseService flowMap = f.getProcessVariables(); + f.setBusinessSid(flowMap.get("businessSid").toString()); Map appMap = ConstantUtils.getMap(flowMap, "app"); String json = JSONObject.toJSONString(appMap); AppVo appVo = new AppVo(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index df4b556ce6..db903d5d24 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -381,7 +381,7 @@ diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index a2b93c5fd5..869f568f86 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -760,7 +760,7 @@ public class SysStaffinfoService extends MybatisBaseService pagging = baseMapper.getUserList(page, qw, orgSid); diff --git a/anrui-system-ui/src/api/flow/read.js b/anrui-system-ui/src/api/flow/read.js index ef24c0b6d8..23fc15f596 100644 --- a/anrui-system-ui/src/api/flow/read.js +++ b/anrui-system-ui/src/api/flow/read.js @@ -28,4 +28,10 @@ export function getToBeReadNum(data) { }) } - +// 待办已办待阅已阅获取人员 +export function sysstaffinfo() { + return request({ + url: '/portal/v1/sysstaffinfo/v1/sysstaffinfo/selectStaffLists', + method: 'get' + }) +} diff --git a/anrui-system-ui/src/api/flow/todo.js b/anrui-system-ui/src/api/flow/todo.js index 61bb9b2799..c517e15fd8 100644 --- a/anrui-system-ui/src/api/flow/todo.js +++ b/anrui-system-ui/src/api/flow/todo.js @@ -40,6 +40,14 @@ export function getList(params) { }) } +// 待办已办待阅已阅获取人员 +export function sysstaffinfo() { + return request({ + url: '/portal/v1/sysstaffinfo/selectStaffLists', + method: 'get' + }) +} + // 代办任务同意办理 export function businessAgree(params) { return request({ diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue index d1c12cae34..872baca62a 100644 --- a/anrui-system-ui/src/views/flow/doneList.vue +++ b/anrui-system-ui/src/views/flow/doneList.vue @@ -13,7 +13,9 @@ - + + + @@ -143,11 +145,10 @@ import flowRecords from '@/components/flow/flowRecord' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import { getStorage } from '@/utils/auth' -import { revokeTask, getList, selectUrl, readXml, getFlowViewer, breakProcess, commentSave } from '@/api/flow/todo' -import { flowRecord, revokeProcess } from '@/api/workflow/finished' +import { getList, selectUrl, readXml, getFlowViewer, breakProcess, commentSave, sysstaffinfo } from '@/api/flow/todo' +import { flowRecord } from '@/api/workflow/finished' import { loginDetails } from '@/api/user' import upload from '@/components/uploadFile/upload' -// import flow from "@/views/flow/flow"; export default { name: '', @@ -160,6 +161,7 @@ export default { data() { return { taskList: [], + user_list: [], xmlData: '', dialogHeight: '80%', isDialogVisible: false, // 撤回弹窗 @@ -278,6 +280,11 @@ export default { } }, init() { + sysstaffinfo().then((resp) => { + if (resp.success) { + this.user_list = resp.data + } + }) var token = getStorage() loginDetails(token).then((response) => { if (response.code === '200') { diff --git a/anrui-system-ui/src/views/flow/havereadList.vue b/anrui-system-ui/src/views/flow/havereadList.vue index 1e3fc817bf..497b7fa2da 100644 --- a/anrui-system-ui/src/views/flow/havereadList.vue +++ b/anrui-system-ui/src/views/flow/havereadList.vue @@ -12,7 +12,9 @@ - + + + @@ -114,7 +116,7 @@ import flowRecords from '@/components/flow/flowRecord' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import { getStorage } from '@/utils/auth' -import { selectUrl, readXml, getFlowViewer, commentSave } from '@/api/flow/todo' +import { selectUrl, readXml, getFlowViewer, commentSave, sysstaffinfo } from '@/api/flow/todo' import { pagerList } from '@/api/flow/read' import { flowRecord } from '@/api/workflow/finished' import upload from '@/components/uploadFile/upload' @@ -130,6 +132,7 @@ export default { data() { return { taskList: [], + user_list: [], xmlData: '', dialogHeight: '80%', centerDialogVisible: false, // 弹框 @@ -170,7 +173,7 @@ export default { userSid: '', state: '1', // 0是待阅,1是已阅 orgPath: '', - startUserName: '' + startUserSid: '' } } } @@ -201,6 +204,11 @@ export default { iframe.height = this.dialogHeight // iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight; }, init() { + sysstaffinfo().then((resp) => { + if (resp.success) { + this.user_list = resp.data + } + }) this.getList() }, // 序号 diff --git a/anrui-system-ui/src/views/flow/tobereadList.vue b/anrui-system-ui/src/views/flow/tobereadList.vue index 10ae7d9cf1..2c812329b4 100644 --- a/anrui-system-ui/src/views/flow/tobereadList.vue +++ b/anrui-system-ui/src/views/flow/tobereadList.vue @@ -11,8 +11,10 @@ - - + + + + @@ -103,12 +105,11 @@ import flowRecords from '@/components/flow/flowRecord' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import { getStorage } from '@/utils/auth' -import { selectUrl, readXml, getFlowViewer, commentSave } from '@/api/flow/todo' +import { selectUrl, readXml, getFlowViewer, commentSave, sysstaffinfo } from '@/api/flow/todo' import { pagerList, changeRead } from '@/api/flow/read' import { flowRecord } from '@/api/workflow/finished' import upload from '@/components/uploadFile/upload' - export default { name: '', components: { @@ -120,6 +121,7 @@ export default { data() { return { taskList: [], + user_list: [], xmlData: '', dialogHeight: '80%', centerDialogVisible: false, // 弹框 @@ -160,7 +162,7 @@ export default { userSid: '', state: '0', // 0是待阅,1是已阅 orgPath: '', - startUserName: '' + startUserSid: '' } } } @@ -191,6 +193,11 @@ export default { iframe.height = this.dialogHeight // iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight; }, init() { + sysstaffinfo().then((resp) => { + if (resp.success) { + this.user_list = resp.data + } + }) this.getList() }, // 序号 diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue index ded89f8ad3..f3787c7354 100644 --- a/anrui-system-ui/src/views/flow/todoList.vue +++ b/anrui-system-ui/src/views/flow/todoList.vue @@ -13,7 +13,9 @@ - + + + @@ -120,7 +122,7 @@ import flowRecords from '@/components/flow/flowRecord' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' -import { getFlowViewer, readXml, breakTask, businessAgree, pagerList, rejectTask, selectUrl, commentSave } from '@/api/flow/todo' +import { getFlowViewer, readXml, breakTask, businessAgree, pagerList, rejectTask, selectUrl, commentSave, sysstaffinfo } from '@/api/flow/todo' import { getStorage } from '@/utils/auth' import { flowRecord } from '@/api/workflow/finished' import { loginDetails } from '@/api/user' @@ -137,6 +139,7 @@ export default { data() { return { taskList: [], + user_list: [], xmlData: '', dialogHeight: '80%', centerDialogVisible: false, // 弹框 @@ -199,7 +202,7 @@ export default { startDate: '', endDate: '', userSid: '', - startUserName: '' + startUserSid: '' } } } @@ -265,6 +268,11 @@ export default { } }, init() { + sysstaffinfo().then((resp) => { + if (resp.success) { + this.user_list = resp.data + } + }) var token = getStorage() loginDetails(token).then((response) => { if (response.code === '200') { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 1157115700..a64b825cfc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -56,6 +56,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.lang.reflect.InvocationTargetException; import java.util.List; /** @@ -106,6 +107,11 @@ public interface AppBusSalesOrderFeign { @ResponseBody public ResultBean saveBillInfo(@Valid @RequestBody BusOrerSalesAllDto dto); + @ApiOperation("重新发起") + @GetMapping("rePublishSaleOrder/{saleOrderSid}") + @ResponseBody + public ResultBean rePublishSaleOrder(@PathVariable String saleOrderSid) throws InvocationTargetException, IllegalAccessException; + /*-----------------------------------------车型信息------------------------------------------*/ @ApiOperation("初始化销售订单车型信息") @@ -218,7 +224,7 @@ public interface AppBusSalesOrderFeign { @ApiOperation("初始化销售订单补充说明") @GetMapping("/save/getOrderRemarksInfo") @ResponseBody - ResultBean getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid); + ResultBean getOrderRemarksInfo(@RequestParam("saleOrderSid") String saleOrderSid); /*-----------------------------------------提交------------------------------------------*/ @@ -307,6 +313,4 @@ public interface AppBusSalesOrderFeign { ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto); - - } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index 2c229dca7d..6ba5b6ba05 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -94,6 +94,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { return null; } + @Override + public ResultBean rePublishSaleOrder(String saleOrderSid) { + return null; + } + @Override public ResultBean getInitModelInfo(String saleOrderSid, String customerSid, String userSid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java index df2714df2f..553ebea718 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java @@ -31,7 +31,21 @@ public class OrderPriceInfoVo implements Vo { @ApiModelProperty("单台整体成交价") @JsonProperty("overallPrice") private String singleFinalPrice; - - //单车折让 + @ApiModelProperty("单车折让") private String singleCarDiscountPrice; + + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装价格") + private String szPrice; + @ApiModelProperty("价格折让（元/台）") + private String priceDiscount; + @ApiModelProperty("中介返利（元/台）") + private String zjReturnPrice; + @ApiModelProperty("优惠套餐（元/台）") + private String pkgPrice; + @ApiModelProperty("实际成交价（元/台）") + private String realPrice; + @ApiModelProperty("差额") + private String diffPrice; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 964f8640e8..e59eb7d505 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -54,8 +54,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import java.lang.reflect.InvocationTargetException; import java.util.List; /** @@ -112,6 +114,13 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.saveBillInfo(dto); } + + @Override + @ApiOperation("重新提交") + public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { + return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid); + } + @Override @ApiOperation("初始化销售订单 车型信息") public ResultBean getInitModelInfo(String saleOrderSid, String customerSid, String userSid) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index ece478da9c..1231f4346d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -105,6 +105,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; @@ -672,9 +673,9 @@ public class AppBusSalesOrderService { List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); flowOrderVo.setList(list); } - if("3".equals(busSalesOrder.getType())){ + if ("3".equals(busSalesOrder.getType())) { flowOrderVo.setShow(true); - }else{ + } else { flowOrderVo.setShow(false); } } @@ -691,4 +692,14 @@ public class AppBusSalesOrderService { } return rb.success().setData(resultBean.getData()); } + + + public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = busSalesOrderFeign.rePublishSaleOrder(saleOrderSid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setMsg(resultBean.getMsg()); + } } \ No newline at end of file