Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
e9957990e5
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
  4. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java
  5. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java
  6. 43
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java
  7. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java
  8. 31
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java
  9. 37
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java
  10. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverQuery.java
  11. 37
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverToDoVo.java
  12. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java
  13. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java
  14. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeign.java
  15. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeignFallback.java
  16. 34
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListVo.java
  17. 34
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFile.java
  18. 30
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java
  19. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  20. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java
  21. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml
  22. 65
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java
  23. 374
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java
  24. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.java
  25. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListRest.java
  26. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java
  27. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java
  28. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml
  29. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java
  30. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  31. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-devv.yml
  32. 1982
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/discountPackage.ftl
  33. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  34. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  35. 123
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  36. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
  37. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
  38. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
  39. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java

@ -77,4 +77,10 @@ public class BaseModelModpriceModel extends BaseEntity {
@ApiModelProperty("价格增减数额")
private String incOrDecInPrice; // 价格增减数额
@ApiModelProperty("调整后全款销售指导价")
private String tzhGuidedPrice; // 调整后全款销售指导价
@ApiModelProperty("调整后贷款销售指导价")
private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java

@ -69,4 +69,8 @@ public class BaseModelModpriceModelDto implements Dto {
private String incOrDecInPrice; // 价格增减数额
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("调整后全款销售指导价")
private String tzhGuidedPrice; // 调整后全款销售指导价
@ApiModelProperty("调整后贷款销售指导价")
private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java

@ -68,6 +68,10 @@ public class BaseModelModpriceModelVo implements Vo {
private String guidedPrice; // 现全款销售指导价
@ApiModelProperty("价格增减数额")
private String incOrDecInPrice; // 价格增减数额
@ApiModelProperty("调整后全款销售指导价")
private String tzhGuidedPrice; // 调整后全款销售指导价
@ApiModelProperty("调整后贷款销售指导价")
private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
@ApiModelProperty("备注")
private String remarks; // 备注

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java

@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
@ -62,6 +63,6 @@ public class BusDeliveredQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("车辆sid集合")
private List<String> vinSid;
private List<String> vinSid = new ArrayList<>();
}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java

@ -17,8 +17,8 @@ import java.util.Date;
@ApiModel(value = "优惠包交接表", description = "优惠包交接表")
@TableName("bus_discountpackage_handover")
public class BusDiscountpackageHandover extends BaseEntity {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("车型名称")
@ -46,5 +46,7 @@ public class BusDiscountpackageHandover extends BaseEntity {
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 创建组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 库存状态value
private String useOrgName; // 使用组织名称
}

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

@ -0,0 +1,43 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.fasterxml.jackson.annotation.JsonFormat;
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.Date;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/4/16 16:59
*/
@Data
@ApiModel(value = "优惠包交接详情视图数据对象", description = "优惠包交接详情视图数据对象")
public class BusDiscountpackageHandoverDetailsVo implements Vo {
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车型名称")
private String vehModel; // 车型名称
@ApiModelProperty("车辆台数")
private String vehCount; // 车辆台数
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("接收人姓名")
private String recName; // 接收人姓名
@ApiModelProperty("接收人姓名")
private String recPhone; // 接收人电话
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("接收时间")
private Date recTime; // 接收时间
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoverListVo> busDiscountpackageHandoverLists;
}

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

@ -2,6 +2,8 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -21,6 +23,8 @@ public class BusDiscountpackageHandoverDto implements Dto {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("userSid")
private String userSid; // userSid
@ApiModelProperty("交接状态 1待准备2待交接3已交接")
private String state; // 交接状态 1待准备2待交接3已交接
@ApiModelProperty("合同编号")
@ -50,9 +54,10 @@ public class BusDiscountpackageHandoverDto implements Dto {
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 创建组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 库存状态value
private String useOrgName;
@ApiModelProperty("优惠包交接优惠包列表")
private List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists;
@ApiModelProperty("业务关联附件表")
private List<BusFileDto> busFiles;
}

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

@ -1,12 +1,16 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.util.List;
/**
* @author Administrator
@ -22,13 +26,32 @@ import org.springframework.web.bind.annotation.RequestBody;
fallback = BusDiscountpackageHandoverFeignFallback.class)
public interface BusDiscountpackageHandoverFeign {
@ApiOperation("根据条件分页查询数据的列表")
@ApiOperation("根据条件分页查询优惠包交接数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(@RequestBody PagerQuery<BusDiscountpackageHandoverQuery> pq);
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody BusDiscountpackageHandoverDto dto);
@ApiOperation("服务站人员交接准备")
@GetMapping("/handover/{sid}")
public ResultBean<BusDiscountpackageHandoverToDoVo> handover(@PathVariable("sid") String sid);
@ApiOperation("交接操作")
@PostMapping("/toDohandover")
public ResultBean toDohandover(@RequestBody BusDiscountpackageHandoverDto dto) throws ParseException;
@ApiOperation("优惠包交接详情")
@GetMapping("/handoverDetails/{sid}")
public ResultBean<BusDiscountpackageHandoverDetailsVo> handoverDetails(@PathVariable("sid") String sid);
@ApiOperation(("打印交接单"))
@PostMapping("/createPdf")
public ResultBean<String> createPdf(@RequestBody List<String> sids) throws Exception;
@ApiOperation(("上传图片"))
@PostMapping("/uploadPicture")
public ResultBean uploadPicture(@RequestBody List<BusFileDto> fileDtos , String sid);
}

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

@ -1,10 +1,13 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
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.util.List;
/**
* @author Administrator
* @description
@ -12,15 +15,45 @@ import org.springframework.stereotype.Component;
*/
@Component
public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpackageHandoverFeign{
public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpackageHandoverFeign {
@Override
public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(PagerQuery<BusDiscountpackageHandoverQuery> pq) {
return null;
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/listPage无法访问");
}
@Override
public ResultBean save(BusDiscountpackageHandoverDto dto) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/save无法访问");
}
@Override
public ResultBean<BusDiscountpackageHandoverToDoVo> handover(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/handover/{sid}无法访问");
}
@Override
public ResultBean toDohandover(BusDiscountpackageHandoverDto dto) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/toDohandover无法访问");
}
@Override
public ResultBean<BusDiscountpackageHandoverDetailsVo> handoverDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/handoverDetails/{sid}无法访问");
}
@Override
public ResultBean<String> createPdf(List<String> sids) {
return null;
}
@Override
public ResultBean uploadPicture(List<BusFileDto> fileDto, String sid) {
return null;
}
}

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverQuery.java

@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -14,4 +15,23 @@ import lombok.Data;
@Data
public class BusDiscountpackageHandoverQuery implements Query {
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("交接状态")
private Integer state; // 交接状态
@ApiModelProperty("当前登录用户sid")
private String userSid; //
@ApiModelProperty("待接收销售专员用户sid")
private String recUserSid; // 待接收销售专员用户sid
@ApiModelProperty("生成开始时间")
private String createStartTime; // 生成开始时间
@ApiModelProperty("生成结束时间")
private String createEndTime; // 生成结束时间
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("待接收人")
private String recName; // 客户名称
}

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

@ -0,0 +1,37 @@
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;
}

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

@ -1,5 +1,6 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandover;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -16,8 +17,11 @@ import java.util.Date;
@ApiModel(value = "优惠包交接表-视图数据对象", description = "优惠包交接表-视图数据对象")
public class BusDiscountpackageHandoverVo implements Vo {
@ApiModelProperty("sid")
private String sid; // sid
@ApiModelProperty("交接状态 0待准备1待交接2已交接")
private Integer state; // 交接状态
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createTime; // 合同编号
@ApiModelProperty("合同编号")
@ -32,5 +36,8 @@ public class BusDiscountpackageHandoverVo implements Vo {
private String recName; // 接收人姓名
@ApiModelProperty("接收人电话")
private String recPhone; // 接收人电话
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("接收时间")
private Date recTime; // 接收时间
}

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

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author Administrator
@ -35,5 +36,7 @@ public class BusDiscountpackageHandoverListDto implements Dto {
private String discountName; // 优惠包名称
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("修改时间")
private Date modifyTime; // 备注
}

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeign.java

@ -1,4 +1,5 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -6,6 +7,8 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* @author Administrator
* @description
@ -23,4 +26,8 @@ public interface BusDiscountpackageHandoverListFeign {
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody BusDiscountpackageHandoverListDto dto);
@ApiOperation("根据待交接表sid查询优惠包列表")
@PostMapping("/findListByMainSid")
public ResultBean<List<BusDiscountpackageHandoverList>> findListByMainSid(String mainSid);
}

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeignFallback.java

@ -3,6 +3,8 @@ package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author Administrator
* @description
@ -15,4 +17,9 @@ public class BusDiscountpackageHandoverListFeignFallback implements BusDiscountp
public ResultBean save(BusDiscountpackageHandoverListDto dto) {
return null;
}
@Override
public ResultBean<List<BusDiscountpackageHandoverList>> findListByMainSid(String mainSid) {
return null;
}
}

34
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListVo.java

@ -0,0 +1,34 @@
package com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author Administrator
* @description
* @date 2023/4/14 16:46
*/
@Data
@ApiModel(value = "优惠包交接表-视图数据对象", description = "优惠包交接表-视图数据对象")
public class BusDiscountpackageHandoverListVo implements Vo {
@ApiModelProperty("序号")
private Integer sNo; // 序号
@ApiModelProperty("优惠包列表sid")
private String sid; // 交接表sid
@ApiModelProperty("价值")
private BigDecimal price; // 价值
@ApiModelProperty("数量")
private String number; // 数量
@ApiModelProperty("优惠包说明")
private String explain; // 优惠包说明
@ApiModelProperty("总价值")
private BigDecimal totalPrice; // 总价值
@ApiModelProperty("优惠包名称")
private String discountName; // 优惠包名称
}

34
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFile.java

@ -0,0 +1,34 @@
package com.yxt.anrui.buscenter.api.busfile;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/4/17 9:03
*/
@ApiModel(value = "业务关联附件表", description = "业务关联附件表")
@TableName("bus_file")
@Data
public class BusFile extends BaseEntity {
private static final long serialVersionUID = -1625798325169874963L;
@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;
}

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

@ -0,0 +1,30 @@
package com.yxt.anrui.buscenter.api.busfile;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/4/17 9:28
*/
@Data
public class BusFileDto implements Dto {
@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;
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@ -230,6 +230,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
if (StringUtils.isBlank(query.getOutboundSid())) {
appDeliveredDetailsVo.setOrgPath(query.getOrgPath());
List<String> list = query.getList();
list.removeAll(Collections.singleton(null));
if (list.isEmpty()) {
return rb.setMsg("请选择要出库的车辆");
}

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

@ -1,9 +1,19 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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
@ -13,4 +23,10 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BusDiscountpackageHandoverMapper extends BaseMapper<BusDiscountpackageHandover> {
IPage<BusDiscountpackageHandoverVo> selectPageVo(IPage<BusDiscountpackageHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusDiscountpackageHandover> qw);
BusDiscountpackageHandoverToDoVo selecthandover(String sid);
}

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

@ -4,4 +4,24 @@
<!-- <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>
</select>
<select id="selecthandover"
resultType="com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverToDoVo">
</select>
</mapper>

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

@ -1,9 +1,7 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverQuery;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverVo;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.*;
import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -12,6 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException;
import java.util.List;
/**
* @author Administrator
* @description
@ -27,13 +28,63 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
@Override
public ResultBean<PagerVo<BusDiscountpackageHandoverVo>> listPage(PagerQuery<BusDiscountpackageHandoverQuery> pq) {
return null;
ResultBean rb = ResultBean.fireFail();
PagerVo<BusDiscountpackageHandoverVo> pv = busDiscountpackageHandoverService.listPage(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean save(BusDiscountpackageHandoverDto dto) {
ResultBean rb = ResultBean.fireFail();
busDiscountpackageHandoverService.saveOrUpdateDto(dto);
return rb.success();
boolean issuccess = busDiscountpackageHandoverService.saveOrUpdateDto(dto);
if (issuccess) {
return rb.success().setMsg("添加成功");
} else {
return rb.fail().setMsg("添加失败");
}
}
@Override
public ResultBean<BusDiscountpackageHandoverToDoVo> handover(String sid) {
ResultBean rb = ResultBean.fireFail();
BusDiscountpackageHandoverToDoVo toDoVo = busDiscountpackageHandoverService.handover(sid);
return rb.success().setData(toDoVo);
}
@Override
public ResultBean toDohandover(BusDiscountpackageHandoverDto dto) throws ParseException {
ResultBean rb = ResultBean.fireFail();
int i = busDiscountpackageHandoverService.toDohandover(dto);
if (i > 0) {
return rb.success().setMsg("交接成功");
}
return rb.fail().setMsg("交接失败");
}
@Override
public ResultBean<BusDiscountpackageHandoverDetailsVo> handoverDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
BusDiscountpackageHandoverDetailsVo detailsVo = busDiscountpackageHandoverService.handoverDetails(sid);
return rb.success().setData(detailsVo);
}
@Override
public ResultBean<String> createPdf(List<String> sids) throws Exception {
return busDiscountpackageHandoverService.createPdf(sids);
}
@Override
public ResultBean uploadPicture(List<BusFileDto> fileDtos,String sid) {
ResultBean rb = ResultBean.fireFail();
boolean isUpload = busDiscountpackageHandoverService.uploadPicture(fileDtos,sid);
if (isUpload) {
return rb.success().setMsg("上传成功");
} else {
return rb.fail().setMsg("上传失败");
}
}
}

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

@ -1,15 +1,36 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandover;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
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.buscenter.api.busdiscountpackagehandover.*;
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;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.io.File;
import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* @author Administrator
@ -21,13 +42,87 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
@Autowired
private BusDiscountpackageHandoverListService busDiscountpackageHandoverListService;
@Autowired
private SysRoleFeign sysRoleFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private BusFileService busFileService;
@Autowired
private DocPdfComponent docPdfComponent;
/**
* 筛选条件
*
* @param query
* @return
*/
private QueryWrapper<BusDiscountpackageHandover> createQueryWrapper(BusDiscountpackageHandoverQuery query) {
QueryWrapper<BusDiscountpackageHandover> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getUseOrgSid());
qw.eq("isDelete", 0);
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getRecName())) {
qw.like("recName", query.getRecName());
}
if (StringUtils.isNotBlank(query.getRecUserSid())) {
qw.eq("recUserSid", query.getRecUserSid());
}
if (null != query.getState()) {
if (query.getState() == 3) {
qw.eq("state", query.getState());
} else {
qw.ne("state", 3);
}
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
return qw;
}
/**
* 查询优惠包交接管理分页列表
*
* @param pq
* @return
*/
public PagerVo<BusDiscountpackageHandoverVo> listPage(PagerQuery<BusDiscountpackageHandoverQuery> pq) {
//从传入参数中取查询条件
BusDiscountpackageHandoverQuery query = pq.getParams();
//取到当前登录用户的sid
String userSid = query.getUserSid();
//根据当前用户sid查询用户角色
List<SysRoleVo> roleVoList = sysRoleFeign.fetchByUserSid(userSid).getData();
//判断当前登录用户角色是否为销售专员
if (null != roleVoList) {
for (SysRoleVo sysRoleVo : roleVoList) {
//如果当前登录用户角色包含分公司销售专员,将当前用户sid保存到查询条件中
if ("分公司销售专员".equals(sysRoleVo.getName())) {
query.setRecUserSid(userSid);
}
}
}
QueryWrapper<BusDiscountpackageHandover> qw = createQueryWrapper(query);
IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
IPage<BusDiscountpackageHandoverVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusDiscountpackageHandoverVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
/**
* 新增
*
* @param dto
*/
public void saveOrUpdateDto(BusDiscountpackageHandoverDto dto) {
public boolean saveOrUpdateDto(BusDiscountpackageHandoverDto dto) {
BusDiscountpackageHandover entity = new BusDiscountpackageHandover();
String sid = entity.getSid();
dto.setSid(sid);
@ -44,6 +139,275 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
busDiscountpackageHandoverListService.save(handoverList);
}
}
this.save(entity);
return this.save(entity);
}
public BusDiscountpackageHandoverToDoVo handover(String sid) {
BusDiscountpackageHandoverToDoVo toDoVo = new BusDiscountpackageHandoverToDoVo();
StringBuilder sb = new StringBuilder();
toDoVo.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());
}
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());
toDoVo.setVinNo(sb.toString());
}
}
List<BusDiscountpackageHandoverListVo> listVos = this.returnHandoverListVo(sid);
toDoVo.setBusDiscountpackageHandoverLists(listVos);
return toDoVo;
}
/**
* 交接操作
*
* @param dto
* @return
* @throws ParseException
*/
public int toDohandover(BusDiscountpackageHandoverDto dto) throws ParseException {
String sid = dto.getSid();
String userSid = dto.getUserSid();
//根据当前用户sid查询用户角色
List<SysRoleVo> roleVoList = sysRoleFeign.fetchByUserSid(userSid).getData();
//判断当前登录用户角色是否为销售专员
if (null != roleVoList) {
for (SysRoleVo sysRoleVo : roleVoList) {
//如果当前登录用户角色包含分公司销售专员,将当前用户sid保存到查询条件中
if ("分公司销售专员".equals(sysRoleVo.getName())) {
dto.setState("3");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd:HH:mm:ss");
String currentTime = simpleDateFormat.format(System.currentTimeMillis());
Date currentDate = simpleDateFormat.parse(currentTime);
dto.setRecTime(currentDate);
List<BusFileDto> busFiles = dto.getBusFiles();
if (null != busFiles) {
uploadPicture(busFiles, sid);
}
} else {
dto.setState("2");
}
}
}
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");
}
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);
}
}
}
return i;
}
public BusDiscountpackageHandoverDetailsVo handoverDetails(String sid) {
BusDiscountpackageHandoverDetailsVo detailsVo = new BusDiscountpackageHandoverDetailsVo();
StringBuilder sb = new StringBuilder();
//根据待交接sid查询
BusDiscountpackageHandover ph = this.fetchBySid(sid);
if (null != ph) {
if (StringUtils.isNotBlank(ph.getContractNo())) {
detailsVo.setContractNo(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());
detailsVo.setVinNo(sb.toString());
}
if (StringUtils.isNotBlank(ph.getCustomerName())) {
detailsVo.setCustomerName(ph.getCustomerName());
}
if (StringUtils.isNotBlank(ph.getVehModel())) {
detailsVo.setVehModel(ph.getVehModel());
}
if (StringUtils.isNotBlank(ph.getVehCount())) {
detailsVo.setVehCount(ph.getVehCount());
}
if (StringUtils.isNotBlank(ph.getRecName())) {
detailsVo.setRecName(ph.getRecName());
}
if (null != ph.getRecTime()) {
detailsVo.setRecTime(ph.getRecTime());
}
if (StringUtils.isNotBlank(ph.getRecPhone())) {
detailsVo.setRecPhone(ph.getRecPhone());
}
if (StringUtils.isNotBlank(ph.getRemarks())) {
detailsVo.setRemarks(ph.getRemarks());
}
}
List<BusDiscountpackageHandoverListVo> listVos = this.returnHandoverListVo(sid);
detailsVo.setBusDiscountpackageHandoverLists(listVos);
return detailsVo;
}
//根据sid查询优惠包列表
private List<BusDiscountpackageHandoverListVo> returnHandoverListVo(String sid) {
//定义序号
int i = 1;
List<BusDiscountpackageHandoverListVo> listVos = new ArrayList<>();
List<BusDiscountpackageHandoverList> listByMainSid = busDiscountpackageHandoverListService.findListByMainSid(sid);
if (null != listByMainSid) {
for (BusDiscountpackageHandoverList handoverList : listByMainSid) {
BusDiscountpackageHandoverListVo listVo = new BusDiscountpackageHandoverListVo();
if (StringUtils.isNotBlank(handoverList.getSid())) {
listVo.setSid(handoverList.getSid());
}
if (StringUtils.isNotBlank(handoverList.getDiscountName())) {
listVo.setDiscountName(handoverList.getDiscountName());
}
if (StringUtils.isNotBlank(String.valueOf(handoverList.getPrice()))) {
listVo.setPrice(handoverList.getPrice());
}
if (StringUtils.isNotBlank(handoverList.getNumber())) {
listVo.setNumber(handoverList.getNumber());
}
if (StringUtils.isNotBlank(String.valueOf(handoverList.getTotalPrice()))) {
listVo.setTotalPrice(handoverList.getTotalPrice());
}
if (StringUtils.isNotBlank(handoverList.getExplain())) {
listVo.setExplain(handoverList.getExplain());
}
listVo.setSNo(i++);
listVos.add(listVo);
}
}
return listVos;
}
public ResultBean<String> createPdf(List<String> sids) throws Exception {
ResultBean rb = ResultBean.fireFail();
String path = "";
String filePath = "/template/";
List<File> fileList = new ArrayList<>();
//根据获得的sid查询交接确认数据
for (String sid : sids) {
BusDiscountpackageHandoverDetailsVo detailsVo = this.handoverDetails(sid);
String s = commonCreatePdf(detailsVo);
File file = new File(s);
fileList.add(file);
}
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String targetPath = docPdfComponent.getUploadTemplateUrl();
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";
}
return rb.success().setData(path);
}
public String commonCreatePdf(BusDiscountpackageHandoverDetailsVo pdfVo) {
Map<String, Object> dataMap = new HashMap<String, Object>();
List<BusDiscountpackageHandoverListVo> handoverLists = pdfVo.getBusDiscountpackageHandoverLists();
List<Map<String, Object>> newList = new ArrayList<>();
dataMap.put("customerName", pdfVo.getCustomerName());
dataMap.put("vehCount", pdfVo.getVehCount());
dataMap.put("contractNo", pdfVo.getContractNo());
dataMap.put("recPhone", pdfVo.getRecPhone());
dataMap.put("vehModel", pdfVo.getVehModel());
dataMap.put("vinNo", pdfVo.getVinNo());
dataMap.put("remarks", pdfVo.getRemarks());
if (null != handoverLists) {
for (BusDiscountpackageHandoverListVo handoverList : handoverLists) {
Map<String, Object> map = new HashMap<>();
map.put("sNo", handoverList.getSNo());
map.put("discountName", handoverList.getDiscountName());
map.put("explain", handoverList.getExplain());
map.put("number", handoverList.getNumber());
newList.add(map);
}
}
dataMap.put("newList", newList);
//获取模板
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/discountPackage.ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
File file = new File(targetPath + "discountPackage" + seconds + ".ftl");
File dir = new File(targetPath);
WordConvertUtils.inputStreamToFile(inputStream, file);
WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
//新生成的word路径
String wordPath = targetPath + typeName;
String pdfName = "优惠包交接确认单" + dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
String path = targetPath + pdfName;
return path;
}
public boolean uploadPicture(List<BusFileDto> fileDtos, String sid) {
boolean isSuccess = false;
BusDiscountpackageHandover bh = this.fetchById(sid);
if (null != fileDtos) {
for (BusFileDto busFile : fileDtos) {
BusFile bf = new BusFile();
busFile.setLinkSid(sid);
String urlPrefix = fileUploadComponent.getUrlPrefix();
String[] split = busFile.getFilePath().split(urlPrefix);
busFile.setFilePath(split[1]);
busFile.setName(bh.getRecName());
busFile.fillEntity(bf);
isSuccess = busFileService.save(bf);
}
}
return isSuccess;
}
}

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.java

@ -2,7 +2,14 @@ package com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
@ -10,5 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2023/4/13 16:18
*/
@Mapper
public interface BusDiscountpackageHandoverListMapper extends BaseMapper<BusDiscountpackageHandoverList> {
public interface BusDiscountpackageHandoverListMapper extends BaseMapper<BusDiscountpackageHandoverList> {
@Select("select * from bus_discountpackage_handoverlist where mainSid = #{mainSid}")
List<BusDiscountpackageHandoverList> findListByMainSid(String mainSid);
@Update("Update bus_discountpackage_handoverlist Set `state` = #{state},modifyTime = #{modifyTime} Where sid = #{sid}")
int updateStateBySid(@Param("state") String state, @Param("modifyTime") Date modifyTime, @Param("sid") String sid);
}

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListRest.java

@ -1,4 +1,6 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListFeign;
import com.yxt.anrui.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverService;
@ -8,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author Administrator
* @description
@ -28,4 +32,11 @@ public class BusDiscountpackageHandoverListRest implements BusDiscountpackageHan
busDiscountpackageHandoverListService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
public ResultBean<List<BusDiscountpackageHandoverList>> findListByMainSid(String mainSid) {
ResultBean rb = ResultBean.fireFail();
List<BusDiscountpackageHandoverList> list = busDiscountpackageHandoverListService.findListByMainSid(mainSid);
return rb.success().setData(list);
}
}

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java

@ -1,9 +1,14 @@
package com.yxt.anrui.buscenter.biz.busdiscountpackagehandoverlist;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverList;
import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
import com.yxt.common.base.service.MybatisBaseService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @author Administrator
* @description
@ -18,4 +23,14 @@ public class BusDiscountpackageHandoverListService extends MybatisBaseService<Bu
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public List<BusDiscountpackageHandoverList> findListByMainSid(String mainSid) {
List<BusDiscountpackageHandoverList> list = baseMapper.findListByMainSid(mainSid);
return list;
}
public int updateStateBySid(String state, Date modifyTime, String sid) {
int i = baseMapper.updateStateBySid(state,modifyTime,sid);
return i;
}
}

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

@ -0,0 +1,14 @@
package com.yxt.anrui.buscenter.biz.busfile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import org.apache.ibatis.annotations.Mapper;
/**
* @author Administrator
* @description
* @date 2023/4/17 9:11
*/
@Mapper
public interface BusFileMapper extends BaseMapper<BusFile> {
}

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

@ -0,0 +1,6 @@
<?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.busfile.BusFileMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

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

@ -0,0 +1,26 @@
package com.yxt.anrui.buscenter.biz.busfile;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
import com.yxt.anrui.buscenter.api.busfile.BusFile;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/4/17 9:09
*/
@Service
public class BusFileService extends MybatisBaseService<BusFileMapper, BusFile> {
@Autowired
private FileUploadComponent fileUploadComponent;
public void saveAll(String sid, List<String> entrustConfirmImages, String attachType) {
}
}

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -5025,6 +5025,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
variables.put(BusSalesOrderConstantUtils.GENERAL_MANAGER_PRICE, busSalesOrderPowerVo.getIsPower());
//是否排产
// variables.put("isLoan1", "3".equals(busSalesOrder.getType()));//废弃
//部门名称<客户>系列-全款/贷款销售订单
String orgName = busSalesOrder.getOrgName();
String customerName = busSalesOrder.getCustomerName();
String typeValue = "";
if("1".equals(busSalesOrder.getPayTypeKey())){
typeValue = "全款销售订单";
}else{
typeValue = "贷款销售订单";
}
String orderNames = orgName+"<"+customerName+">系列-"+typeValue;
variables.put("orderNames",orderNames);
return variables;
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-devv.yml

@ -26,3 +26,6 @@ image:
path: D:\\anrui\\upload\\
url:
prefix: http://127.0.0.1:7002/upload/
templateUrl:
uploadUrl: D:\anrui\upload\template\
prefixUrl: http://127.0.0.1:8111/upload/template/

1982
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/discountPackage.ftl

File diff suppressed because it is too large

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -734,12 +734,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillApplication.getOpenTickTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillApplication.getOpenTickTypeValue());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setInvoicingName(finBillApplication.getOpenTickName());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -1774,7 +1774,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.removeAll(Collections.singleton(null));
if (finSelectedReceivablesDetailedVos1_1_2.size() > 0) {
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1_2.size(); i++) {
FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1_2.get(i);
String contractNo = vvvv.getContractNo();
String vinNo = vvvv.getVIN();
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid, vinNo);

123
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -466,6 +466,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
Page<FlowTaskDto> page = new Page<>();
TaskQuery taskQuery = taskService.createTaskQuery();
String startUserNameParams = "";
String names = "";
// 流程参数
Map<String, Object> paramMap = new HashMap<>();
@ -489,6 +490,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
startUserNameParams = btq.getValue();
}
}
if("proDefName".equals(btq.getField())){
names = btq.getValue();
}
}
TaskQuery or = taskQuery.active()
.includeProcessVariables()
@ -568,14 +572,21 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName());
flowTask.setAssigneeSid(sysUserVoResultBean2.getData().getSid());
flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName());
if(processVariables.containsKey("orderNames")){
flowTask.setProcDefName(processVariables.get("orderNames").toString());
}
flowList.add(flowTask);
}
//筛选发起人
//筛选发起人==============================
if (StringUtils.isNotBlank(startUserNameParams)) {
String finalStartUserNameParams = startUserNameParams;
flowList = flowList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
}
page.setTotal(taskQuery.count());
if(StringUtils.isNotBlank(names)){
String finalNames = names;
flowList = flowList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList());
}
page.setTotal(flowList.size());
flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
page.setRecords(flowList);
@ -689,6 +700,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
Map<String, Object> paraMap = new HashMap<>();
List<Map<String, Object>> ll = new ArrayList<>();
String startUserNameParams = "";
String names = "";
for (BusinessTaskParam btq : params) {
paraMap.put(btq.getField(), btq.getValue());
Map<String, Object> mapss = new HashMap<>();
@ -708,7 +720,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
paraMap.remove("startUserName");
startUserNameParams = btq.getValue();
}
if("proDefName".equals(btq.getField())){
names = btq.getValue();
}
}
paraMap.put("userSid", userSid);
paraMap.put("list", ll);
@ -796,6 +810,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
}
if(flowTask.getProcessVariables().containsKey("orderNames")){
flowTask.setProcDefName(flowTask.getProcessVariables().get("orderNames").toString());
}
hisTaskList.add(flowTask);
}
//对hisTaskList进行筛选发起人
@ -803,6 +820,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
String finalStartUserNameParams = startUserNameParams;
hisTaskList = hisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
}
if(StringUtils.isNotBlank(names)){
String finalNames = names;
hisTaskList = hisTaskList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList());
}
page.setTotal(hisTaskList.size());
hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
@ -819,40 +840,36 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
* @return
*/
public ResultBean<Page<FlowTaskDto>> businessFinishedListForApp(String userSid, List<BusinessTaskParam> params, Integer pageNum, Integer pageSize) {
Page<FlowTaskDto> page = new Page<>();
Map<String, Object> paraMap = new HashMap<>();
String names = "";
List<Map<String, Object>> ll = new ArrayList<>();
for (BusinessTaskParam btq : params) {
paraMap.put(btq.getField(), btq.getValue());
Map<String, Object> mapss = new HashMap<>();
if (btq.getSqlOperationSymbol().equals(SQLOperationSymbol.EQUAL)) {
mapss.put("symbol", "=");
mapss.put("value", btq.getValue());
mapss.put("filed", btq.getField());
}
if (btq.getSqlOperationSymbol().equals(SQLOperationSymbol.LIKE)) {
/* if (btq.getSqlOperationSymbol().equals(SQLOperationSymbol.LIKE)) {
mapss.put("symbol", "like");
mapss.put("value", "%" + btq.getValue() + "%");
mapss.put("filed", btq.getField());
}
/* if(btq.getSqlOperationSymbol().equals(SQLOperationSymbol.NONE)){
if("processDefinitionId".equals(btq.getField())){
taskInstanceQuery.processDefinitionId(btq.getValue());
}
}*/
ll.add(mapss);
if("proDefName".equals(btq.getField())){
names = btq.getValue();
paraMap.remove("proDefName");
}
}
paraMap.put("userSid", userSid);
paraMap.put("list", ll);
paraMap.put("page", (pageNum - 1) * pageSize);
paraMap.put("size", pageSize);
// List<Map<String, Object>> maps = baseMapper.finishedList(userSid, ll ,(pageNum-1)*pageSize,pageSize);
/* paraMap.put("page", (pageNum - 1) * pageSize);
paraMap.put("size", pageSize);*/
List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap);
int count = baseMapper.finishedListCount(paraMap);
List<FlowTaskDto> hisTaskList = new ArrayList();
for (Map<String, Object> histTask : maps) {
FlowTaskDto flowTask = new FlowTaskDto();
@ -861,7 +878,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
// 审批人员信息
Timestamp start_time_ = (Timestamp) histTask.get("START_TIME_");
Timestamp processCreateTime = (Timestamp) histTask.get("processCreateTime");
long time = start_time_.getTime();
long processCreateTime1 = processCreateTime.getTime();
Date date = new Date(time);
@ -884,30 +900,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
flowTask.setTaskDefKey(histTask.get("taskDefKey") == null ? "" : histTask.get("taskDefKey").toString());
flowTask.setTaskName(histTask.get("NAME_") == null ? "" : histTask.get("NAME_").toString());
// 判断是否办结
/*Object end_act_id_ = histTask.get("END_ACT_ID_");
if (end_act_id_ != null) {
flowTask.setTaskName(ProcessStateEnum.FINISHED.getStateName());
}*/
// 流程定义信息
// ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
// .processDefinitionId(histTask.get("PROC_DEF_ID_").toString())
// .singleResult();
flowTask.setDeployId(histTask.get("DEPLOYMENT_ID_") == null ? "" : histTask.get("DEPLOYMENT_ID_").toString());
flowTask.setProcDefName(histTask.get("PROC_DEF_NAME_") == null ? "" : histTask.get("PROC_DEF_NAME_").toString());
flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
// 流程发起人信息
// HistoricProcessInstance hi = historyService.createHistoricProcessInstanceQuery()
// .processInstanceId(histTask.get("PROC_INST_ID_").toString())
// .singleResult();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
// flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskId(flowTask.getTaskId()).singleResult();
flowTask.setProcessVariables(historicTaskInstance.getProcessVariables());
Object end_act_id = histTask.get("end_act_id_");
@ -953,16 +953,30 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}else{
flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
}
}
}
if(flowTask.getProcessVariables().containsKey("orderNames")){
flowTask.setProcDefName(flowTask.getProcessVariables().get("orderNames").toString());
}
hisTaskList.add(flowTask);
}
page.setTotal(count);
page.setRecords(hisTaskList);
List<FlowTaskDto> userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
//对hisTaskList进行筛选发起人
if (StringUtils.isNotBlank(names)) {
String finalStartUserNameParams = names;
userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList());
}
List<FlowTaskDto> finallyList = new ArrayList<>();
finallyList.addAll(namesHisTaskList);
finallyList.addAll(userHisTaskList);
page.setTotal(finallyList.size());
finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
// page.setTotal(count);
// page.setRecords(hisTaskList);
page.setRecords(finallyList);
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
return rb.success().setData(page);
}
@ -1954,6 +1968,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
public ResultBean<Page<FlowTaskDto>> businessTodoListForApp(String userSid,String orgPath, List<BusinessTaskParam> params, int pageNum, int pageSize) {
Page<FlowTaskDto> page = new Page<>();
TaskQuery taskQuery = taskService.createTaskQuery();
String names = "";
// 流程参数
Map<String, Object> paramMap = new HashMap<>();
// 挂载表单参数
@ -1972,6 +1987,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
}
}
if("proDefName".equals(btq.getField())){
names = btq.getValue();
paramMap.remove("proDefName");
}
}
TaskQuery or = taskQuery.active()
.includeProcessVariables()
@ -1988,12 +2007,13 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
}
if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
/*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
}
page.setTotal(taskQuery.count());
}*/
/* page.setTotal(taskQuery.count());
int p = (pageNum - 1) * pageSize;
List<Task> taskList = taskQuery.listPage(p, pageSize);
List<Task> taskList = taskQuery.listPage(p, pageSize);*/
List<Task> taskList = taskQuery.list();
List<FlowTaskDto> flowList = new ArrayList<>();
for (Task task : taskList) {
FlowTaskDto flowTask = new FlowTaskDto();
@ -2055,9 +2075,26 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(listResultBean.getData()!=null&&listResultBean.getData().size()>0){
flowTask.setSysProUrlVo(listResultBean.getData().get(0));
}
if(processVariables.containsKey("orderNames")){
flowTask.setProcDefName(processVariables.get("orderNames").toString());
}
flowList.add(flowTask);
}
page.setRecords(flowList);
//对flowList进行筛选发起人======================
List<FlowTaskDto> userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
if (StringUtils.isNotBlank(names)) {
String finalStartUserNameParams = names;
userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList());
}
List<FlowTaskDto> finallyList = new ArrayList<>();
finallyList.addAll(namesHisTaskList);
finallyList.addAll(userHisTaskList);
page.setTotal(finallyList.size());
finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
page.setRecords(finallyList);
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
return rb.success().setData(page);
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@ -146,4 +146,12 @@ public class ScmApplyInbound extends BaseEntity {
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
@ApiModelProperty("价格")
private String price; // 价格
@ApiModelProperty("最新更新时间")
private String newUpdateDate; // 最新更新时间
}

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@ -161,6 +161,13 @@ public class ScmApplyInboundDto implements Dto {
private String pcApplicationCode;
@ApiModelProperty("部门sid")
private String orgSid;
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
@ApiModelProperty("价格")
private String price; // 价格
@ApiModelProperty("最新更新时间")
private String newUpdateDate; // 最新更新时间
@ApiModelProperty("车辆列表")
private List<ScmApplyInboundVehicleDto> vehicleList;

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@ -162,5 +162,10 @@ public class ScmApplyInboundVo implements Vo {
private String configSid;
@ApiModelProperty("部门sid")
private String orgSid;
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
@ApiModelProperty("价格")
private String price; // 价格
@ApiModelProperty("最新更新时间")
private String newUpdateDate; // 最新更新时间
}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@ -221,6 +221,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
inboundVehicle.setApplicationCode(billNo);
inboundVehicle.setSid(UUID.randomUUID().toString());
inboundVehicle.setOrgSidPath(orgPath);
inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
save(inboundVehicle);
String num = dto.getNum();
if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@ -245,6 +246,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
}
return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());
} else { // 修改
if (StringUtils.isBlank(dto.getGuidedPrice())) {
return new ResultBean().fail().setMsg("请填写销售指导价");
}
if (StringUtils.isBlank(dto.getDepartureDate())) {
return new ResultBean().fail().setMsg("请填写厂家发车日期");
}
@ -291,6 +295,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, scmApplyInbound);
scmApplyInbound.setOrgSidPath(dto.getOrgPath());
scmApplyInbound.setNewUpdateDate(DateUtil.formatDate(new Date()));
updateById(scmApplyInbound);
scmFileService.delByMainSid(dto.getSid());
if (scmFiles.size() > 0) {

Loading…
Cancel
Save