diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java index 4d920f290e..322f8fedc9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java +++ b/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; // 调整后贷款销售指导价 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java index d95192be8e..d4cb964608 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java +++ b/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; // 调整后贷款销售指导价 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java index 306ca47771..22f79f239f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java +++ b/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; // 备注 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java index c1359f5ea3..ee84321315 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java +++ b/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 vinSid; + private List vinSid = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java index f9792939f5..aa25c21443 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java +++ b/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; // 使用组织名称 + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDetailsVo.java new file mode 100644 index 0000000000..c7a744e391 --- /dev/null +++ b/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 busDiscountpackageHandoverLists; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java index 3bc79781e0..ba89581ddb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java +++ b/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 busDiscountpackageHandoverLists; - + @ApiModelProperty("业务关联附件表") + private List busFiles; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index 2b684ec4a2..6e20ab9c02 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/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> listPage(@RequestBody PagerQuery pq); - @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@RequestBody BusDiscountpackageHandoverDto dto); + @ApiOperation("服务站人员交接准备") + @GetMapping("/handover/{sid}") + public ResultBean handover(@PathVariable("sid") String sid); + + @ApiOperation("交接操作") + @PostMapping("/toDohandover") + public ResultBean toDohandover(@RequestBody BusDiscountpackageHandoverDto dto) throws ParseException; + + @ApiOperation("优惠包交接详情") + @GetMapping("/handoverDetails/{sid}") + public ResultBean handoverDetails(@PathVariable("sid") String sid); + + @ApiOperation(("打印交接单")) + @PostMapping("/createPdf") + public ResultBean createPdf(@RequestBody List sids) throws Exception; + + @ApiOperation(("上传图片")) + @PostMapping("/uploadPicture") + public ResultBean uploadPicture(@RequestBody List fileDtos , String sid); + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java index 38d508b9b3..50a9559f1e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java +++ b/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> listPage(PagerQuery 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 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 handoverDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/v1/busdiscountpackagehandover/handoverDetails/{sid}无法访问"); + } + + @Override + public ResultBean createPdf(List sids) { + return null; + } + + @Override + public ResultBean uploadPicture(List fileDto, String sid) { return null; } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverQuery.java index d50a5bb1f9..68af833132 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverQuery.java +++ b/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; // 客户名称 + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverToDoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverToDoVo.java new file mode 100644 index 0000000000..11474ebde2 --- /dev/null +++ b/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 busDiscountpackageHandoverLists; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java index c5c33786af..aeeb2d9e3a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverVo.java +++ b/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; // 接收时间 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java index 786b973484..a24d3eec11 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListDto.java +++ b/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; // 备注 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeign.java index 2b775f4de7..4b003272c3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeign.java +++ b/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> findListByMainSid(String mainSid); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeignFallback.java index 3ac0b570ef..674a639712 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListFeignFallback.java +++ b/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> findListByMainSid(String mainSid) { + return null; + } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListVo.java new file mode 100644 index 0000000000..1d09b28259 --- /dev/null +++ b/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; // 优惠包名称 +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFile.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFile.java new file mode 100644 index 0000000000..afde6992d9 --- /dev/null +++ b/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; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java new file mode 100644 index 0000000000..77e5d5841d --- /dev/null +++ b/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; + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index fbaa0604cc..2140d01109 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/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 list = query.getList(); + list.removeAll(Collections.singleton(null)); if (list.isEmpty()) { return rb.setMsg("请选择要出库的车辆"); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java index 2f524c7eeb..3694ffe70a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.java +++ b/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 { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + + BusDiscountpackageHandoverToDoVo selecthandover(String sid); } + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml index b4e90fe56a..6b81e4756d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml @@ -4,4 +4,24 @@ + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java index 5c8734a271..aa363074e0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java +++ b/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> listPage(PagerQuery pq) { - return null; + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 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 handoverDetails(String sid) { + + ResultBean rb = ResultBean.fireFail(); + BusDiscountpackageHandoverDetailsVo detailsVo = busDiscountpackageHandoverService.handoverDetails(sid); + return rb.success().setData(detailsVo); + } + + @Override + public ResultBean createPdf(List sids) throws Exception { + + return busDiscountpackageHandoverService.createPdf(sids); + } + + @Override + public ResultBean uploadPicture(List fileDtos,String sid) { + + ResultBean rb = ResultBean.fireFail(); + boolean isUpload = busDiscountpackageHandoverService.uploadPicture(fileDtos,sid); + if (isUpload) { + return rb.success().setMsg("上传成功"); + } else { + return rb.fail().setMsg("上传失败"); + } } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java index 34365c33fc..1b4133da2c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java +++ b/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 createQueryWrapper(BusDiscountpackageHandoverQuery query) { + QueryWrapper 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 listPage(PagerQuery pq) { + //从传入参数中取查询条件 + BusDiscountpackageHandoverQuery query = pq.getParams(); + //取到当前登录用户的sid + String userSid = query.getUserSid(); + //根据当前用户sid查询用户角色 + List roleVoList = sysRoleFeign.fetchByUserSid(userSid).getData(); + //判断当前登录用户角色是否为销售专员 + if (null != roleVoList) { + for (SysRoleVo sysRoleVo : roleVoList) { + //如果当前登录用户角色包含分公司销售专员，将当前用户sid保存到查询条件中 + if ("分公司销售专员".equals(sysRoleVo.getName())) { + query.setRecUserSid(userSid); + } + } + } + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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 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 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 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 busFiles = dto.getBusFiles(); + if (null != busFiles) { + uploadPicture(busFiles, sid); + } + } else { + dto.setState("2"); + } + } + } + int i = this.updateBySid(dto.toMap(), sid); + List 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 listVos = this.returnHandoverListVo(sid); + detailsVo.setBusDiscountpackageHandoverLists(listVos); + return detailsVo; + } + + //根据sid查询优惠包列表 + private List returnHandoverListVo(String sid) { + //定义序号 + int i = 1; + List listVos = new ArrayList<>(); + List 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 createPdf(List sids) throws Exception { + ResultBean rb = ResultBean.fireFail(); + String path = ""; + String filePath = "/template/"; + List 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 dataMap = new HashMap(); + List handoverLists = pdfVo.getBusDiscountpackageHandoverLists(); + List> 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 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 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; } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.java index 66147f3924..18a534af0f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListMapper.java +++ b/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 { +public interface BusDiscountpackageHandoverListMapper extends BaseMapper { + + @Select("select * from bus_discountpackage_handoverlist where mainSid = #{mainSid}") + List 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); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListRest.java index 963f9d0c51..445290a4e2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListRest.java +++ b/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> findListByMainSid(String mainSid) { + ResultBean rb = ResultBean.fireFail(); + List list = busDiscountpackageHandoverListService.findListByMainSid(mainSid); + return rb.success().setData(list); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java index 1e3410ecd7..5c530157f4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandoverlist/BusDiscountpackageHandoverListService.java +++ b/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 findListByMainSid(String mainSid) { + List list = baseMapper.findListByMainSid(mainSid); + return list; + } + + public int updateStateBySid(String state, Date modifyTime, String sid) { + int i = baseMapper.updateStateBySid(state,modifyTime,sid); + return i; + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java new file mode 100644 index 0000000000..729129cec7 --- /dev/null +++ b/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 { +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml new file mode 100644 index 0000000000..dcf8e106bc --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java new file mode 100644 index 0000000000..faacbf8649 --- /dev/null +++ b/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 { + @Autowired + private FileUploadComponent fileUploadComponent; + + public void saveAll(String sid, List entrustConfirmImages, String attachType) { + + + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index d10eb564ef..fc44631f46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5025,6 +5025,17 @@ public class BusSalesOrderService extends MybatisBaseService系列-全款/贷款销售订单 + 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; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-devv.yml b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-devv.yml index 500ef1da34..b47e2ddefa 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-devv.yml +++ b/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/ \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/discountPackage.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/discountPackage.ftl new file mode 100644 index 0000000000..6b29f29f87 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/discountPackage.ftl @@ -0,0 +1,1982 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠包交接确认单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 出库台数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vehCount!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${customerName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 联系电话 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${recPhone!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vehModel!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠包列表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 优惠项目说明 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + <#list newList as listKey> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.sNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.discountName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.explain!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${listKey.number!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 接收人签字（要求字迹工整）： + + + + + + + + + + + + + + + + + + + + + 联系电话： + + + + + + + + + + + + + + + + + + + + + 日期： + + + + + + + + + + + + + + + + + 1 + 0 + 0 + 0 + 0 + 0 + false + false + 0 + WPS Office_11.1.0.14036_F1E327BC-269C-435d-A152-05C5408002CA + 0 + + + + + + + 2023-04-17T03:01:26Z + Administrator + FAN + 2023-04-17T08:11:41Z + + + + + + + + 2052-11.1.0.14036 + + + 8382791D9B234309BF2578B674AF3FDA_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index f9a1477245..973cd81bbf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -734,12 +734,12 @@ public class FinBillApplicationService extends MybatisBaseService 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); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index ccaae16ad6..2b18bb1de4 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -466,6 +466,7 @@ public class FlowTaskService extends MybatisBaseService page = new Page<>(); TaskQuery taskQuery = taskService.createTaskQuery(); String startUserNameParams = ""; + String names = ""; // 流程参数 Map paramMap = new HashMap<>(); @@ -489,6 +490,9 @@ public class FlowTaskService extends MybatisBaseService 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 paraMap = new HashMap<>(); List> ll = new ArrayList<>(); String startUserNameParams = ""; + String names = ""; for (BusinessTaskParam btq : params) { paraMap.put(btq.getField(), btq.getValue()); Map mapss = new HashMap<>(); @@ -708,7 +720,9 @@ public class FlowTaskService extends MybatisBaseService 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> businessFinishedListForApp(String userSid, List params, Integer pageNum, Integer pageSize) { - Page page = new Page<>(); Map paraMap = new HashMap<>(); + String names = ""; List> ll = new ArrayList<>(); for (BusinessTaskParam btq : params) { paraMap.put(btq.getField(), btq.getValue()); - Map 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> maps = baseMapper.finishedList(userSid, ll ,(pageNum-1)*pageSize,pageSize); + /* paraMap.put("page", (pageNum - 1) * pageSize); + paraMap.put("size", pageSize);*/ List> maps = baseMapper.finishedList1(paraMap); int count = baseMapper.finishedListCount(paraMap); - List hisTaskList = new ArrayList(); for (Map histTask : maps) { FlowTaskDto flowTask = new FlowTaskDto(); @@ -861,7 +878,6 @@ public class FlowTaskService extends MybatisBaseService 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 userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); + List 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 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> rb = new ResultBean>(); return rb.success().setData(page); } @@ -1954,6 +1968,7 @@ public class FlowTaskService extends MybatisBaseService> businessTodoListForApp(String userSid,String orgPath, List params, int pageNum, int pageSize) { Page page = new Page<>(); TaskQuery taskQuery = taskService.createTaskQuery(); + String names = ""; // 流程参数 Map paramMap = new HashMap<>(); // 挂载表单参数 @@ -1972,6 +1987,10 @@ public class FlowTaskService extends MybatisBaseService taskList = taskQuery.listPage(p, pageSize); + List taskList = taskQuery.listPage(p, pageSize);*/ + List taskList = taskQuery.list(); List flowList = new ArrayList<>(); for (Task task : taskList) { FlowTaskDto flowTask = new FlowTaskDto(); @@ -2055,9 +2075,26 @@ public class FlowTaskService extends MybatisBaseService0){ flowTask.setSysProUrlVo(listResultBean.getData().get(0)); } + if(processVariables.containsKey("orderNames")){ + flowTask.setProcDefName(processVariables.get("orderNames").toString()); + } flowList.add(flowTask); } - page.setRecords(flowList); + //对flowList进行筛选发起人====================== + List userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); + List 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 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> rb = new ResultBean>(); return rb.success().setData(page); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java index b3370cf21c..aedd2bece1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java +++ b/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; // 最新更新时间 + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index d1b089816b..f81f46d6a7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -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 vehicleList; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index 9bc6f30805..b455d4bc26 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -162,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; // 最新更新时间 } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index c1c01e8b35..976453807a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -221,6 +221,7 @@ public class ScmApplyInboundService extends MybatisBaseService 0) {