Browse Source

交接管理移动端

zhanglei
fanzongzhe 2 years ago
parent
commit
03c6cce0ae
  1. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java
  2. 10
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java
  3. 33
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java
  4. 28
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java
  5. 37
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverToDoVo.java
  6. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java
  7. 55
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandocerDto.java
  8. 39
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverListDto.java
  9. 23
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java
  10. 45
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java
  11. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java
  12. 8
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java
  13. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java
  14. 47
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
  15. 46
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java
  16. 414
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
  17. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java
  18. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml
  19. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java
  20. 53
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandocersDto.java
  21. 24
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java
  22. 45
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java
  23. 49
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java
  24. 35
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java
  25. 36
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListDto.java
  26. 36
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusFilesDto.java

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java

@ -1,6 +1,7 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -19,6 +20,8 @@ import java.util.List;
@ApiModel(value = "优惠包交接详情视图数据对象", description = "优惠包交接详情视图数据对象")
public class BusDiscountpackageHandoverDetailsVo implements Vo {
@ApiModelProperty("userSid")
private String userSid; // userSid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户名称")
@ -39,5 +42,5 @@ public class BusDiscountpackageHandoverDetailsVo implements Vo {
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoverListVo> busDiscountpackageHandoverLists;
private List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
}

10
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java

@ -1,5 +1,6 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
@ -23,8 +24,8 @@ public class BusDiscountpackageHandoverDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("userSid")
private String userSid; // userSid
@ApiModelProperty("createBySid")
private String createBySid; // createBySid
@ApiModelProperty("交接状态 1待准备2待交接3已交接")
private String state; // 交接状态 1待准备2待交接3已交接
@ApiModelProperty("合同编号")
@ -34,13 +35,14 @@ public class BusDiscountpackageHandoverDto implements Dto {
@ApiModelProperty("车辆台数")
private String vehCount; // 车辆台数
@ApiModelProperty("车架号")
private String vins; // 车架号
private String vinNo; // 车架号
@ApiModelProperty("接收人用户sid")
private String recUserSid; // 接收人用户sid
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("接收时间")
private Date recTime; // 接收时间
@ApiModelProperty("接收人电话")
@ -53,6 +55,8 @@ public class BusDiscountpackageHandoverDto implements Dto {
private String createOrgName; // 创建组织名称
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 创建组织sid
@ApiModelProperty("备注")
private String remarks; // 创建组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("优惠包交接优惠包列表")

33
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java

@ -1,6 +1,8 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -9,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.util.List;
@ -30,18 +33,21 @@ public interface BusDiscountpackageHandoverFeign {
@ApiOperation("根据条件分页查询优惠包交接数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(@RequestBody PagerQuery<BusDiscountpackageHandoverQuery> pq);
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody BusDiscountpackageHandoverDto dto);
@ApiOperation("服务站人员交接准备")
@ApiOperation("交接准备/详情")
@GetMapping("/handover/{sid}")
public ResultBean<BusDiscountpackageHandoverToDoVo> handover(@PathVariable("sid") String sid);
@ResponseBody
public ResultBean<BusDiscountpackageHandoverDto> handover(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
@ApiOperation("交接操作")
@PostMapping("/toDohandover")
@ResponseBody
public ResultBean toDohandover(@RequestBody BusDiscountpackageHandoverDto dto) throws ParseException;
@ApiOperation("优惠包交接详情")
@ -56,4 +62,25 @@ public interface BusDiscountpackageHandoverFeign {
@PostMapping("/uploadPicture")
public ResultBean uploadPicture(@RequestBody BusDiscountpackageHandoverDto dto);
/**********************移动端***************************/
@ApiOperation("获取优惠包交接列表")
@PostMapping("/getDiscountHandoverList")
@ResponseBody
public ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> getDiscountHandoverList(@RequestBody PagerQuery<AppBusDiscountpackageHandoverQuery> pq);
@ApiOperation("移动端优惠包交接详情编辑回显")
@GetMapping("/getDiscountHandoverInfo/{sid}")
@ResponseBody
public ResultBean<AppBusDiscountpackageHandocerDto> getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
@ApiOperation("移动端交接操作")
@PostMapping("/todoPackageHandover")
@ResponseBody
public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException;
@ApiOperation(("上传图片"))
@PostMapping("/appUploadPicture")
public ResultBean appUploadPicture(@RequestBody AppBusDiscountpackageHandocerDto dto);
}

28
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java

@ -1,11 +1,15 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.util.List;
/**
@ -30,7 +34,7 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka
}
@Override
public ResultBean<BusDiscountpackageHandoverToDoVo> handover(String sid) {
public ResultBean<BusDiscountpackageHandoverDto> handover(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/handover/{sid}无法访问");
}
@ -57,5 +61,25 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka
return null;
}
@Override
public ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {
return null;
}
@Override
public ResultBean<AppBusDiscountpackageHandocerDto> getDiscountHandoverInfo(String sid) {
return null;
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
return null;
}
@Override
public ResultBean appUploadPicture(AppBusDiscountpackageHandocerDto dto) {
return null;
}
}

37
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverToDoVo.java

@ -1,37 +0,0 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/4/14 15:23
*/
@Data
@ApiModel(value = "服务站人员交接准备视图数据对象", description = "服务站人员交接准备视图数据对象")
public class BusDiscountpackageHandoverToDoVo implements Vo {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车型名称")
private String vehModel; // 车型名称
@ApiModelProperty("车辆台数")
private String vehCount; // 车辆台数
@ApiModelProperty("车架号")
private String vinNo; // 接收人姓名
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoverListVo> busDiscountpackageHandoverLists;
}

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java

@ -19,8 +19,14 @@ public class BusDiscountpackageHandoverVo implements Vo {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("交接状态 0待准备1待交接2已交接")
@ApiModelProperty("交接状态 1待准备,2待交接,3已交接")
private Integer state; // 交接状态
@ApiModelProperty("待准备服务站人员ture,销售专员false")
private Boolean showHandover; //
@ApiModelProperty("待交接服务站人员false,销售专员ture")
private Boolean showToDoHandover; //
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createTime; // 合同编号
@ -40,4 +46,5 @@ public class BusDiscountpackageHandoverVo implements Vo {
@ApiModelProperty("接收时间")
private Date recTime; // 接收时间
}

55
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandocerDto.java

@ -0,0 +1,55 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/4/25 16:47
*/
@Data
public class AppBusDiscountpackageHandocerDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("userSid")
private String userSid; // userSid
@ApiModelProperty("交接状态 1待准备2待交接3已交接")
private String type; // 交接状态 1待准备2待交接3已交接
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("车辆台数")
private String carNumber; // 车辆台数
@ApiModelProperty("车架号")
private String vins; // 车架号
@ApiModelProperty("接收人用户sid")
private String recUserSid; // 接收人用户sid
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("接收时间")
private Date recTime; // 接收时间
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("创建组织sid")
private String orgPath; // orgPath
@ApiModelProperty("备注")
private String remarks; // 创建组织sid
@ApiModelProperty("优惠包交接优惠包列表")
private List<AppBusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
@ApiModelProperty("业务关联附件表")
private List<BusFileDto> busFiles;
}

39
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverListDto.java

@ -0,0 +1,39 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author Administrator
* @description
* @date 2023/4/26 11:37
*/
@Data
public class AppBusDiscountpackageHandoverListDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("交接状态 1待准备2待交接3已交接")
private String type; // 交接状态 1待准备2待交接3已交接
@ApiModelProperty("交接表sid")
private String mainSid; // 交接表sid
@ApiModelProperty("价值")
private BigDecimal price; // 价值
@ApiModelProperty("数量")
private String discountNum; // 数量
@ApiModelProperty("优惠包说明")
private String packageExplain; // 优惠包说明
@ApiModelProperty("总价值")
private BigDecimal totalPrice; // 总价值
@ApiModelProperty("优惠包名称")
private String discountName; // 优惠包名称
@ApiModelProperty("备注")
private String remarks; // 备注
// @ApiModelProperty("修改时间")
// private Date modifyTime; // 备注
}

23
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java

@ -0,0 +1,23 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/4/25 10:37
*/
@Data
public class AppBusDiscountpackageHandoverQuery implements Query {
@ApiModelProperty("分公司sid")
private String orgPath; // 分公司sid
@ApiModelProperty("当前登录用户sid")
private String userSid; //
@ApiModelProperty("待接收销售专员用户sid")
private String recUserSid; // 待接收销售专员用户sid
@ApiModelProperty("1待准备 2待交接 3已交接")
private String type; // 1待准备 2待交接 3已交接
}

45
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java

@ -0,0 +1,45 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Administrator
* @description
* @date 2023/4/24 9:22
*/
@Data
public class AppBusDiscountpackageHandoverVo implements Vo {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("交接状态 1待准备,2待交接,3已交接")
private Integer type; // 交接状态
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createDate; // 合同编号
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("车辆台数")
private String carNun; // 车辆台数
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@ApiModelProperty("接收人电话")
private String recPhone; // 接收人电话
@ApiModelProperty("待交接显示")
private Boolean showHandleBtn; // 待交接显示
@ApiModelProperty("已交接显示")
private Boolean showDownloadBtn; // 已交接显示
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java

@ -38,5 +38,6 @@ public class BusDiscountpackageHandoverListDto implements Dto {
private String remarks; // 备注
@ApiModelProperty("修改时间")
private Date modifyTime; // 备注
@ApiModelProperty("序号")
private Integer sNo; // 序号
}

8
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java

@ -1,9 +1,12 @@
package com.yxt.anrui.buscenter.api.busfile;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Administrator
* @description
@ -13,6 +16,11 @@ import lombok.Data;
public class BusFileDto implements Dto {
@ApiModelProperty("上传人sid")
private String createBySid;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("上传时间")
private Date createTime;
@ApiModelProperty("关联sid")
private String linkSid;
@ApiModelProperty("文件类型")

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java

@ -5,15 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverToDoVo;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @author Administrator
@ -25,8 +21,8 @@ public interface BusDiscountpackageHandoverMapper extends BaseMapper<BusDiscount
IPage<BusDiscountpackageHandoverVo> selectPageVo(IPage<BusDiscountpackageHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusDiscountpackageHandover> qw);
IPage<AppBusDiscountpackageHandoverVo> selectAppPageVo(IPage<BusDiscountpackageHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusDiscountpackageHandover> qw);
BusDiscountpackageHandoverToDoVo selecthandover(String sid);
}

47
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@ -1,27 +1,42 @@
<?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.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo">
select distinct
sid,
`state`,
createTime,
contractNo,
customerName,
vehModel,
vehCount,
recName,
recPhone,
recTime
FROM bus_discountpackage_handover <where> ${ew.sqlSegment} </where>
sid,
`state`,
createTime,
contractNo,
customerName,
vehModel,
vehCount,
recName,
recPhone,
recTime
FROM bus_discountpackage_handover
<where>${ew.sqlSegment}</where>
</select>
<select id="selecthandover"
resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverToDoVo">
<select id="selectAppPageVo"
resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo">
select distinct
sid,
`state` as `type`,
createTime as createDate,
contractNo as contractId,
customerName,
vehModel as model,
vehCount as carNun,
recName,
recPhone,
recTime
FROM bus_discountpackage_handover
<where>${ew.sqlSegment}</where>
</select>
</mapper>

46
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java

@ -1,7 +1,9 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -10,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.util.List;
@ -45,9 +48,9 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
}
@Override
public ResultBean<BusDiscountpackageHandoverToDoVo> handover(String sid) {
public ResultBean<BusDiscountpackageHandoverDto> handover(String sid) throws InvocationTargetException, IllegalAccessException {
ResultBean rb = ResultBean.fireFail();
BusDiscountpackageHandoverToDoVo toDoVo = busDiscountpackageHandoverService.handover(sid);
BusDiscountpackageHandoverDto toDoVo = busDiscountpackageHandoverService.handover(sid);
return rb.success().setData(toDoVo);
}
@ -86,4 +89,41 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
return rb.fail().setMsg("上传失败");
}
}
/********************移动端接口**********************/
@Override
public ResultBean<PagerVo<AppBusDiscountpackageHandoverVo>> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AppBusDiscountpackageHandoverVo> pv = busDiscountpackageHandoverService.getDiscountHandoverList(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<AppBusDiscountpackageHandocerDto> getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
ResultBean rb = ResultBean.fireFail();
AppBusDiscountpackageHandocerDto dto = busDiscountpackageHandoverService.getDiscountHandoverInfo(sid);
return rb.success().setData(dto);
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
ResultBean rb = ResultBean.fireFail();
int i = busDiscountpackageHandoverService.todoPackageHandover(dto);
if (i > 0) {
return rb.success().setMsg("交接成功");
}
return rb.fail().setMsg("交接失败");
}
@Override
public ResultBean appUploadPicture(AppBusDiscountpackageHandocerDto dto) {
ResultBean rb = ResultBean.fireFail();
boolean isUpload = busDiscountpackageHandoverService.appUploadPicture(dto);
if (isUpload) {
return rb.success().setMsg("上传成功");
} else {
return rb.fail().setMsg("上传失败");
}
}
}

414
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@ -3,15 +3,19 @@ package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandocerDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.app.AppBusDiscountpackageHandoverVo;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListVo;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListService;
import com.yxt.anrui.buscenter.biz.busfile.BusFileService;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedPdfVo;
import com.yxt.anrui.portal.api.sysrole.SysRoleFeign;
import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
import com.yxt.common.base.config.component.DocPdfComponent;
@ -22,12 +26,14 @@ import com.yxt.common.base.utils.WordConvertUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@ -50,6 +56,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
private BusFileService busFileService;
@Autowired
private DocPdfComponent docPdfComponent;
@Autowired
private CommonContractFeign commonContractFeign;
/**
* 筛选条件
@ -95,6 +103,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
* @return
*/
public PagerVo<BusDiscountpackageHandoverVo> listPage(PagerQuery<BusDiscountpackageHandoverQuery> pq) {
//从传入参数中取查询条件
BusDiscountpackageHandoverQuery query = pq.getParams();
//取到当前登录用户的sid
@ -113,6 +122,51 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
QueryWrapper<BusDiscountpackageHandover> qw = createQueryWrapper(query);
IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
IPage<BusDiscountpackageHandoverVo> pagging = baseMapper.selectPageVo(page, qw);
List<BusDiscountpackageHandoverVo> records = pagging.getRecords();
if (null != records) {
for (BusDiscountpackageHandoverVo record : records) {
if (null != record) {
// 待准备 服务站人员 ture 销售专员 false
if (null != record.getState() && record.getState() == 1) {
//判断当前登录用户角色是否为销售专员
if (null != roleVoList) {
for (SysRoleVo sysRoleVo : roleVoList) {
//如果当前登录用户角色包含分公司销售专员,将当前用户sid保存到查询条件中
if ("分公司销售专员".equals(sysRoleVo.getName())) {
record.setShowHandover(false);
break;
} else {
record.setShowHandover(true);
}
}
}
}
// 待交接 服务站人员 false 销售专员 ture
if (null != record.getState() && record.getState() == 2) {
//判断当前登录用户角色是否为销售专员
if (null != roleVoList) {
for (SysRoleVo sysRoleVo : roleVoList) {
//如果当前登录用户角色包含分公司销售专员,将当前用户sid保存到查询条件中
if ("分公司销售专员".equals(sysRoleVo.getName())) {
record.setShowToDoHandover(true);
break;
} else {
record.setShowToDoHandover(false);
}
}
}
}
if (StringUtils.isNotBlank(record.getContractNo())) {
CommonContract commonContract = commonContractFeign.selectByNo(record.getContractNo()).getData();
if (null != commonContract) {
if (StringUtils.isNotBlank(commonContract.getBusSid())) {
record.setSalesOrderSid(commonContract.getBusSid());
}
}
}
}
}
}
PagerVo<BusDiscountpackageHandoverVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -127,40 +181,40 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
String sid = entity.getSid();
dto.setSid(sid);
dto.fillEntity(entity);
List<BusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
if (null != listDtos) {
for (BusDiscountpackageHandoverListDto listDto : listDtos) {
listDto.setMainSid(entity.getSid());
BusDiscountpackageHandoverList handoverList = new BusDiscountpackageHandoverList();
String listSid = handoverList.getSid();
listDto.setMainSid(sid);
listDto.setSid(listSid);
listDto.fillEntity(handoverList);
busDiscountpackageHandoverListService.save(handoverList);
entity.setVins(dto.getVinNo());
boolean save = this.save(entity);
if (save) {
List<BusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
if (null != listDtos) {
for (BusDiscountpackageHandoverListDto listDto : listDtos) {
listDto.setMainSid(entity.getSid());
BusDiscountpackageHandoverList handoverList = new BusDiscountpackageHandoverList();
String listSid = handoverList.getSid();
listDto.setMainSid(sid);
listDto.setSid(listSid);
listDto.fillEntity(handoverList);
busDiscountpackageHandoverListService.save(handoverList);
}
}
}
return this.save(entity);
return save;
}
public BusDiscountpackageHandoverToDoVo handover(String sid) {
BusDiscountpackageHandoverToDoVo toDoVo = new BusDiscountpackageHandoverToDoVo();
/**
* 交接准备详情编辑回显
*
* @param sid
* @return
*/
public BusDiscountpackageHandoverDto handover(String sid) throws InvocationTargetException, IllegalAccessException {
BusDiscountpackageHandoverDto dto = new BusDiscountpackageHandoverDto();
StringBuilder sb = new StringBuilder();
toDoVo.setSid(sid);
dto.setSid(sid);
//根据待交接sid查询
BusDiscountpackageHandover ph = this.fetchBySid(sid);
if (null != ph) {
if (StringUtils.isNotBlank(ph.getContractNo())) {
toDoVo.setContractNo(ph.getContractNo());
}
if (StringUtils.isNotBlank(ph.getCustomerName())) {
toDoVo.setCustomerName(ph.getCustomerName());
}
if (StringUtils.isNotBlank(ph.getVehModel())) {
toDoVo.setVehModel(ph.getVehModel());
}
if (StringUtils.isNotBlank(ph.getVehCount())) {
toDoVo.setVehCount(ph.getVehCount());
}
BeanUtils.copyProperties(dto, ph);
if (StringUtils.isNotBlank(ph.getVins())) {
String vins = ph.getVins();
String[] split = vins.split(",");
@ -174,12 +228,21 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
sb.append(vinNo).append(",");
}
sb.delete(sb.length() - 1, sb.length());
toDoVo.setVinNo(sb.toString());
dto.setVinNo(sb.toString());
}
}
//根据关联sid查询图片
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
List<BusDiscountpackageHandoverListDto> lists = this.returnHandoverListVo(sid);
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != busFileDtos) {
for (BusFileDto busFileDto : busFileDtos) {
busFileDto.setFilePath(urlPrefix + busFileDto.getFilePath());
}
dto.setBusFiles(busFileDtos);
}
List<BusDiscountpackageHandoverListVo> listVos = this.returnHandoverListVo(sid);
toDoVo.setBusDiscountpackageHandoverLists(listVos);
return toDoVo;
dto.setBusDiscountpackageHandoverLists(lists);
return dto;
}
/**
@ -191,7 +254,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
*/
public int toDohandover(BusDiscountpackageHandoverDto dto) throws ParseException {
String sid = dto.getSid();
String userSid = dto.getUserSid();
String userSid = dto.getCreateBySid();
int i = 0;
//根据当前用户sid查询用户角色
List<SysRoleVo> roleVoList = sysRoleFeign.fetchByUserSid(userSid).getData();
//判断当前登录用户角色是否为销售专员
@ -204,33 +268,42 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
String currentTime = simpleDateFormat.format(System.currentTimeMillis());
Date currentDate = simpleDateFormat.parse(currentTime);
dto.setRecTime(currentDate);
if (StringUtils.isNotBlank(dto.getState())) {
i = this.updateBySid(dto.toMap(), sid);
}
List<BusFileDto> busFiles = dto.getBusFiles();
if (null != busFiles) {
if (null != busFiles && i > 0) {
this.uploadPicture(dto);
}
} else {
} else if ((sysRoleVo.getName()).contains("服务站长")) {
dto.setState("2");
if (StringUtils.isNotBlank(dto.getState())) {
i = this.updateBySid(dto.toMap(), sid);
}
}
}
}
int i = this.updateBySid(dto.toMap(), sid);
List<BusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
for (BusDiscountpackageHandoverListDto listDto : listDtos) {
String listDtoSid = listDto.getSid();
//判断当前登录用户角色是否为销售专员
if (null != roleVoList) {
for (SysRoleVo sysRoleVo : roleVoList) {
//如果当前登录用户角色包含分公司销售专员,将当前用户sid保存到查询条件中
if ("分公司销售专员".equals(sysRoleVo.getName())) {
listDto.setState("3");
} else {
listDto.setState("2");
if (i > 0) {
List<BusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
for (BusDiscountpackageHandoverListDto listDto : listDtos) {
String listDtoSid = listDto.getSid();
//判断当前登录用户角色是否为销售专员
if (null != roleVoList) {
for (SysRoleVo sysRoleVo : roleVoList) {
//如果当前登录用户角色包含分公司销售专员,将当前用户sid保存到查询条件中
if ("分公司销售专员".equals(sysRoleVo.getName())) {
listDto.setState("3");
} else if ((sysRoleVo.getName()).contains("服务站长")) {
listDto.setState("2");
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String currentTime = simpleDateFormat.format(System.currentTimeMillis());
Date currentDate = simpleDateFormat.parse(currentTime);
listDto.setModifyTime(currentDate);
if (StringUtils.isNotBlank(listDto.getState())) {
busDiscountpackageHandoverListService.updateStateBySid(listDto.getState(), listDto.getModifyTime(), listDtoSid);
}
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String currentTime = simpleDateFormat.format(System.currentTimeMillis());
Date currentDate = simpleDateFormat.parse(currentTime);
listDto.setModifyTime(currentDate);
busDiscountpackageHandoverListService.updateStateBySid(listDto.getState(), listDto.getModifyTime(), listDtoSid);
}
}
}
@ -284,20 +357,20 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
detailsVo.setRemarks(ph.getRemarks());
}
}
List<BusDiscountpackageHandoverListVo> listVos = this.returnHandoverListVo(sid);
List<BusDiscountpackageHandoverListDto> listVos = this.returnHandoverListVo(sid);
detailsVo.setBusDiscountpackageHandoverLists(listVos);
return detailsVo;
}
//根据sid查询优惠包列表
private List<BusDiscountpackageHandoverListVo> returnHandoverListVo(String sid) {
private List<BusDiscountpackageHandoverListDto> returnHandoverListVo(String sid) {
//定义序号
int i = 1;
List<BusDiscountpackageHandoverListVo> listVos = new ArrayList<>();
List<BusDiscountpackageHandoverListDto> listVos = new ArrayList<>();
List<BusDiscountpackageHandoverList> listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(sid);
if (null != listByMainSid) {
for (BusDiscountpackageHandoverList handoverList : listByMainSid) {
BusDiscountpackageHandoverListVo listVo = new BusDiscountpackageHandoverListVo();
BusDiscountpackageHandoverListDto listVo = new BusDiscountpackageHandoverListDto();
if (StringUtils.isNotBlank(handoverList.getSid())) {
listVo.setSid(handoverList.getSid());
}
@ -316,6 +389,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
if (StringUtils.isNotBlank(handoverList.getPackageExplain())) {
listVo.setPackageExplain(handoverList.getPackageExplain());
}
if (StringUtils.isNotBlank(handoverList.getRemarks())) {
listVo.setRemarks(handoverList.getRemarks());
}
if (null != handoverList.getState()) {
listVo.setState(String.valueOf(handoverList.getState()));
}
listVo.setMainSid(sid);
listVo.setSNo(i++);
listVos.add(listVo);
}
@ -338,14 +418,14 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String targetPath = docPdfComponent.getUploadTemplateUrl();
File file = WordConvertUtils.mulFile2One(fileList, targetPath + "优惠包交接确认单" + dateStr + seconds + ".pdf");
File file = WordConvertUtils.mulFile2One(fileList, targetPath + dateStr + seconds + "优惠包交接确认单.pdf");
if (fileList.size() <= 0) {
path = null;
} else {
for (File fileDelete : fileList) {
fileDelete.delete();
}
path = filePath + "优惠包交接确认单" + dateStr + seconds + ".pdf";
path = filePath + dateStr + seconds + "优惠包交接确认单.pdf";
}
return rb.success().setData(path);
}
@ -353,7 +433,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
public String commonCreatePdf(BusDiscountpackageHandoverDetailsVo pdfVo) {
Map<String, Object> dataMap = new HashMap<String, Object>();
List<BusDiscountpackageHandoverListVo> handoverLists = pdfVo.getBusDiscountpackageHandoverLists();
List<BusDiscountpackageHandoverListDto> handoverLists = pdfVo.getBusDiscountpackageHandoverLists();
List<Map<String, Object>> newList = new ArrayList<>();
dataMap.put("customerName", pdfVo.getCustomerName());
dataMap.put("vehCount", pdfVo.getVehCount());
@ -363,7 +443,7 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
dataMap.put("vinNo", pdfVo.getVinNo());
dataMap.put("remarks", pdfVo.getRemarks());
if (null != handoverLists) {
for (BusDiscountpackageHandoverListVo handoverList : handoverLists) {
for (BusDiscountpackageHandoverListDto handoverList : handoverLists) {
Map<String, Object> map = new HashMap<>();
map.put("sNo", handoverList.getSNo());
map.put("discountName", handoverList.getDiscountName());
@ -392,18 +472,220 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
return path;
}
/**
* 上传图片
*
* @param dto
* @return
*/
public boolean uploadPicture(BusDiscountpackageHandoverDto dto) {
boolean isSuccess = false;
BusDiscountpackageHandover bh = this.fetchById(dto.getSid());
String sid = dto.getSid();
BusDiscountpackageHandover bh = this.fetchById(sid);
if (null != dto.getBusFiles()) {
List<BusFileDto> busFiles = dto.getBusFiles();
for (BusFileDto busFile : busFiles) {
BusFile bf = new BusFile();
busFile.setLinkSid(sid);
String uploadPath = fileUploadComponent.getUrlPrefix();
String substring = busFile.getFilePath().substring(uploadPath.length());
busFile.setFilePath(substring);
busFile.fillEntity(bf);
isSuccess = busFileService.save(bf);
}
}
return isSuccess;
}
/*************移动端接口***************************/
private QueryWrapper<BusDiscountpackageHandover> appCreateQueryWrapper(AppBusDiscountpackageHandoverQuery query) {
QueryWrapper<BusDiscountpackageHandover> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getOrgPath());
qw.eq("isDelete", 0);
if (StringUtils.isNotBlank(query.getRecUserSid())) {
qw.eq("recUserSid", query.getRecUserSid());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("3")) {
qw.eq("state", query.getType());
} else {
qw.ne("state", 3);
}
}
return qw;
}
/**
* 移动端交接分页
*
* @param pq
* @return
*/
public PagerVo<AppBusDiscountpackageHandoverVo> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {
//从传入参数中取查询条件
AppBusDiscountpackageHandoverQuery query = pq.getParams();
//取到当前登录用户的sid
String userSid = query.getUserSid();
query.setRecUserSid(userSid);
QueryWrapper<BusDiscountpackageHandover> qw = appCreateQueryWrapper(query);
IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
IPage<AppBusDiscountpackageHandoverVo> pagging = baseMapper.selectAppPageVo(page, qw);
List<AppBusDiscountpackageHandoverVo> records = pagging.getRecords();
if (null != records) {
for (AppBusDiscountpackageHandoverVo record : records) {
if (null != record) {
if (StringUtils.isNotBlank(record.getContractId())) {
String busSid = commonContractFeign.selectByNo(record.getContractId()).getData().getBusSid();
record.setSalesOrderSid(busSid);
}
if (null != record.getType()) {
if (record.getType() == 1 || record.getType() == 2) {
record.setShowHandleBtn(true);
} else if (record.getType() == 3) {
record.setShowDownloadBtn(true);
}
}
}
}
}
PagerVo<AppBusDiscountpackageHandoverVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
/**
* 移动端交接详情编辑回显
*
* @param sid
* @return
*/
public AppBusDiscountpackageHandocerDto getDiscountHandoverInfo(String sid) throws InvocationTargetException, IllegalAccessException {
AppBusDiscountpackageHandocerDto dto = new AppBusDiscountpackageHandocerDto();
StringBuilder sb = new StringBuilder();
dto.setSid(sid);
//根据待交接sid查询
BusDiscountpackageHandover ph = this.fetchBySid(sid);
if (null != ph) {
BeanUtils.copyProperties(dto, ph);
if (StringUtils.isNotBlank(ph.getUseOrgSid())) {
dto.setOrgPath(ph.getUseOrgSid());
}
if (StringUtils.isNotBlank(ph.getVehModel())) {
dto.setModel(ph.getVehModel());
}
if (StringUtils.isNotBlank(ph.getVehCount())) {
dto.setCarNumber(ph.getVehCount());
}
if (null != ph.getState()) {
dto.setType(String.valueOf(ph.getState()));
}
if (StringUtils.isNotBlank(ph.getContractNo())) {
dto.setContractId(ph.getContractNo());
}
if (StringUtils.isNotBlank(ph.getVins())) {
String vins = ph.getVins();
String[] split = vins.split(",");
for (String s : split) {
String vinNo = "";
if (s.length() > 8) {
vinNo = s.substring(s.length() - 8);
} else {
vinNo = s;
}
sb.append(vinNo).append("、");
}
sb.delete(sb.length() - 1, sb.length());
dto.setVins(sb.toString());
}
}
//根据关联sid查询图片
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
List<BusDiscountpackageHandoverListDto> lists = this.returnHandoverListVo(sid);
List<AppBusDiscountpackageHandoverListDto> appListDtos = new ArrayList<>();
if (null != lists) {
for (BusDiscountpackageHandoverListDto bhListDto : lists) {
AppBusDiscountpackageHandoverListDto appDto = new AppBusDiscountpackageHandoverListDto();
if (null != bhListDto) {
BeanUtils.copyProperties(appDto, bhListDto);
if (StringUtils.isNotBlank(bhListDto.getNumber())) {
appDto.setDiscountNum(bhListDto.getNumber());
}
if (null != bhListDto.getState()) {
appDto.setType(String.valueOf(bhListDto.getState()));
}
appListDtos.add(appDto);
}
}
}
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != busFileDtos) {
for (BusFileDto busFileDto : busFileDtos) {
busFileDto.setFilePath(urlPrefix + busFileDto.getFilePath());
}
dto.setBusFiles(busFileDtos);
}
dto.setBusDiscountpackageHandoverLists(appListDtos);
return dto;
}
/**
* 移动端交接操作
*
* @param dto
* @return
*/
public int todoPackageHandover(AppBusDiscountpackageHandocerDto dto) throws InvocationTargetException, IllegalAccessException, ParseException {
String sid = dto.getSid();
int i = 0;
BusDiscountpackageHandoverDto bdhDto = new BusDiscountpackageHandoverDto();
BeanUtils.copyProperties(bdhDto, dto);
bdhDto.setSid(dto.getSid());
bdhDto.setState("3");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String currentTime = simpleDateFormat.format(System.currentTimeMillis());
Date currentDate = simpleDateFormat.parse(currentTime);
bdhDto.setRecTime(currentDate);
List<BusFileDto> busFiles = bdhDto.getBusFiles();
if (StringUtils.isNotBlank(bdhDto.getState())) {
i = this.updateBySid(bdhDto.toMap(), sid);
}
if (null != busFiles && i > 0) {
this.uploadPicture(bdhDto);
}
if (i > 0) {
List<AppBusDiscountpackageHandoverListDto> listDtos = dto.getBusDiscountpackageHandoverLists();
for (AppBusDiscountpackageHandoverListDto listDto : listDtos) {
String listDtoSid = listDto.getSid();
BusDiscountpackageHandoverListDto dtoList = new BusDiscountpackageHandoverListDto();
BeanUtils.copyProperties(dtoList, listDto);
dtoList.setSid(listDtoSid);
dtoList.setState("3");
if (StringUtils.isNotBlank(dtoList.getState())) {
busDiscountpackageHandoverListService.updateBySid(dtoList.toMap(), listDtoSid);
}
}
}
return i;
}
/**
* 移动端图片上传
*
* @param dto
* @return
*/
public boolean appUploadPicture(AppBusDiscountpackageHandocerDto dto) {
boolean isSuccess = false;
String sid = dto.getSid();
if (null != dto.getBusFiles()) {
List<BusFileDto> busFiles = dto.getBusFiles();
for (BusFileDto busFile : busFiles) {
BusFile bf = new BusFile();
busFile.setLinkSid(dto.getSid());
String urlPrefix = fileUploadComponent.getUrlPrefix();
String[] split = busFile.getFilePath().split(urlPrefix);
busFile.setFilePath(split[1]);
busFile.setName(bh.getRecName());
busFile.setLinkSid(sid);
String uploadPath = fileUploadComponent.getUrlPrefix();
String substring = busFile.getFilePath().substring(uploadPath.length());
busFile.setFilePath(substring);
busFile.fillEntity(bf);
isSuccess = busFileService.save(bf);
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java

@ -2,7 +2,11 @@ package com.yxt.anrui.buscenter.biz.busfile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author Administrator
@ -11,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface BusFileMapper extends BaseMapper<BusFile> {
List<BusFileDto> getPathByLinkSid(@Param("sid") String sid);
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml

@ -3,4 +3,9 @@
<mapper namespace="com.yxt.anrui.buscenter.biz.busfile.BusFileMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="getPathByLinkSid" resultType="com.yxt.anrui.buscenter.api.busfile.BusFileDto">
select *
from bus_file
where linkSid = #{sid}
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java

@ -25,4 +25,8 @@ public class BusFileService extends MybatisBaseService<BusFileMapper, BusFile> {
@Autowired
private BusDiscountpackageHandoverService busDiscountpackageHandoverService;
public List<BusFileDto> getPathByLinkSid(String sid) {
List<BusFileDto> busFileDtos = baseMapper.getPathByLinkSid(sid);
return busFileDtos;
}
}

53
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandocersDto.java

@ -0,0 +1,53 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/4/25 16:47
*/
@Data
public class AppBusDiscountpackageHandocersDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("userSid")
private String userSid; // userSid
@ApiModelProperty("交接状态 1待准备2待交接3已交接")
private String type; // 交接状态 1待准备2待交接3已交接
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("车辆台数")
private String carNumber; // 车辆台数
@ApiModelProperty("车架号")
private String vins; // 车架号
@ApiModelProperty("接收人用户sid")
private String recUserSid; // 接收人用户sid
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("接收时间")
private Date recTime; // 接收时间
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
@ApiModelProperty("创建组织sid")
private String orgPath; // orgPath
@ApiModelProperty("备注")
private String remarks; // 创建组织sid
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoversListDto> busDiscountpackageHandoverLists;
@ApiModelProperty("业务关联附件表")
private List<BusFilesDto> busFiles;
}

24
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java

@ -0,0 +1,24 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/4/25 10:37
*/
@Data
public class AppBusDiscountpackageHandoversQuery implements Query {
@ApiModelProperty("分公司sid")
private String orgPath; // 分公司sid
@ApiModelProperty("当前登录用户sid")
private String userSid; //
@ApiModelProperty("待接收销售专员用户sid")
private String recUserSid; // 待接收销售专员用户sid
@ApiModelProperty("1待准备 2待交接 3已交接")
private String type; // 1待准备 2待交接 3已交接
}

45
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java

@ -0,0 +1,45 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Administrator
* @description
* @date 2023/4/24 9:22
*/
@Data
public class AppBusDiscountpackageHandoversVo implements Vo {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("销售订单sid")
private String salesOrderSid; // 销售订单sid
@ApiModelProperty("交接状态 1待准备,2待交接,3已交接")
private Integer type; // 交接状态
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createDate; // 合同编号
@ApiModelProperty("合同编号")
private String contractId; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车型名称")
private String model; // 车型名称
@ApiModelProperty("车辆台数")
private String carNun; // 车辆台数
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@ApiModelProperty("接收人电话")
private String recPhone; // 接收人电话
@ApiModelProperty("待交接显示")
private Boolean showHandleBtn; // 待交接显示
@ApiModelProperty("已交接显示")
private Boolean showDownloadBtn; // 已交接显示
}

49
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java

@ -0,0 +1,49 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
/**
* @author Administrator
* @description
* @date 2023/4/24 9:18
*/
@Api(tags = "移动端优惠包交接管理")
@FeignClient(
contextId = "terminal-DiscountpackageHandover",
name = "anrui-terminal",
path = "/autoservice/v1/discountPackageHandover",
fallback = AppDiscountPackageHandoverFeginFallback.class)
public interface AppDiscountPackageHandoverFegin {
@ApiOperation("获取优惠包交接列表")
@PostMapping("/getDiscountHandoverList")
@ResponseBody
public ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> listPage(@RequestBody PagerQuery<AppBusDiscountpackageHandoversQuery> pq);
@ApiOperation("移动端优惠包交接详情编辑回显")
@GetMapping("/getDiscountHandoverInfo/{sid}")
@ResponseBody
public ResultBean<AppBusDiscountpackageHandocersDto> getDiscountHandoverInfo(@PathVariable("sid") String sid) throws InvocationTargetException, IllegalAccessException;
@ApiOperation("移动端交接操作")
@PostMapping("/todoPackageHandover")
@ResponseBody
public ResultBean todoPackageHandover(@RequestBody AppBusDiscountpackageHandocersDto dto) throws ParseException, InvocationTargetException, IllegalAccessException;
@ApiOperation(("上传图片"))
@PostMapping("/uploadPicture")
@ResponseBody
public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandocersDto dto) throws InvocationTargetException, IllegalAccessException;
}

35
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFeginFallback.java

@ -0,0 +1,35 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
/**
* @author Administrator
* @description
* @date 2023/4/24 9:20
*/
public class AppDiscountPackageHandoverFeginFallback implements AppDiscountPackageHandoverFegin{
@Override
public ResultBean<PagerVo<AppBusDiscountpackageHandoversVo>> listPage(PagerQuery<AppBusDiscountpackageHandoversQuery> pq) {
return null;
}
@Override
public ResultBean<AppBusDiscountpackageHandocersDto> getDiscountHandoverInfo(String sid) {
return null;
}
@Override
public ResultBean todoPackageHandover(AppBusDiscountpackageHandocersDto dto) throws ParseException, InvocationTargetException, IllegalAccessException {
return null;
}
@Override
public ResultBean uploadPicture(AppBusDiscountpackageHandocersDto dto) {
return null;
}
}

36
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusDiscountpackageHandoversListDto.java

@ -0,0 +1,36 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author Administrator
* @description
* @date 2023/4/25 17:01
*/
@Data
public class BusDiscountpackageHandoversListDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("交接状态 1待准备2待交接3已交接")
private String type; // 交接状态 1待准备2待交接3已交接
@ApiModelProperty("交接表sid")
private String mainSid; // 交接表sid
@ApiModelProperty("价值")
private BigDecimal price; // 价值
@ApiModelProperty("数量")
private String discountNum; // 数量
@ApiModelProperty("优惠包说明")
private String packageExplain; // 优惠包说明
@ApiModelProperty("总价值")
private BigDecimal totalPrice; // 总价值
@ApiModelProperty("优惠包名称")
private String discountName; // 优惠包名称
@ApiModelProperty("备注")
private String remarks; // 备注
}

36
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/BusFilesDto.java

@ -0,0 +1,36 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Administrator
* @description
* @date 2023/4/25 17:01
*/
@Data
public class BusFilesDto implements Dto {
@ApiModelProperty("上传人sid")
private String createBySid;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("上传时间")
private Date createTime;
@ApiModelProperty("关联sid")
private String linkSid;
@ApiModelProperty("文件类型")
private String fileType;
@ApiModelProperty("附件类型")
private String attachType;
@ApiModelProperty("文件名")
private String fileName;
@ApiModelProperty("文件大小")
private String fileSize;
@ApiModelProperty("文件路径")
private String filePath;
@ApiModelProperty("上传人姓名")
private String name;
}
Loading…
Cancel
Save