From 0e71029056b2809ec8dee77dee1414c4455d9764 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 14 Apr 2023 15:27:15 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdelivered/BusDeliveredService.java | 8 +- .../BusDeliveredApplyService.java | 108 +++++++++++++++++- .../BusDeliveredDetailsDiscountMapper.java | 2 + .../BusDeliveredDetailsDiscountMapper.xml | 12 +- .../BusDeliveredDetailsDiscountService.java | 6 +- 5 files changed, 123 insertions(+), 13 deletions(-) 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 156b18a24d..edb0351d4e 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 @@ -421,10 +421,10 @@ public class BusDeliveredService extends MybatisBaseService detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); finBillApplicationDto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); @@ -642,13 +648,51 @@ public class BusDeliveredApplyService extends MybatisBaseService discountList = busDeliveredDetailsDiscountService.selectByApplySid(busDeliveredApply.getSid()); + BusDiscountpackageHandoverDto busDiscountpackageHandoverDto = new BusDiscountpackageHandoverDto(); + //合同编号 + busDiscountpackageHandoverDto.setContractNo(busDeliveredApply.getContractNo()); + //车型名称 + busDiscountpackageHandoverDto.setVehModel(busDeliveredApply.getModelName()); + //出库台数 + busDiscountpackageHandoverDto.setVehCount(String.valueOf(detailsList.size())); + List vinList = detailsList.stream().map(v->v.getVinNo()).collect(Collectors.toList()); + String vins = String.join(",",vinList); + busDiscountpackageHandoverDto.setVins(vins); + busDiscountpackageHandoverDto.setRecUserSid(busDeliveredApply.getApplySid()); + busDiscountpackageHandoverDto.setCustomerName(busDeliveredApply.getName()); + busDiscountpackageHandoverDto.setRecName(busDeliveredApply.getApplyName()); + busDiscountpackageHandoverDto.setRecTime(new Date()); + //根据用户sid查询电话 + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getApplySid()); + if(sysUserVoResultBean.getData() != null){ + busDiscountpackageHandoverDto.setRecPhone(sysUserVoResultBean.getData().getMobile()); + } + busDiscountpackageHandoverDto.setBusSid(busDeliveredApply.getSid()); + busDiscountpackageHandoverDto.setCreateOrgSid(busDeliveredApply.getUseOrgSid()); + busDiscountpackageHandoverDto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid()); + if(sysOrganizationVoResultBean.getData() != null){ + busDiscountpackageHandoverDto.setCreateOrgName(sysOrganizationVoResultBean.getData().getName()); + busDiscountpackageHandoverDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } + List busDiscountpackageHandoverLists = new ArrayList<>(); + for (int i = 0; i < discountList.size(); i++) { + BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountList.get(i); + BusDiscountpackageHandoverListDto busDiscountpackageHandoverListDto = new BusDiscountpackageHandoverListDto(); + busDiscountpackageHandoverListDto.setPrice(new BigDecimal(busDeliveredDetailsDiscount.getPrice())); +// busDiscountpackageHandoverListDto. + } + } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); return rb.success().setData(resultBean.getData()); @@ -971,7 +1015,7 @@ public class BusDeliveredApplyService extends MybatisBaseService crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(customerSid); + if (crmCustomerTempResultBean.getData() != null) { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempResultBean.getData(); + BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage(); + busDeliveredUseMessage.setAddress(crmCustomerTempVo.getAddress()); + busDeliveredUseMessage.setName(crmCustomerTempVo.getName()); + busDeliveredUseMessage.setMobile(crmCustomerTempVo.getMobile()); + busDeliveredUseMessage.setIdNo(crmCustomerTempVo.getIDNumber()); + busDeliveredUseMessage.setCustomerType(crmCustomerTempVo.getCustomerType()); + busDeliveredUseMessage.setCustomerTypeKey(crmCustomerTempVo.getCustomerTypeKey()); + busDeliveredUseMessage.setApplySid(busDeliveredApply.getSid()); + busDeliveredUseMessage.setContacts(crmCustomerTempVo.getContacts()); + busDeliveredUseMessage.setIsConfirmRealBuyer("0"); + busDeliveredUseMessageService.insert(busDeliveredUseMessage); + busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid()); + } + + + } + if ("1".equals(busDeliveredApply.getTypeKey())) { + //贷款人的信息 + String loanSid = busDeliveredApply.getLoanSid(); + ResultBean crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(loanSid); + if (crmCustomerTempResultBean.getData() != null) { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempResultBean.getData(); + BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage(); + busDeliveredUseMessage.setAddress(crmCustomerTempVo.getAddress()); + busDeliveredUseMessage.setName(crmCustomerTempVo.getName()); + busDeliveredUseMessage.setMobile(crmCustomerTempVo.getMobile()); + busDeliveredUseMessage.setIdNo(crmCustomerTempVo.getIDNumber()); + busDeliveredUseMessage.setCustomerType(crmCustomerTempVo.getCustomerType()); + busDeliveredUseMessage.setCustomerTypeKey(crmCustomerTempVo.getCustomerTypeKey()); + busDeliveredUseMessage.setApplySid(busDeliveredApply.getSid()); + busDeliveredUseMessage.setContacts(crmCustomerTempVo.getContacts()); + busDeliveredUseMessage.setIsConfirmRealBuyer("0"); + busDeliveredUseMessageService.insert(busDeliveredUseMessage); + busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid()); + } + + } busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java index 8ddf7d3b85..69d145cad8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java @@ -32,4 +32,6 @@ public interface BusDeliveredDetailsDiscountMapper extends BaseMapper selectByApplySid(String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml index 42caaac0a2..eb607c51d6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml @@ -37,9 +37,17 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java index cdf66059f8..63d707b095 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java @@ -31,10 +31,14 @@ public class BusDeliveredDetailsDiscountService extends MybatisBaseService selectByApplySid(String sid) { + return baseMapper.selectByApplySid(sid); + } } From 3414b52388a1e7b6a889938814fe07098e6b8b6f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 14 Apr 2023 16:39:30 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 4 ++- .../ScmApplyInboundService.java | 32 ++++++++++--------- .../ScmVehicleExamineService.java | 14 +++++--- 3 files changed, 29 insertions(+), 21 deletions(-) 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 7590b56d2a..725b07664b 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 @@ -364,7 +364,9 @@ public class FinBillApplicationService extends MybatisBaseService finBillApplicationVos = baseMapper.selectByContractNo(contractNo); if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) { FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0); - entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney())); + if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){ + entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney())); + } } FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); BeanUtil.copyProperties(entity, vo); 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 1c772e1482..c1c01e8b35 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 @@ -199,26 +199,12 @@ public class ScmApplyInboundService extends MybatisBaseService saveOrUpdateApplyInBound(ScmApplyInboundDto dto) { List scmFiles = dto.getScmFiles(); - List vehicleList = dto.getVehicleList(); - if (vehicleList.size() == 0) { - return new ResultBean().fail().setMsg("车辆列表不能为空"); - } - for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) { - String vinNo = scmApplyInboundVehicleDto.getVinNo(); - vinNo = vinNo.trim(); - vinNo = vinNo.replace(" ",""); - if (vinNo.length() != 17){ - if (vinNo.length() != 8){ - return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo()+"车架号输入不正确"); - } - } - } String orgPath = ""; if (StringUtils.isNotBlank(dto.getOrgPath())) { orgPath = dto.getOrgPath(); } else { SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getOrgSid()).getData(); - if (sysOrganizationVo != null){ + if (sysOrganizationVo != null) { orgPath = sysOrganizationVo.getOrgSidPath(); } /*//根据用户sid获取staffSid @@ -262,6 +248,22 @@ public class ScmApplyInboundService extends MybatisBaseService vehicleList = dto.getVehicleList(); + if (vehicleList == null) { + return new ResultBean().fail().setMsg("车辆列表不能为空"); + } + for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) { + if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo())) { + String vinNo = scmApplyInboundVehicleDto.getVinNo(); + vinNo = vinNo.trim(); + vinNo = vinNo.replace(" ", ""); + if (vinNo.length() != 17) { + if (vinNo.length() != 8) { + return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确"); + } + } + } + } List vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); // 采购订单下线日期一旦维护，二次确认，则不能修改 TODO // 验证填写的车架号是否重复 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index d638352699..d7fff972b9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -551,11 +551,15 @@ public class ScmVehicleExamineService extends MybatisBaseService Date: Fri, 14 Apr 2023 17:08:43 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finbillapplication/FinBillApplicationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 725b07664b..6b38d6f853 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 @@ -373,7 +373,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); vo.setFinBillVehicles(finBillVehicleVos); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); - if (finBillTrailerVos.size() > 0) { + if (finBillTrailerVos != null) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); From c0c3d94a9116520559300a3555b7768b1ec20ac9 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 14 Apr 2023 17:16:17 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppDeliveredDetailsQuery.java | 1 + .../busdelivered/AppDeliveredDetailsVo.java | 3 +- .../api/busdelivered/BusDeliveredQuery.java | 4 +- .../api/busdelivered/BusDeliveredVo.java | 2 + .../biz/busdelivered/BusDeliveredService.java | 48 ++++++------------- .../BusDeliveredApplyMapper.xml | 7 ++- .../BusDeliveredApplyService.java | 32 ++++++++----- .../retrieval/DeliveredDetailsVo.java | 12 +++++ 8 files changed, 59 insertions(+), 50 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java index b4c683cfb3..bfad2740f2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsQuery.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.List; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index e87dbab4a2..29e1900ec9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -73,7 +73,8 @@ public class AppDeliveredDetailsVo implements Vo { @ApiModelProperty(value = "任务id") private String taskId; - + @ApiModelProperty("销售专员sid") + private String pcStaffSid; @ApiModelProperty("PC发起人") private String pcApplyName; @ApiModelProperty("PC发起人sid") 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 c9646258de..c1359f5ea3 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 @@ -61,7 +61,7 @@ public class BusDeliveredQuery implements Query { private String vinNo; @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("车架号集合") - private List vinNoList; + @ApiModelProperty("车辆sid集合") + private List vinSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java index bb96fa8ef2..aa7d4fcc45 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java @@ -66,6 +66,8 @@ public class BusDeliveredVo implements Vo { private String busVinSid; @ApiModelProperty("车辆sid") private String vinSid; + @ApiModelProperty("销售类型") + private String paymentMethod; /* @ApiModelProperty(value = "联系电话") private String mobile; @ApiModelProperty(value = "证件号码") 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 edb0351d4e..edd21b9f65 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 @@ -122,38 +122,6 @@ public class BusDeliveredService extends MybatisBaseService createQueryWrapper(BusDeliveredQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - if (query != null) { - //合同编号 - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bd.contractNo", query.getContractNo()); - } - //客户名称 - if (StringUtils.isNotBlank(query.getName())) { - qw.like("bd.name", query.getName()); - } - //车架号 - if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("bd.vinNo", query.getVinNo()); - } - //车架号集合 - if (query.getVinNoList().size() > 0) { - qw.notIn("bd.vinNo", query.getVinNoList()); - } - //待出库：1，出库申请：0 - qw.eq("bd.state", 1); - - } - return qw; - } - /** * 待出库车辆分页列表 * @@ -177,8 +145,8 @@ public class BusDeliveredService extends MybatisBaseService 0) { - qw.notIn("bv.linkNo", query.getVinNoList()); + if (query.getVinSid().size() > 0) { + qw.notIn("bv.linkSid", query.getVinSid()); } //待出库：1，出库申请：0 qw.eq("bd.state", 1); @@ -299,6 +267,7 @@ public class BusDeliveredService extends MybatisBaseService> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0"); List dictCommonVoList = listResultBean.getData(); List voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList()); + if("1".equals(appOrderDetailsVo.getPayTypeKey())){//贷款 + voList.remove(1); + } appDeliveredDetailsVo.setBuyerType(voList); //中介人 SubmitVo intermediary1 = appOrderDetailsVo.getIntermediary1(); @@ -422,6 +394,11 @@ public class BusDeliveredService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + appDeliveredDetailsVo.setPcStaffSid(userVoResultBean.getData().getStaffSid()); appDeliveredDetailsVo.setUserSid(busDeliveredApply.getApplySid()); appDeliveredDetailsVo.setOrgPath(busDeliveredApply.getOrgSidPath()); appDeliveredDetailsVo.setSid(query.getOutboundSid()); @@ -494,6 +471,9 @@ public class BusDeliveredService extends MybatisBaseService> listResultBean = dictCommonFeign.getTypeValues("buyerType", "0"); List dictCommonVoList = listResultBean.getData(); List voList = Optional.ofNullable(dictCommonVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), DeliveredDictVo.class)).collect(Collectors.toList()); + if("1".equals(busDeliveredApply.getPaymentMethodKey())){//全款 + voList.remove(1); + } appDeliveredDetailsVo.setBuyerType(voList); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 3e84f5edf2..161b83a0f0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -11,9 +11,12 @@ bd.taskId, bd.procInstId, bd.procDefId, - DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate, + DATE_FORMAT(bd.createTime, '%Y-%m-%d') as applyDate, bd.applyName, - bd.modelName + bd.modelName, + bd.billNo, + bd.paymentMethod, + (select count(*) from bus_delivered_apply_details bad where bad.applySid = bd.sid) as num FROM bus_delivered_apply bd ${ew.sqlSegment} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index d14f1596aa..dda8cba305 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -55,12 +55,14 @@ import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpac import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService; import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; +import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto; @@ -154,6 +156,8 @@ public class BusDeliveredApplyService extends MybatisBaseService vinList = detailsList.stream().map(v->v.getVinNo()).collect(Collectors.toList()); - String vins = String.join(",",vinList); + List vinList = detailsList.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); + String vins = String.join(",", vinList); busDiscountpackageHandoverDto.setVins(vins); busDiscountpackageHandoverDto.setRecUserSid(busDeliveredApply.getApplySid()); busDiscountpackageHandoverDto.setCustomerName(busDeliveredApply.getName()); @@ -674,18 +678,18 @@ public class BusDeliveredApplyService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getApplySid()); - if(sysUserVoResultBean.getData() != null){ + if (sysUserVoResultBean.getData() != null) { busDiscountpackageHandoverDto.setRecPhone(sysUserVoResultBean.getData().getMobile()); } busDiscountpackageHandoverDto.setBusSid(busDeliveredApply.getSid()); busDiscountpackageHandoverDto.setCreateOrgSid(busDeliveredApply.getUseOrgSid()); busDiscountpackageHandoverDto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid()); - if(sysOrganizationVoResultBean.getData() != null){ + if (sysOrganizationVoResultBean.getData() != null) { busDiscountpackageHandoverDto.setCreateOrgName(sysOrganizationVoResultBean.getData().getName()); busDiscountpackageHandoverDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); } - List busDiscountpackageHandoverLists = new ArrayList<>(); + List busDiscountpackageHandoverLists = new ArrayList<>(); for (int i = 0; i < discountList.size(); i++) { BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountList.get(i); BusDiscountpackageHandoverListDto busDiscountpackageHandoverListDto = new BusDiscountpackageHandoverListDto(); @@ -1062,12 +1066,10 @@ public class BusDeliveredApplyService extends MybatisBaseService carList = dto.getCarList(); if (!carList.isEmpty()) { + //判断合同编号是否一致 + for (int a = 0; a < carList.size(); a++) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractId(), carList.get(a).getVinSid()); + if (busSalesOrderVehicle == null) { + return rb.setMsg("所选车辆与合同编号不匹配"); + } + } + //判断已经选择的车辆是否已经提交 List vinSid = carList.stream().map(AppCarListVo::getVinSid).collect(Collectors.toList()); List vinNoList = baseMapper.selectVinNo(dto.getContractId(), vinSid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java index 6c9ff8c4e0..90eb5febc9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java @@ -26,6 +26,18 @@ public class DeliveredDetailsVo implements Vo { @ApiModelProperty("销售部门") @JsonProperty("sellerDept") private String staffDeptName; + @ApiModelProperty("销售专员sid") + @JsonProperty("staffSid") + private String pcStaffSid; + @ApiModelProperty("PC发起人sid") + @JsonProperty("applySid") + private String pcApplySid; + @ApiModelProperty("PC发起人部门") + @JsonProperty("applyDept") + private String pcApplyDept; + @JsonProperty("applyDeptSid") + @ApiModelProperty("PC发起人部门sid") + private String pcApplyDeptSid; @ApiModelProperty("销售专员") @JsonProperty("sellerName") From fb06ea73361f1e17b3d454a167fe894729ee6d96 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 14 Apr 2023 17:53:43 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=BE=85=E5=87=86=E5=A4=87=E4=BC=98=E6=83=A0=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busdeliveredapply/BusDeliveredApplyService.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index dda8cba305..c443f20562 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -60,6 +60,7 @@ import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService; import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService; +import com.yxt.anrui.buscenter.biz.busdiscountpackagehandover.BusDiscountpackageHandoverService; import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; @@ -158,6 +159,8 @@ public class BusDeliveredApplyService extends MybatisBaseService Date: Mon, 17 Apr 2023 09:28:29 +0800 Subject: [PATCH 06/15] =?UTF-8?q?PC=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdelivered/BusDeliveredService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 edd21b9f65..fbaa0604cc 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 @@ -398,6 +398,11 @@ public class BusDeliveredService extends MybatisBaseService carList = new ArrayList<>(); List detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid()); From 95bbe1e3a45750a341c636eb4a7fe2f789d2e254 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 17 Apr 2023 10:28:01 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/flowtask/FlowTaskService.java | 43 ------------------- 1 file changed, 43 deletions(-) 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 74721b3bf1..acc5389e06 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 @@ -525,7 +525,6 @@ public class FlowTaskService extends MybatisBaseService taskList = taskQuery.listPage(p, pageSize); List flowList = new ArrayList<>(); for (Task task : taskList) { - FlowTaskDto flowTask = new FlowTaskDto(); Map processVariables = task.getProcessVariables(); flowTask.setProcessVariables(processVariables); @@ -579,13 +578,6 @@ public class FlowTaskService extends MybatisBaseService> variablesMap = getAppOrPcVariables(flowTask); -// flowTask.setAppVariables(variablesMap.get("appVariables")); -// // 设置pc端参数 -// flowTask.setPcVariables(variablesMap.get("pcVariables")); - flowList.add(flowTask); } page.setRecords(flowList); @@ -695,13 +687,11 @@ public class FlowTaskService extends MybatisBaseService> businessFinishedList(String userSid, List params, Integer pageNum, Integer pageSize) { - Page page = new Page<>(); Map paraMap = new HashMap<>(); 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", "="); @@ -713,22 +703,14 @@ public class FlowTaskService extends MybatisBaseService> maps = baseMapper.finishedList(userSid, ll ,(pageNum-1)*pageSize,pageSize); List> maps = baseMapper.finishedList1(paraMap); int count = baseMapper.finishedListCount(paraMap); - List hisTaskList = new ArrayList(); for (Map histTask : maps) { FlowTaskDto flowTask = new FlowTaskDto(); @@ -751,47 +733,22 @@ public class FlowTaskService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); - // ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId()); if(sysUserVoResultBean.getData()!=null){ flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); - /*ResultBean pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid()); - String ogrName=""; - if(pathSidByUserSid.getData()!=null){ - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData()); - ogrName=sysOrganizationVoResultBean.getData().getName(); - } - flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());*/ } - // 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_"); From 589853104c8dceb43d9370be4d19b30401f0b505 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 17 Apr 2023 13:34:17 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBillApplicationIInfoVo.java | 4 + .../FinBillApplicationService.java | 9 +- .../invoiced/BillApplicationIInfoDto.java | 133 ++++++----------- .../invoiced/BillApplicationIInfoVo.java | 137 ++++++------------ .../invoiced/FinBillTrailerVo.java | 6 - .../api/autoservice/invoiced/VinListDto.java | 27 +--- .../api/autoservice/invoiced/VinListVo.java | 26 +--- .../autoservice/invoiced/InvoicedService.java | 38 +++-- .../销售订单审批下载模板/xsddsp.ftl | 88 +++++------ 9 files changed, 181 insertions(+), 287 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java index e5d1e3e837..b4b597dc68 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.fin.api.finbillapplication; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -41,6 +42,9 @@ public class AppBillApplicationIInfoVo implements Vo { @ApiModelProperty("车辆集合") private List vinList; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("开票状态") private String billState; 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 6b38d6f853..368907d34e 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 @@ -225,6 +225,13 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); vo.setFinBillVehicles(finBillVehicleVos); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); - if (finBillTrailerVos != null) { + if (finBillTrailerVos != null && finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java index 5c22a011a7..74854edba1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java @@ -11,115 +11,64 @@ import java.util.List; public class BillApplicationIInfoDto implements Dto { private static final long serialVersionUID = -3912119646277339550L; - @ApiModelProperty("业务sid") private String sid; - - @ApiModelProperty("用户sid") - @JsonProperty("userSid") - private String userSid; - - @ApiModelProperty("合同编号") - @JsonProperty("contractId") - private String contractNo; - - @ApiModelProperty("开票总价") - @JsonProperty("invoiceTotal") - private String totalBillMoney; - - @ApiModelProperty("单台开票价") - @JsonProperty("invoiceMoney") - private String oneBillMoney; - - @ApiModelProperty("客户名称") - @JsonProperty("customer") - private String customerName; - + @ApiModelProperty(value = "销售类型value") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty(value = "销售部门名称") + private String sellerDept; + @ApiModelProperty(value = "销售专员名称") + private String sellerName; @ApiModelProperty("申请日期") - @JsonProperty("date") - private String applyDate; - - @ApiModelProperty("备注") - private String remarks; - + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty(value = "开票单位名称") + private String invoicingUnit; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; @ApiModelProperty("车辆集合") private List vinList; - + @ApiModelProperty("开票总价") + private String invoiceTotal; @ApiModelProperty("开票状态") - @JsonProperty("invoiceState") - private String billState; // 开票状态 - + private String invoiceState; @ApiModelProperty("开票状态") - @JsonProperty("invoiceStateKey") - private String billStateKey;// 开票状态key - + private String invoiceStateKey; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("证件") + private List idCardImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; - @ApiModelProperty("车辆登记合同") private List registerContractImages; - - @ApiModelProperty("开票信息确认书") + @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; - @ApiModelProperty("任务id") private String taskId; - + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; @ApiModelProperty("流程实列id") - @JsonProperty("procInsId") - private String procInstSid; - + private String procInsId; @ApiModelProperty("合同sid") - @JsonProperty("contractSid") private String contractSid; - - @ApiModelProperty("发起人姓名") - private String createByName; - @ApiModelProperty(value = "发起部门sid") - private String deptSid; - @ApiModelProperty(value = "发起部门名称") - private String deptName; - @ApiModelProperty(value = "销售专员sid") - private String staffSid; - @ApiModelProperty(value = "销售专员名称") - private String staffName; - @ApiModelProperty(value = "销售部门sid") - private String saleDeptSid; - @ApiModelProperty(value = "销售部门名称") - private String saleDeptName; - @ApiModelProperty(value = "销售类型key") - private String saleTypeKey; - @ApiModelProperty(value = "销售类型value") - private String saleTypeValue; - @ApiModelProperty(value = "开票单位sid") - private String openTickUnitSid; - @ApiModelProperty(value = "开票单位名称") - private String openTickUnitName; - @ApiModelProperty(value = "是否领取发票原件") - private String isLQOrigInvoice; - @ApiModelProperty(value = "开票类型key") - private String openTickTypeKey; - @ApiModelProperty(value = "开票类型value") - private String openTickTypeValue; - @ApiModelProperty(value = "开票名称sid") - private String openTickSid; - @ApiModelProperty(value = "开票名称") - private String openTickName; - @ApiModelProperty(value = "欠款金额") - private String arrearsMoney; - @ApiModelProperty(value = "承诺回款日期") - private String returnedMoneyDate; - @ApiModelProperty(value = "欠款开票原因key") - private String arrearsOpenYYKey; - @ApiModelProperty(value = "欠款开票原因value") - private String arrearsOpenYYValue; - @ApiModelProperty("车型sid") - private String modelSid; // 车型sid - @ApiModelProperty("车型名称") - private String modelName; // 车型名称 + @ApiModelProperty("合同编号") + private String contractId; @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("开票挂车信息") - private List finBillTrailers; // 开票挂车信息 - + @ApiModelProperty("是否可以编辑开票价") + private Boolean isCanEdit; // 是否可以编辑开票价 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index 5cf69b745c..746dca2938 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -13,117 +13,62 @@ public class BillApplicationIInfoVo implements Vo { @ApiModelProperty("业务sid") private String sid; - - @ApiModelProperty("用户sid") - @JsonProperty("userSid") - private String createBySid; - - @ApiModelProperty("合同编号") - @JsonProperty("contractId") - private String contractNo; - - @ApiModelProperty("开票总价") - @JsonProperty("invoiceTotal") - private String totalBillMoney; - - @ApiModelProperty("单台开票价") - @JsonProperty("invoiceMoney") - private String oneBillMoney; - - @ApiModelProperty("客户名称") - @JsonProperty("customer") - private String customerName; - + @ApiModelProperty(value = "销售类型value") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty(value = "销售部门名称") + private String sellerDept; + @ApiModelProperty(value = "销售专员名称") + private String sellerName; @ApiModelProperty("申请日期") - @JsonProperty("date") - private String applyDate; - - @ApiModelProperty("备注") - private String remarks; - + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty(value = "开票单位名称") + private String invoicingUnit; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; @ApiModelProperty("车辆集合") private List vinList; - + @ApiModelProperty("开票总价") + private String invoiceTotal; @ApiModelProperty("开票状态") - @JsonProperty("invoiceState") - private String billState; - + private String invoiceState; @ApiModelProperty("开票状态") - @JsonProperty("invoiceStateKey") - private String billStateKey; - + private String invoiceStateKey; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("证件") + private List idCardImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; - @ApiModelProperty("车辆登记合同") private List registerContractImages; - - @ApiModelProperty("开票信息确认书") + @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; - @ApiModelProperty("任务id") - @JsonProperty("") private String taskId; - + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; @ApiModelProperty("流程实列id") - @JsonProperty("procInsId") - private String procInstId; - + private String procInsId; @ApiModelProperty("合同sid") - @JsonProperty("contractSid") private String contractSid; - - @ApiModelProperty("是否能填写开票价") - private Boolean canEdit; - - - @ApiModelProperty("发起人姓名") - private String createByName; - @ApiModelProperty(value = "发起部门sid") - private String deptSid; - @ApiModelProperty(value = "发起部门名称") - private String deptName; - @ApiModelProperty(value = "销售专员sid") - private String staffSid; - @ApiModelProperty(value = "销售专员名称") - private String staffName; - @ApiModelProperty(value = "销售部门sid") - private String saleDeptSid; - @ApiModelProperty(value = "销售部门名称") - private String saleDeptName; - @ApiModelProperty(value = "销售类型key") - private String saleTypeKey; - @ApiModelProperty(value = "销售类型value") - private String saleTypeValue; - @ApiModelProperty(value = "开票单位sid") - private String openTickUnitSid; - @ApiModelProperty(value = "开票单位名称") - private String openTickUnitName; - @ApiModelProperty(value = "是否领取发票原件") - private String isLQOrigInvoice; - @ApiModelProperty(value = "开票类型key") - private String openTickTypeKey; - @ApiModelProperty(value = "开票类型value") - private String openTickTypeValue; - @ApiModelProperty(value = "开票名称sid") - private String openTickSid; - @ApiModelProperty(value = "开票名称") - private String openTickName; - @ApiModelProperty(value = "欠款金额") - private String arrearsMoney; - @ApiModelProperty(value = "承诺回款日期") - private String returnedMoneyDate; - @ApiModelProperty(value = "欠款开票原因key") - private String arrearsOpenYYKey; - @ApiModelProperty(value = "欠款开票原因value") - private String arrearsOpenYYValue; - @ApiModelProperty("车型sid") - private String modelSid; // 车型sid - @ApiModelProperty("车型名称") - private String modelName; // 车型名称 + @ApiModelProperty("合同编号") + private String contractId; @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("开票挂车信息") - private List finBillTrailers; // 开票挂车信息 - + @ApiModelProperty("是否可以编辑开票价") + private Boolean isCanEdit; // 是否可以编辑开票价 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java index e75ee24b66..e4fd67d221 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java @@ -48,10 +48,6 @@ import lombok.Data; @ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象") public class FinBillTrailerVo implements Vo { - private String sid; // sid - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 @ApiModelProperty("主车车架号") private String vinNo; // 主车车架号 @ApiModelProperty("挂车车架号") @@ -60,8 +56,6 @@ public class FinBillTrailerVo implements Vo { private String billTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billTypeValue; // 开票类型value - @ApiModelProperty("开票名称sid") - private String openTickSid; // 开票名称sid @ApiModelProperty("开票名称") private String openTickName; // 开票名称 @ApiModelProperty("开票申请单sid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java index 677815a943..78ed96172f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java @@ -10,28 +10,17 @@ public class VinListDto implements Dto { private static final long serialVersionUID = 1941205415631089700L; @ApiModelProperty("车架号") - @JsonProperty("vin") - private String VIN; - - @ApiModelProperty("开票名称") - private String invoiceName; - - @ApiModelProperty("开票名称") - private String invoiceNameKey; - + private String vin; @ApiModelProperty("开票类型") - @JsonProperty("invoiceType") - private String billTypeValue; - + private String invoiceTypeKey; @ApiModelProperty("开票类型") - @JsonProperty("invoiceTypeKey") - private String billTypeKey; - - + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; // 开票信息 @ApiModelProperty("合格证状态key") private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") - private String certificateStateValue; // 合格证状态value - @ApiModelProperty("开票信息") - private String openTickRemarks; // 开票信息 + private String certificateState; // 合格证状态value } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java index 4edfb2030c..539f57a1a3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java @@ -11,27 +11,17 @@ public class VinListVo implements Vo { private static final long serialVersionUID = -8613016702728614645L; @ApiModelProperty("车架号") - @JsonProperty("vin") - private String VIN; - - @ApiModelProperty("开票名称") - private String invoiceName; - - @ApiModelProperty("开票名称") - private String invoiceNameKey; - + private String vin; @ApiModelProperty("开票类型") - @JsonProperty("invoiceType") - private String billTypeValue; - + private String invoiceTypeKey; @ApiModelProperty("开票类型") - @JsonProperty("invoiceTypeKey") - private String billTypeKey; - + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; // 开票信息 @ApiModelProperty("合格证状态key") private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") - private String certificateStateValue; // 合格证状态value - @ApiModelProperty("开票信息") - private String openTickRemarks; // 开票信息 + private String certificateState; // 合格证状态value } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 8edbb6d062..1cfd9b66a1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON; import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; import com.yxt.anrui.fin.api.finbillapplication.*; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery; @@ -58,6 +60,8 @@ public class InvoicedService { private SysUserFeign sysUserFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; public ResultBean> getInvoicedApplyList(PagerQuery pagerQuery) { @@ -80,19 +84,20 @@ public class InvoicedService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); - vo.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); for (FinBillVehicleVo finBillVehicle : finBillVehicles) { VinListVo vinListVo = new VinListVo(); - vinListVo.setVIN(finBillVehicle.getVinNo()); + vinListVo.setVin(finBillVehicle.getVinNo()); vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey()); - vinListVo.setCertificateStateValue(finBillVehicle.getCertificateStateValue()); - vinListVo.setBillTypeKey(finBillVehicle.getBillTypeKey()); - vinListVo.setBillTypeValue(finBillVehicle.getBillTypeValue()); + vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue()); + vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey()); + vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue()); vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); - vinListVo.setOpenTickRemarks(finBillVehicle.getOpenTickRemarks()); + vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVos.add(vinListVo); } vo.setVinList(vinListVos); @@ -129,6 +134,14 @@ public class InvoicedService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } + BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + vo.setIsCanEdit(false); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + }else { + vo.setIsCanEdit(true); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + } return rb.success().setData(vo); } @@ -136,18 +149,21 @@ public class InvoicedService { FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); BeanUtil.copyProperties(dto, finBillApplicationDto); finBillApplicationDto.setCreateBySid(dto.getUserSid()); + String publishInfo = dto.getPublishInfo(); + finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-"))); + finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-"))); //开票车辆信息 List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (VinListDto vinListDto : vinList) { FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); - finBillVehicleDto.setVinNo(vinListDto.getVIN()); + finBillVehicleDto.setVinNo(vinListDto.getVin()); finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); - finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateStateValue()); - finBillVehicleDto.setBillTypeKey(vinListDto.getBillTypeKey()); - finBillVehicleDto.setBillTypeValue(vinListDto.getBillTypeValue()); + finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); + finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); + finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); - finBillVehicleDto.setOpenTickRemarks(vinListDto.getOpenTickRemarks()); + finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); finBillVehicleDtos.add(finBillVehicleDto); } finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos); diff --git a/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl b/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl index 36f326f7da..891300ea53 100644 --- a/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl +++ b/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl @@ -2506,50 +2506,6 @@ - <#list photoPath64 as photo> - - - - - - - - - - - - - - - - - - - - - - - - - - - ${photo} - - - - - - - - - - - - - - @@ -2697,6 +2653,50 @@ + <#list photoPath64 as photo> + + + + + + + + + + + + + + + + + + + + + + + + + + + ${photo} + + + + + + + + + + + + + + From eebbfbc2060d4094dc1389e4d688e088ccd15ef6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 17 Apr 2023 13:48:41 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finbillapplication/FinBillApplicationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 368907d34e..b6891455dc 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 @@ -380,7 +380,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); vo.setFinBillVehicles(finBillVehicleVos); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); - if (finBillTrailerVos != null && finBillTrailerVos.size() > 0) { + if (finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); From bf147385c22198bce25da8ad203da106641444b8 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 17 Apr 2023 14:07:54 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/finbillapplication/FinBillApplicationService.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 b6891455dc..04ad349587 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 @@ -344,6 +344,13 @@ public class FinBillApplicationService extends MybatisBaseService Date: Mon, 17 Apr 2023 14:12:40 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) 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 04ad349587..f9a1477245 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 @@ -753,12 +753,12 @@ public class FinBillApplicationService extends MybatisBaseService Date: Mon, 17 Apr 2023 14:19:44 +0800 Subject: [PATCH 12/15] =?UTF-8?q?PC=E7=AB=AF=E5=BE=85=E5=8A=9E=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/flowtask/FlowTaskController.java | 5 -- .../flowable/biz/flowtask/FlowTaskMapper.xml | 2 +- .../biz/flowtask/FlowTaskService.java | 57 ++++++++++++------- .../portal/api/flow/FlowTaskAllQuery.java | 4 ++ .../anrui/portal/biz/flow/FlowableRest.java | 10 ++-- .../portal/biz/flow/FlowableService.java | 18 ++++-- 6 files changed, 58 insertions(+), 38 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java index cfec6f944b..1314912fb8 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java @@ -89,11 +89,6 @@ public class FlowTaskController implements FlowTaskFeign { int size = Integer.valueOf(businessTaskQuery.getSize() + ""); int current = Integer.valueOf(businessTaskQuery.getCurrent() + ""); List fields = businessTaskQuery.getParams().getFields(); - /* AtomicReference orgPath= new AtomicReference<>(""); - fields.forEach(f->{ - if(f.getField().equals(BusinessVariables.ORGPATH)) - orgPath.set(f.getValue()); - });*/ String orgPath=null; for(BusinessTaskParam b: fields){ if(b.getField().equals(BusinessVariables.ORGPATH)) { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index e048fde156..e392111903 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) flow GROUP BY flow.PROC_INST_ID_ ORDER BY flow.START_TIME_ DESC - LIMIT #{page},#{size} +