From d1fef78fe37fb25d6667c76b76e0c34cdfd88657 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 10 May 2023 10:12:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=85=A8=E6=AC=BE=E8=AE=A4=E6=AC=BE?= =?UTF-8?q?=E6=97=B6=E4=B8=B4=E6=97=B6=E8=BD=A6=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 11 ++++++++++- .../FinCollectionConfirmationService.java | 4 ++++ .../FinUncollectedReceivablesDetailedService.java | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) 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 1272e843a3..6c708e8970 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 @@ -4779,6 +4779,15 @@ public class BusSalesOrderService extends MybatisBaseService discountList = appOrderDetailsVo.getDiscountList(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0de30b1ae6..88a4c04499 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1117,6 +1117,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Wed, 10 May 2023 10:48:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 1 + 1 file changed, 1 insertion(+) 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 9c90c805cc..b2a425caed 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 @@ -724,6 +724,7 @@ public class BusDeliveredApplyService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getApplySid()); if (sysUserVoResultBean.getData() != null) { From 8d07e8790119309b40ca4bf09880a768b08b730f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 10 May 2023 10:52:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleAppendixFeign.java | 8 +++ .../BaseVehicleAppendixRest.java | 9 +++ .../api/finbillvehicle/FinBillVehicleVo.java | 5 ++ .../FinBillApplicationService.java | 65 ++++++++++--------- .../advanceInvoice/AdvanceInvoiceInfoVo.java | 8 ++- .../AppBusAdvanceGinvoiceapplyService.java | 9 +++ 6 files changed, 71 insertions(+), 33 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleappendix/BaseVehicleAppendixFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleappendix/BaseVehicleAppendixFeign.java index 4832f147a7..858f13e29a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleappendix/BaseVehicleAppendixFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleappendix/BaseVehicleAppendixFeign.java @@ -6,6 +6,9 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * @Author dimengzhe @@ -23,4 +26,9 @@ public interface BaseVehicleAppendixFeign { @ApiImplicitParam(name = "fullPath", value = "文件全路径", required = true, dataTypeClass = String.class) @PostMapping("/deleteFilesOss") ResultBean deleteFilesOss(@RequestParam(value = "fullPath") String fullPath); + + @ApiOperation(value = "查询车辆合格证照片") + @PostMapping("/selectBySid") + @ResponseBody + ResultBean> selectBySid(@RequestParam("sid") String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixRest.java index 2cf8cb191f..8cfdfdfc13 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixRest.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.io.File; +import java.util.List; /** * @Author dimengzhe @@ -46,4 +47,12 @@ public class BaseVehicleAppendixRest implements BaseVehicleAppendixFeign { } return rb.success().setMsg("移除成功"); } + + @Override + public ResultBean> selectBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + String path = fileUploadComponent.getUrlPrefix(); + List clhgzImages = baseVehicleAppendixService.selectBySid("0002", sid, path); + return rb.success().setData(clhgzImages); + } } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java index 16c7a5be84..8e0075599d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-fin(开票申请管理)
* File: FinBillVehicleVo.java
@@ -83,4 +85,7 @@ public class FinBillVehicleVo implements Vo { private String certificateStateValue; // 合格证状态value @ApiModelProperty("开票信息") private String openTickRemarks; // 开票信息 + + @ApiModelProperty("合格证图片") + private List certificatePhoto; // 合格证图片 } 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 5d0a94fdcf..dd086782fc 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 @@ -40,6 +40,9 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; @@ -164,6 +167,10 @@ public class FinBillApplicationService extends MybatisBaseService createQueryWrapper(FinBillApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -242,21 +249,14 @@ public class FinBillApplicationService extends MybatisBaseService list = data.getList(); + for (TrailerVo trailerVo : list) { FinBillTrailer finBillTrailer = new FinBillTrailer(); - BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); + finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo()); + finBillTrailer.setVinNo(finBillVehicleDto.getVinNo()); finBillTrailer.setBillAppSid(finBillApplication.getSid()); - for (FinBillVehicleDto finBillVehicle : finBillVehicles) { - if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) { - finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey()); - finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue()); - finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid()); - finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName()); - } - } finBillTrailerService.save(finBillTrailer); } } @@ -367,7 +367,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData(); + List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + finBillVehicleVo.setCertificatePhoto(clhgeImages); + } vo.setFinBillVehicles(finBillVehicleVos); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); if (finBillTrailerVos.size() > 0) { @@ -1346,7 +1351,7 @@ public class FinBillApplicationService extends MybatisBaseService kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = query.getZjApplicationAppendxs(); - if (zjApplicationAppendxs.size() == 0){ + if (zjApplicationAppendxs.size() == 0) { return rb.setMsg("证件不能为空"); } - if (khkpsqsApplicationAppendxs.size() == 0){ + if (khkpsqsApplicationAppendxs.size() == 0) { return rb.setMsg("客户开票申请书不能为空"); } FinBillApplication finBillApplication = fetchBySid(businessSid); @@ -2139,9 +2144,9 @@ public class FinBillApplicationService extends MybatisBaseService fjApplicationAppendxs = query.getFjApplicationAppendxs(); - if (fjApplicationAppendxs.size() == 0){ + if (fjApplicationAppendxs.size() == 0) { return rb.setMsg("附件不能为空"); } FinBillApplication finBillApplication = fetchBySid(businessSid); @@ -2692,10 +2697,10 @@ public class FinBillApplicationService extends MybatisBaseService kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = query.getZjApplicationAppendxs(); - if (zjApplicationAppendxs.size() == 0){ + if (zjApplicationAppendxs.size() == 0) { return rb.setMsg("证件不能为空"); } - if (khkpsqsApplicationAppendxs.size() == 0){ + if (khkpsqsApplicationAppendxs.size() == 0) { return rb.setMsg("客户开票申请书不能为空"); } FinBillApplication finBillApplication = fetchBySid(businessSid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index a9cef62209..91dcec2eff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -52,6 +52,8 @@ public class AdvanceInvoiceInfoVo implements Vo { private String reasonValue; @ApiModelProperty("原因备注") private String remarks; + @ApiModelProperty("领票欠款原因（拼接）") + private String reasonRemarks; @ApiModelProperty("欠款开票挂车信息") private List finBillTrailers; @ApiModelProperty("附件") @@ -73,7 +75,7 @@ public class AdvanceInvoiceInfoVo implements Vo { @ApiModelProperty("合同编号") private String contractId; @ApiModelProperty("单据编号") - private String billNo; // 单据编号 + private String billNo; @ApiModelProperty("任务id") private String taskId; @ApiModelProperty("流程实列id") @@ -81,9 +83,9 @@ public class AdvanceInvoiceInfoVo implements Vo { @ApiModelProperty("流程状态") private String nodeState; @ApiModelProperty("车型sid") - private String modelSid; // 车型sid + private String modelSid; @ApiModelProperty("车型名称") - private String modelName; // 车型名称 + private String modelName; @ApiModelProperty("提前领取发票原件原因") private String reason; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 211aacf86c..6afa26f681 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -224,6 +224,15 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setModelSid(finBillApplicationDetailsVo.getModelSid()); vo.setModelName(finBillApplicationDetailsVo.getModelName()); vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); + String reasonValue = vo.getReasonValue(); + String remarks = vo.getRemarks(); + String reasonRemarks = ""; + if (StringUtils.isNotBlank(remarks)){ + reasonRemarks = reasonValue + " \n" + remarks; + }else { + reasonRemarks = reasonValue; + } + vo.setReasonRemarks(reasonRemarks); //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); From ae424f7fac1ebcabdd45c8612887f768e6beb925 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 10 May 2023 11:18:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/finbillapplication/FinBillApplicationService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 dd086782fc..65582f74be 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 @@ -417,8 +417,10 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData(); - List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); - finBillVehicleVo.setCertificatePhoto(clhgeImages); + if (baseVehicleCertificateVo != null){ + List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + finBillVehicleVo.setCertificatePhoto(clhgeImages); + } } vo.setFinBillVehicles(finBillVehicleVos); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); From 85e552c7cddf1fc4b5b600157ba25315f0798862 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 10 May 2023 14:00:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/autoservice/retrieval/AppBusDeliveredApplyService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 1457f87886..1317ea81d7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -463,6 +463,7 @@ public class AppBusDeliveredApplyService { } deliveredTralierVo.setHandCarInfo(handCarInfo); + deliveredTralierVo.setTitles(titles); return rb.success().setData(deliveredTralierVo); } From 37b194095e50eb561cad2587645c308b9e136096 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 10 May 2023 14:03:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoservice/retrieval/AppBusDeliveredApplyService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index 1317ea81d7..4115b902b8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -290,7 +290,7 @@ public class AppBusDeliveredApplyService { List vehillModelList = traliveredVo.getVehillModelList(); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - String title = "挂车" + i + 1; + String title = "挂车" + (i + 1); titles.add(title); TrailerVo trailerVo = list.get(i); List configVoList = new ArrayList<>(); @@ -421,7 +421,7 @@ public class AppBusDeliveredApplyService { } if (!vehillModelList.isEmpty()) { for (int i = 0; i < vehillModelList.size(); i++) { - String title = "上装" + i + 1; + String title = "上装" + (i + 1); titles.add(title); BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = vehillModelList.get(i); List configVoList = new ArrayList<>(); From 18e20f87526c669f909f6361db4dfa47e2ef070d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 10 May 2023 14:04:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=B0=83=E4=BB=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelModpriceMapper.xml | 14 +++++++------- .../BaseModelModpriceService.java | 17 +++++++++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml index 39cd1bf39c..c19fb6de8b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml @@ -46,8 +46,7 @@ \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index ddc325bcaa..2fb70d0c1c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -616,6 +616,7 @@ public class BaseModelModpriceService extends MybatisBaseService voList = baseMapper.selectListByOrgSid(sid); + System.out.println(voList.size()); StringBuilder stringBuilder = new StringBuilder(); // ==============map====================== Map importVoMap = new HashMap<>(); @@ -706,10 +707,10 @@ public class BaseModelModpriceService extends MybatisBaseService