Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
b92dc5d1a3
  1. 15
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java
  2. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportReturn.java
  4. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceImportVo.java
  5. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
  6. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  7. 50
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java
  8. 139
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  9. 26
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.java
  10. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml
  11. 190
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java
  12. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  13. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
  14. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
  15. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
  16. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  17. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  18. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  19. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java
  20. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
  21. 19
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
  22. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java
  23. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
  24. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
  25. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  26. 362
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  27. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java
  28. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
  29. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
  30. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java
  31. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
  32. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java
  33. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
  34. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
  35. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
  36. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
  37. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  38. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
  39. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java
  40. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
  41. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  42. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java
  43. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
  44. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
  45. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java
  46. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml
  47. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java
  48. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  49. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
  50. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
  51. 31
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  52. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
  53. 29
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
  54. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
  55. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
  56. 8
      anrui-system-ui/src/api/flow/read.js
  57. 8
      anrui-system-ui/src/api/flow/todo.js
  58. 15
      anrui-system-ui/src/views/flow/doneList.vue
  59. 14
      anrui-system-ui/src/views/flow/havereadList.vue
  60. 17
      anrui-system-ui/src/views/flow/tobereadList.vue
  61. 14
      anrui-system-ui/src/views/flow/todoList.vue
  62. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  63. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
  64. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java
  65. 9
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
  66. 15
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

15
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<BaseModelModpriceImportReturn> getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException;
public ResultBean<BaseModelModpriceImportReturn> 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);
}

10
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<BaseModelModpriceImportReturn> getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException {
public ResultBean<BaseModelModpriceImportReturn> 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) {
}
}

3
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<String> checkResultList; // 校验结果
private List<BaseModelModpriceImportVo> importVoList;
}

12
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; // 现贷款销售指导价
}

8
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<BaseModelConfig> {
List<String> checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid);
List<AppModelConfigListVo> getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid") String orgSid,@Param("label") String label);
List<AppModelConfigListVo> getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> 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);
}

4
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<BaseModelConfigMa
}
return configName;
}
public BaseModelConfig getConfigByConfigCode(String configCode) {
return baseMapper.getConfigByConfigCode(configCode);
}
}

50
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java

@ -28,9 +28,6 @@ package com.yxt.anrui.base.biz.basemodelmodprice;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basemodelmodprice.*;
import com.yxt.anrui.base.api.basemodelmodprice.flow.*;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleExportVo;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.base.utils.ExportExcelUtils;
@ -39,26 +36,19 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -156,21 +146,17 @@ public class BaseModelModpriceRest implements BaseModelModpriceFeign {
}
@Override
public ResultBean<BaseModelModpriceImportReturn> getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException {
public ResultBean<BaseModelModpriceImportReturn> 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<BaseModelModpriceExportVo> 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();
}
}
}

139
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<BaseModelModpri
private MessageFeign messageFeign;
@Autowired
private AppSubsetVersionFeign appSubsetVersionFeign;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private BaseVehmodelConfigService baseVehmodelConfigService;
@Autowired
private BaseModelConfigService baseModelConfigService;
public PagerVo<BaseModelModpriceVo> listPageVo(PagerQuery<BaseModelModpriceQuery> pq) {
BaseModelModpriceQuery query = pq.getParams();
@ -533,11 +550,19 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
}
public ResultBean<BaseModelModpriceImportReturn> getExcelInfo(String fileName, MultipartFile file) throws IOException, ParseException {
public ResultBean<BaseModelModpriceImportReturn> 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<BaseModelModpriceImportVo> resultList = new ArrayList<>();
boolean isExcel2003 = true;
@ -552,7 +577,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
wb = new XSSFWorkbook(is);
}
Sheet sheet = wb.getSheetAt(0);
BaseModelModpriceImportReturn importReturn = getSheetVal(sheet, resultCell);
BaseModelModpriceImportReturn importReturn = getSheetVal(sheet, resultCell, sid);
resultList = importReturn.getImportVoList();
System.out.println("结果是--->" + resultList);
importReturn.setImportVoList(resultList);
@ -563,18 +588,33 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
importReturn.setCheckResult(currentTime + " " + "上报成功" + String.valueOf(size) + "条记录。");
return rb.success().setData(importReturn);
} else {
return rb.fail().setData(importReturn);
String checkResult = importReturn.getCheckResult();
String[] split = checkResult.split(";");
List<String> 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<BaseModelModpriceImportVo> importVoList = new ArrayList<>();
int[] resultIndex = new int[resultCell.length];
BaseModelModpriceImportVo importVo;
StringBuilder sb = new StringBuilder();
ArrayList<String> 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<BaseModelModpri
String trim = new String();
try {
trim = getCellVal(row.getCell(i)).toString().trim();
if ("".equals(trim) || null == trim) {
NullPointerException nullPointerException = new NullPointerException();
}
String temp = getCellVal(row.getCell(i)).toString().trim();
for (int j = 0; j < resultCell.length; j++) {
if (i == resultCell[j]) {
@ -640,8 +683,67 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
}
}
}
String modelSid = "";
String configSid = "";
String vehType = "";
String configCode = "";
if (StringUtils.isNotBlank(importVo.getVehicleTypeCode())) {
//根据创建组织sid查询车型信息
List<BaseVehicleModel> modelList = baseVehicleModelService.selectBycreateOrg(sid);
HashMap<String, Object> 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<String> 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<String> hashSet = new HashSet<>();
@ -700,6 +802,17 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
sbd.delete(sbd.length() - 1, sbd.length());
sb.append(sbd.toString() + "序号有重复").append(";");
}
if (StringUtils.isNotBlank(sb1.toString())) {
sb.append(sb1.toString());
}
if (StringUtils.isNotBlank(sb2.toString())) {
sb.append(sb2.toString());
}
if (StringUtils.isNotBlank(sb3.toString())) {
sb.append(sb3.toString());
}
importReturn.setImportVoList(importVoList);
if (StringUtils.isNotBlank(sb.toString())) {
sb.delete(sb.length() - 1, sb.length());
@ -732,4 +845,6 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
}
return obj;
}
}

26
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.java

@ -54,19 +54,21 @@ import java.util.List;
@Mapper
public interface BaseModelModpriceModelMapper extends BaseMapper<BaseModelModpriceModel> {
//@Update("update base_model_modprice_model set name=#{msg} where id=#{id}")
//IPage<BaseModelModpriceModelVo> voPage(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelModpriceModel> qw);
IPage<BaseModelModpriceModelVo> selectPageVo(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
List<BaseModelModpriceModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
@Select("select * from base_model_modprice_model")
List<BaseModelModpriceModelVo> selectListVo();
//@Update("update base_model_modprice_model set name=#{msg} where id=#{id}")
//IPage<BaseModelModpriceModelVo> voPage(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelModpriceModel> qw);
@Select("select * from base_model_modprice_model where mainSid = #{sid}")
IPage<BaseModelModpriceModelVo> selectPageVo(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
List<BaseModelModpriceModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
@Select("select * from base_model_modprice_model")
List<BaseModelModpriceModelVo> selectListVo();
@Select("select * from base_model_modprice_model where mainSid = #{sid}")
List<BaseModelModpriceModelVo> 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);
}

29
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml

@ -1,13 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
SELECT * FROM base_model_modprice_model <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
SELECT * FROM base_model_modprice_model <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
SELECT * FROM base_model_modprice_model
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
SELECT * FROM base_model_modprice_model
<where>${ew.sqlSegment}</where>
</select>
<select id="getOneByModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel">
SELECT *
FROM base_model_modprice_model
WHERE modelSid = #{modelSid}
AND configSid = #{configSid}
AND isDelete = 0
ORDER BY createTime DESC LIMIT 1
</select>
</mapper>

190
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<BaseModelModpriceModelMapper, BaseModelModpriceModel> {
public PagerVo<BaseModelModpriceModel> listPage(PagerQuery<BaseModelModpriceModelQuery> pq) {
BaseModelModpriceModelQuery query = pq.getParams();
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
IPage<BaseModelModpriceModel> pagging = baseMapper.selectPage(page, qw);
PagerVo<BaseModelModpriceModel> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BaseModelModpriceModel> listAll(BaseModelModpriceModelQuery query) {
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<BaseModelModpriceModel> createQueryWrapper(BaseModelModpriceModelQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseModelModpriceModel> 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<BaseModelModpriceModelVo> listPageVo(PagerQuery<BaseModelModpriceModelQuery> pq) {
BaseModelModpriceModelQuery query = pq.getParams();
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
IPage<BaseModelModpriceModelVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseModelModpriceModelVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BaseModelModpriceModelVo> listAllVo(BaseModelModpriceModelQuery query) {
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<BaseModelModpriceModelVo> 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<BaseModelModpriceModel> listPage(PagerQuery<BaseModelModpriceModelQuery> pq) {
BaseModelModpriceModelQuery query = pq.getParams();
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
IPage<BaseModelModpriceModel> pagging = baseMapper.selectPage(page, qw);
PagerVo<BaseModelModpriceModel> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BaseModelModpriceModel> listAll(BaseModelModpriceModelQuery query) {
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<BaseModelModpriceModel> createQueryWrapper(BaseModelModpriceModelQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseModelModpriceModel> 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<BaseModelModpriceModelVo> listPageVo(PagerQuery<BaseModelModpriceModelQuery> pq) {
BaseModelModpriceModelQuery query = pq.getParams();
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
IPage<BaseModelModpriceModelVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseModelModpriceModelVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<BaseModelModpriceModelVo> listAllVo(BaseModelModpriceModelQuery query) {
QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw);
}
public List<BaseModelModpriceModelVo> 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<BaseModelModpriceModelVo> 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);
}
}

11
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<BaseVehicleMapper, Ba
QueryWrapper<BaseVehicleExportVo> qw = new QueryWrapper<>();
List<String> 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<BaseVehicleMapper, Ba
private QueryWrapper<BaseVehicleListVo> exiCarBuildQueryWrapper(ExiCarQuery params) {
QueryWrapper<BaseVehicleListVo> 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);

10
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<BaseVehicleModel> {
* @param qw
* @return
*/
IPage<BaseVehicleModelVo> pagerList(IPage<BaseVehicleModelQuery> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleModelVo> qw,@Param("createOrgSid") String createOrgSid);
IPage<BaseVehicleModelVo> pagerList(IPage<BaseVehicleModelQuery> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleModelVo> qw, @Param("createOrgSid") String createOrgSid);
/**
* 详情以及修改回显接口
@ -160,5 +160,11 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
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<BaseVehicleModel> selectBycreateOrg(String sid);
}

11
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<BaseVehicleModel
public String getCode(String modelSid, String createOrgSid) {
return baseMapper.getCode(modelSid, createOrgSid);
}
/**
* 根据车型编码查询车型信息
*/
public BaseVehicleModel selectByvehicleTypeCode(String vehicleTypeCode) {
return baseMapper.selectByvehicleTypeCode(vehicleTypeCode);
}
public List<BaseVehicleModel> selectBycreateOrg(String sid) {
return baseMapper.selectBycreateOrg(sid);
}
}

3
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<BaseVehmodelConfig>
void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice, @Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice, @Param("sid") String sid);
IPage<BaseVehmodelConfigVehicleVos> selVehModelByUseOrgSidAll(IPage<BaseVehmodelConfig> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVehicleVos> qw);
@Select("SELECT configurationItemsSid FROM base_vehmodel_config WHERE modelSid = #{modelSid}")
List<String> selectModelConfigSidByModelSid(@Param("modelSid") String modelSid);
}

4
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<BaseVehmodelCo
}
return rb.success().setMsg("关联成功");
}
public List<String> selectModelConfigSidByModelSid(String modelSid) {
return baseMapper.selectModelConfigSidByModelSid(modelSid);
}
}

20
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<AppBusSalesOrderBillInfoVo> getBillInfo(@SpringQueryMap AppOrderInitQuery appOrderInitQuery);
@ApiOperation("重新发起")
@GetMapping("/rePublishSaleOrder/{saleOrderSid}")
@ResponseBody
public ResultBean<String> rePublishSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid) throws InvocationTargetException, IllegalAccessException;
/**
* 新增保存销售订单信息
*
@ -196,7 +202,7 @@ public interface BusSalesOrderFeign {
@ApiOperation("初始化销售订单补充说明")
@GetMapping("/getOrderRemarksInfo")
@ResponseBody
ResultBean<OrderRemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid);
ResultBean<OrderRemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid") String saleOrderSid);
@ApiOperation("更新销售订单合同编号")
@PutMapping("/updateContractNoBySid")
@ -252,17 +258,17 @@ public interface BusSalesOrderFeign {
@ApiOperation("查询该合同下的该辆车架号的车辆sid")
@GetMapping("/getVinSidByConSid")
@ResponseBody
ResultBean<String> getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo);
ResultBean<String> getVinSidByConSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinNo") String vinNo);
@ApiOperation("查询该合同下的单车成交价")
@GetMapping("/selectByContractNo")
@ResponseBody
ResultBean<BusSalesOrderPrice> selectByContractNo(@RequestParam("contractNo")String contractNo);
ResultBean<BusSalesOrderPrice> selectByContractNo(@RequestParam("contractNo") String contractNo);
@ApiOperation("查询该合同下的销售订单")
@GetMapping("/selectOrderByContractNo")
@ResponseBody
ResultBean<BusSalesOrder> selectOrderByContractNo(@RequestParam("contractNo")String contractNo);
ResultBean<BusSalesOrder> selectOrderByContractNo(@RequestParam("contractNo") String contractNo);
@ApiOperation("销售订单的虚拟订金删除")
@DeleteMapping("/deleteVirtualDepositList")
@ -287,15 +293,15 @@ public interface BusSalesOrderFeign {
@ApiOperation(value = "查询客户的临时编码")
@GetMapping("/selectTemporaryNo")
@ResponseBody
ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid, @RequestParam("contractNo")String contractNo);
ResultBean<String> selectTemporaryNo(@RequestParam("vehSid") String vehSid, @RequestParam("contractNo") String contractNo);
@ApiOperation(value = "出库初始化,根据车辆sid查询销售订单是否存在,若存在返回相关数据")
@GetMapping("/selectOrderOne")
@ResponseBody
ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(@RequestParam("vinSid")String vinSid);
ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(@RequestParam("vinSid") String vinSid);
@ApiOperation("生成销售订单PDF")
@PostMapping("/createPdf")
@ResponseBody
public ResultBean<String> createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName);
public ResultBean<String> createPdf(@RequestParam("sid") String sid, @RequestParam("userName") String userName);
}

6
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<String> rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
return null;
}
@Override
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
return null;

2
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;
}

2
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;

19
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;
}

2
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<BusDepositFictiti
String selectDeposit(String depositBillNo);
List<String> getStringList(String salesOrderSid);
List<BusDepositFictitious> getListByDepositSid(@Param("depositSid") String depositSid);
}

6
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}
</select>
<select id="getListByDepositSid"
resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious">
select *
from bus_deposit_fictitious
where depositSid = #{depositSid}
</select>
</mapper>

4
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<BusDepositFi
public List<String> getStringList(String salesOrderSid) {
return baseMapper.getStringList(salesOrderSid);
}
public List<BusDepositFictitious> getListByDepositSid(String depositSid) {
return baseMapper.getListByDepositSid(depositSid);
}
}

8
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<String> rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
return busSalesOrderService.rePublishSaleOrder(saleOrderSid);
}
@Override
@ApiOperation("App新增/修改销售订单单据")
public ResultBean<String> saveBillInfo(AppBusSalesOrderAllDto dto) {

362
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<BusSalesOrderMapper
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
if (pq.getParams().getType().equals("2")) {
record.setShowRePublishBtn(true);
}
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
if (commonContractVoResultBean.getData() != null) {
record.setContractId(commonContractVoResultBean.getData().getContractNo());
@ -2802,6 +2808,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.setMsg("订金信息存在错误,请检查");
}
}
if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> 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 MybatisBaseService<BusSalesOrderMapper
vo.setPriceInfo(priceInfo);
}
/***************************上装信息***************************************/
String topPriice = "";
if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(busSalesOrder.getIsTop())) {
AppOrderTopInfoVo topInfo = busSalesOrderMakeupService.selectTop(sid);
if (topInfo != null) {
@ -3195,6 +3220,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注:" + topInfo.getRemarks());
}
vo.setTopInfo(topInfo);
topPriice = "¥"+topInfo.getTopPrice();
}
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
String topMessage = "";
@ -3256,17 +3282,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setTotaldiscount(bigDecimalAll.toString());
}
/*************************返利信息*******************************************/
BigDecimal zjAll = BigDecimal.ZERO;
BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
if (busSalesOrderSubmit != null) {
//内部推荐人
if (StringUtils.isNotBlank(busSalesOrderSubmit.getName())) {
vo.setRecommender(busSalesOrderSubmit.getName());
}
//中介返利(元/台)
String zjReturnPrice = "";
boolean isShow = false;
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) {
SubmitVo submitVo = new SubmitVo();
submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorName());
submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobile());
if (busSalesOrderSubmit.getDistributorPrice() != null) {
isShow = true;
zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPrice());
submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPrice().toString());
if (priceInfo != null) {
submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(priceInfo.getNumber())).toString());
@ -3280,6 +3312,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorNameTwo());
submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobileTwo());
if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
isShow = true;
zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPriceTwo());
submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPriceTwo().toString());
if (priceInfo != null) {
submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(priceInfo.getNumber())).toString());
@ -3287,6 +3321,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
vo.setIntermediary2(submitVo);
}
if (priceInfo != null) {
if(isShow){
if(zjAll.compareTo(BigDecimal.ZERO)>0){
//如果中介返利小于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<BusSalesOrderMapper
list.removeAll(Collections.singleton(null));
List<String> stringList = new ArrayList<>();
if (!list.isEmpty()) {
for (BusDepositFictitiousDetailsVo v : list) {
String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元,";
for (int j = 0;j<list.size();j++) {
BusDepositFictitiousDetailsVo v = list.get(j);
String b = "";
if(j == list.size() - 1){
b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元。";
}else{
b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元,";
}
a = a + b;
if (StringUtils.isNotBlank(v.getPayPath())) {
List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
@ -3340,7 +3394,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
}
a = a + "原订金额度使用完后,其收据自动作废。";
// a = a + "原订金额度使用完后,其收据自动作废。";
depositInfo.setDepositRemarks(a);
depositInfo.setImages(stringList);
}
@ -3364,6 +3418,71 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
// vo = selectSolution(vo, sid);
vo = selectSolutions(vo, sid);
//===============================================
//挂车价格(金融方案中取)
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
List<OrderSolutionVo> 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<BusSalesOrderMapper
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
//流程定义id
bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -5027,7 +5148,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//是否排产
// variables.put("isLoan1", "3".equals(busSalesOrder.getType()));//废弃
//部门名称<客户>系列-全款/贷款销售订单
String orgName = busSalesOrder.getOrgName();
String customerName = busSalesOrder.getCustomerName();
String typeValue = "";
if("1".equals(busSalesOrder.getPayTypeKey())){
@ -5035,7 +5155,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}else{
typeValue = "贷款销售订单";
}
String orderNames = orgName+"<"+customerName+">系列-"+typeValue;
String xilie = "";
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(busSalesOrderModel.getModelSid());
if(vehicleModelResultBean.getData() != null){
xilie = vehicleModelResultBean.getData().getProductLineValue();
}
ResultBean<SysOrganizationVo> 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<BusSalesOrderMapper
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null){
if (oneBillMoney == null) {
busSalesOrderIsDTKPJVo.setIsEdit(false);
busSalesOrderIsDTKPJVo.setOneBillMoney("");
}else {
} else {
busSalesOrderIsDTKPJVo.setIsEdit(true);
busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
}
return rb.success().setData(busSalesOrderIsDTKPJVo);
}
public ResultBean<String> 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<BusSalesOrderDeposit> 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<BusDepositFictitious> 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<BusSalesOrderDiscount> 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<BusSalesOrderInsurance> 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<BusSalesOrderMakeup> 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<BusSalesOrderModel> 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<BusSalesOrderPrice> 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<BusSalesOrderVehicle> 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<BusSalesOrderSubmit> 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<BusSalesVehicleOrder> 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("重新发起失败");
}
}
}

2
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<BusSalesOrderDepo
List<String> selectByTotalValue(String sid);
int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid,@Param("bigDecimalSum")BigDecimal bigDecimalSum);
List<BusSalesOrderDeposit> getListByOrderSid(@Param("saleOrderSid")String saleOrderSid);
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@ -83,6 +83,13 @@
where salesOrderSid = #{sid}
</select>
<select id="getListByOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit">
select *
from bus_sales_order_deposit
where salesOrderSid = #{saleOrderSid}
</select>
<update id="updateBySalesOrderSid">
update bus_sales_order_deposit
set depositAll = #{depositSum},

4
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<BusSalesOrde
public int updateBySalesOrderSid(BigDecimal depositSum, String salesOrderSid, BigDecimal bigDecimalSum) {
return baseMapper.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
}
public List<BusSalesOrderDeposit> getListByOrderSid(String saleOrderSid) {
return baseMapper.getListByOrderSid(saleOrderSid);
}
}

5
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<BusSalesOrderDis
* @param numAll 数量
* @return
*/
int updateNum(@Param("sid") String salesOrderSid, @Param("policySid") String salesPolicySid, @Param("num") int numAll,@Param("totalValue")String totalValue);
int updateNum(@Param("sid") String salesOrderSid, @Param("policySid") String salesPolicySid, @Param("num") int numAll, @Param("totalValue") String totalValue);
/**
* 根据销售订单sid查询主车优惠
@ -114,4 +115,6 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDis
List<OrderDiscountVo> discountList(String contractNo);
List<BusSalesOrderDiscount> selectListByContractNo(String contractNo);
List<BusSalesOrderDiscount> selectBySaleOrderSid(@Param("saleOrderSid") String saleOrderSid);
}

4
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}
</select>
<select id="selectBySaleOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount">
select * from bus_sales_order_discount where salesOrderSid = #{saleOrderSid}
</select>
</mapper>

4
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<BusSalesOrd
public List<BusSalesOrderDiscount> selectListByContractNo(String contractNo) {
return baseMapper.selectListByContractNo(contractNo);
}
public List<BusSalesOrderDiscount> selectBySaleOrderSid(String saleOrderSid) {
return baseMapper.selectBySaleOrderSid(saleOrderSid);
}
}

5
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(业务管理) <br/>
* File: BusSalesOrderInsuranceMapper.java <br/>
@ -78,4 +80,7 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderIn
* @return
*/
AppBusSalesOrderInsuranceVo getInsurance(String sid);
List<BusSalesOrderInsurance> selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid);
}

6
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}
</select>
<select id="selectListByOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance">
select *
from bus_sales_order_insurance
where salesOrderSid = #{saleOrderSid}
</select>
</mapper>

6
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(业务管理) <br/>
* File: BusSalesOrderInsuranceService.java <br/>
@ -157,4 +159,8 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
}
return rb.success().setData(vo);
}
public List<BusSalesOrderInsurance> selectBySaleOrderSid(String saleOrderSid) {
return baseMapper.selectListByOrderSid(saleOrderSid);
}
}

5
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(业务管理) <br/>
@ -83,4 +86,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
AppOrderTopInfoVo selectTop(String sid);
BusSalesOrderMakeup detailsss(String sid);
List<BusSalesOrderMakeup> selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@ -100,4 +100,8 @@
<select id="detailsss" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
select * from bus_sales_order_makeup where salesOrderSid = #{sid}
</select>
<select id="selectListByOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
select * from bus_sales_order_makeup where salesOrderSid = #{saleOrderSid}
</select>
</mapper>

4
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<BusSalesOrder
public BusSalesOrderMakeup detailsss(String sid) {
return baseMapper.detailsss(sid);
}
public List<BusSalesOrderMakeup> selectListByOrderSid(String saleOrderSid) {
return baseMapper.selectListByOrderSid(saleOrderSid);
}
}

3
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(业务管理) <br/>
@ -91,4 +92,6 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
AppOrderModelInfoVo selectModel(String sid);
BusSalesOrderModel selectByOrderSid(String sid);
List<BusSalesOrderModel> selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid);
}

6
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}
</select>
<select id="selectListByOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel">
select *
from bus_sales_order_model
where salesOrderSid = #{saleOrderSid}
</select>
</mapper>

4
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<BusSalesOrderM
public BusSalesOrderModel selectByOrderSid(String sid) {
return baseMapper.selectByOrderSid(sid);
}
public List<BusSalesOrderModel> selectListByOrderSid(String saleOrderSid) {
return baseMapper.selectListByOrderSid(saleOrderSid);
}
}

3
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(业务管理) <br/>
@ -93,4 +94,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
AppOrderPriceInfoVo selectPrice(String sid);
BusSalesOrderPrice selectByContractNoOne(String contractNo);
List<BusSalesOrderPrice> selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid);
}

6
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}
</select>
<select id="selectListByOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice">
select *
from bus_sales_order_price
where salesOrderSid = #{saleOrderSid}
</select>
</mapper>

5
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(业务管理) <br/>
@ -205,4 +206,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
public BusSalesOrderPrice selectByContractNoOne(String contractNo) {
return baseMapper.selectByContractNoOne(contractNo);
}
public List<BusSalesOrderPrice> selectListByOrderSid(String saleOrderSid) {
return baseMapper.selectListByOrderSid(saleOrderSid);
}
}

5
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> {
BusSalesOrderSubmit seletByOrderSid(String businessSid);
List<BusSalesOrderSubmit> selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid);
}

6
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}
</select>
<select id="selectListByOrderSid"
resultType="com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit">
select *
from bus_sales_order_submit
where salesOrderSid = #{saleOrderSid}
</select>
</mapper>

5
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<BusSalesOrder
public BusSalesOrderSubmit selectBySaleOrderSid(String sid) {
return baseMapper.seletByOrderSid(sid);
}
public List<BusSalesOrderSubmit> selectListByOrderSid(String saleOrderSid) {
return baseMapper.selectListByOrderSid(saleOrderSid);
}
}

4
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<BusSalesOrde
public List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo) {
return baseMapper.selectByNoAndVinSids(contractNo);
}
public List<BusSalesOrderVehicle> selectListByOrderSid(String saleOrderSid) {
return baseMapper.selectByOrderSid(saleOrderSid);
}
}

1
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<BusSalesVehicleOr
List<BusSalesVehicleOrder> selectLists(String sid);
List<BusSalesVehicleOrder> selectByOrderSid(String salesOrderSid);
}

1
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<BusSalesVehi
public List<BusSalesVehicleOrder> selectByOrderSid(String salesOrderSid) {
return baseMapper.selectByOrderSid(salesOrderSid);
}
}

31
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<FlowTaskMapper, FlowTask
or.endOr();
}
if(StringUtils.isNotBlank(startUserSidParams)){
or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
or.processVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
}
//.taskCandidateGroupIn(roleSidList)
or.taskAssigneeLike("%" + userSid + "%")
.orderByTaskCreateTime().desc();
// 查询筛选条件
if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {
taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
taskQuery.taskCreatedAfter(Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()));
// taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
}
if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
taskQuery.taskCreatedBefore(Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()));
// taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
}
/*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
@ -1972,20 +1982,23 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
or.endOr();
}
if(StringUtils.isNotBlank(startUserSidParams)){
or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
or.processVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
}
or.taskAssigneeLike("%" + userSid + "%")
.orderByTaskCreateTime().desc();
// 查询筛选条件
if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {
taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
taskQuery.taskCreatedAfter(Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()));
// taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
}
if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
taskQuery.taskCreatedBefore(Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()));
// taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
}
/*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
}*/
page.setTotal(taskQuery.count());
int p = (pageNum - 1) * pageSize;
List<Task> taskList = taskQuery.listPage(p, pageSize);

5
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;
}

29
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<FlowableMapper, Flowable
taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
taskParamList.add(taskParam);
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if (StringUtils.isNotBlank(startDate)) {
BusinessTaskParam taskParam = new BusinessTaskParam();
taskParam.setField("startDate");
taskParam.setValue(startDate);
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(startDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
// taskParam.setValue(startDate);
taskParam.setValue(startOfDay.format(formatter));
taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
taskParamList.add(taskParam);
}
if (StringUtils.isNotBlank(endDate)) {
BusinessTaskParam taskParam = new BusinessTaskParam();
taskParam.setField("endDate");
taskParam.setValue(endDate);
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(endDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
// taskParam.setValue(endDate);
taskParam.setValue(endOfDay.format(formatter));
taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
taskParamList.add(taskParam);
}
@ -616,21 +629,28 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
taskParamList.add(taskParam);
}
String date = params.getDate();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(StringUtils.isNotBlank(date)){
String[] s = date.split("至");
String startDate = s[0];
if (StringUtils.isNotBlank(startDate)) {
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(startDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
BusinessTaskParam taskParam = new BusinessTaskParam();
taskParam.setField("startDate");
taskParam.setValue(startDate);
// taskParam.setValue(startDate);
taskParam.setValue(startOfDay.format(formatter));
taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
taskParamList.add(taskParam);
}
String endDate = s[1];
if (StringUtils.isNotBlank(endDate)) {
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(endDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
BusinessTaskParam taskParam = new BusinessTaskParam();
taskParam.setField("endDate");
taskParam.setValue(endDate);
// taskParam.setValue(endDate);
taskParam.setValue(endOfDay.format(formatter));
taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
taskParamList.add(taskParam);
}
@ -656,6 +676,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
for (int i = 0; i < voList.size(); i++) {
FlowTaskFinishVo f = voList.get(i);
Map<String, Object> flowMap = f.getProcessVariables();
f.setBusinessSid(flowMap.get("businessSid").toString());
Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
String json = JSONObject.toJSONString(appMap);
AppVo appVo = new AppVo();

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@ -381,7 +381,7 @@
<select id="selectStaffLists" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
select su.sid userSid,
si.name userName
si.name staffName
from sys_user su
left join sys_staffinfo si on su.staffSid = si.sid
</select>

2
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<SysStaffinfoMapper,
qw.notIn("su.sid",params.getSelectSid());
}
if(params.getState() == 0){
qw.eq("si.personTypeKey","01");
qw.eq("si.personTypeKey","02");
}
}
IPage<AppSysStaffVo> pagging = baseMapper.getUserList(page, qw, orgSid);

8
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'
})
}

8
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({

15
anrui-system-ui/src/views/flow/doneList.vue

@ -13,7 +13,9 @@
<el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发起人">
<el-input v-model="listQuery.params.startUserName" placeholder="" clearable></el-input>
<el-select v-model="listQuery.params.startUserSid" filterable placeholder="请选择">
<el-option v-for="item in user_list" :key="item.userSid" :label="item.staffName" :value="item.userSid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.startDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
@ -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') {

14
anrui-system-ui/src/views/flow/havereadList.vue

@ -12,7 +12,9 @@
<el-input v-model="listQuery.params.names" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发起人">
<el-input v-model="listQuery.params.startUserName" placeholder="流程名称" clearable></el-input>
<el-select v-model="listQuery.params.startUserSid" filterable placeholder="请选择">
<el-option v-for="item in user_list" :key="item.userSid" :label="item.staffName" :value="item.userSid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发送日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" placeholder="选择日期" clearable value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
@ -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()
},
//

17
anrui-system-ui/src/views/flow/tobereadList.vue

@ -11,8 +11,10 @@
<el-form-item label="工作名称">
<el-input v-model="listQuery.params.names" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="流程名称">
<el-input v-model="listQuery.params.startUserName" placeholder="流程名称" clearable></el-input>
<el-form-item label="发起人">
<el-select v-model="listQuery.params.startUserSid" filterable placeholder="请选择">
<el-option v-for="item in user_list" :key="item.userSid" :label="item.staffName" :value="item.userSid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发送日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" placeholder="选择日期" clearable value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
@ -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()
},
//

14
anrui-system-ui/src/views/flow/todoList.vue

@ -13,7 +13,9 @@
<el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发起人">
<el-input v-model="listQuery.params.startUserName" placeholder="" clearable></el-input>
<el-select v-model="listQuery.params.startUserSid" filterable placeholder="请选择">
<el-option v-for="item in user_list" :key="item.userSid" :label="item.staffName" :value="item.userSid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.startDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
@ -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') {

10
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<String> saveBillInfo(@Valid @RequestBody BusOrerSalesAllDto dto);
@ApiOperation("重新发起")
@GetMapping("rePublishSaleOrder/{saleOrderSid}")
@ResponseBody
public ResultBean<String> rePublishSaleOrder(@PathVariable String saleOrderSid) throws InvocationTargetException, IllegalAccessException;
/*-----------------------------------------车型信息------------------------------------------*/
@ApiOperation("初始化销售订单车型信息")
@ -218,7 +224,7 @@ public interface AppBusSalesOrderFeign {
@ApiOperation("初始化销售订单补充说明")
@GetMapping("/save/getOrderRemarksInfo")
@ResponseBody
ResultBean<RemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid);
ResultBean<RemarksVo> getOrderRemarksInfo(@RequestParam("saleOrderSid") String saleOrderSid);
/*-----------------------------------------提交------------------------------------------*/
@ -307,6 +313,4 @@ public interface AppBusSalesOrderFeign {
ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);
}

5
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<String> rePublishSaleOrder(String saleOrderSid) {
return null;
}
@Override
public ResultBean<BusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
return null;

18
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;
}

9
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<String> rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid);
}
@Override
@ApiOperation("初始化销售订单 车型信息")
public ResultBean<BusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {

15
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<SystemVo> 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<String> 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());
}
}
Loading…
Cancel
Save