From e30ae784c41152cc65cfab9683af80d449696a20 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 22 May 2024 16:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A2=E8=B5=94=E7=9B=B8=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5=20=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=8E=A8=E9=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBillPageListVo.java | 5 ++++ .../AsArrearsoutApplyRest.java | 4 +--- .../AsArrearsoutApplyService.java | 24 +++++++++++++++++-- .../asbusclaimbill/AsBusclaimBillMapper.java | 9 +++++++ .../asbusclaimbill/AsBusclaimBillMapper.xml | 9 ++++++- .../asbusclaimbill/AsBusclaimBillRest.java | 10 +++++++- .../asbusclaimbill/AsBusclaimBillService.java | 16 +++++++++++++ .../asbusrepairbill/AsBusrepairBillMapper.xml | 6 +++-- .../AsBusrepairBillService.java | 18 +++++++++++--- .../PmsPurchaseBillService.java | 9 +++++-- 10 files changed, 96 insertions(+), 14 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java index 1436caf47a..79d3acef99 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillPageListVo.java @@ -11,9 +11,14 @@ import lombok.Data; @Data public class AsBusrepairBillPageListVo { + private String sid; + @ApiModelProperty("索赔单数量") private String num; + @ApiModelProperty("索赔单编号") + private String spdBillNo; + @ApiModelProperty("单据编号") private String billNo; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java index 512dda0a04..2522fe7af0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java @@ -92,9 +92,7 @@ public class AsArrearsoutApplyRest { @ApiOperation("初始化") @GetMapping("/init/{gdSid}") public ResultBean init(@PathVariable("gdSid") String gdSid){ - ResultBean rb = ResultBean.fireFail(); - AsArrearsoutApplyDetailsVo vo = asArrearsoutApplyService.init(gdSid); - return rb.success().setData(vo); + return asArrearsoutApplyService.init(gdSid); } @ApiOperation("根据SID获取一条记录") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java index fe8f45d546..828f7cbf82 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java @@ -43,6 +43,8 @@ import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign; import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign; import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskVo; import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo; +import com.yxt.anrui.as.feign.fms.FmsReceivesettle; +import com.yxt.anrui.as.feign.fms.FmsReceivesettleFeign; import com.yxt.anrui.as.feign.message.MessageFeign; import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowableQuery; @@ -62,6 +64,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -101,6 +104,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsArrearsoutApplyQuery query = pq.getParams(); @@ -224,7 +229,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService init(String gdSid) { + ResultBean rb = ResultBean.fireFail(); AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(gdSid); AsArrearsoutApplyDetailsVo asArrearsoutApplyDetailsVo = new AsArrearsoutApplyDetailsVo(); asArrearsoutApplyDetailsVo.setPairBillSid(gdSid); @@ -239,7 +245,21 @@ public class AsArrearsoutApplyService extends MybatisBaseService { int saveList(List resultList); AsBusclaimBill selectByBillNo(String billNo); + + @Select("select count(*) from as_busclaim_bill where billNo = #{billNo}") + int checkBillNo(String billNo); + + void updateByBillNo(AsBusclaimBill asBusclaimBill); + + @Select("select billNo from as_busclaim_bill where repairBillSid = #{repairBillSid}") + List selectByRepairBillSid(String repairBillSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml index 7307d38b9c..0434d32b74 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml @@ -13,8 +13,11 @@ a.claimOtherAmount, a.state, a.invoiceState, - a.adjustState + a.adjustState, + abbv.vinNo, + abbv.vehMark from as_busclaim_bill a + LEFT JOIN as_busrepair_bill_vech abbv ON a.repairBillSid = abbv.billSid ${ew.sqlSegment} @@ -41,4 +44,8 @@ order by id desc limit 1 + + + UPDATE as_busclaim_bill SET hourAmount = #{item.hourAmount,jdbcType=DECIMAL},goodsAmount = #{item.goodsAmount,jdbcType=DECIMAL},claimOutAmount = #{item.claimOutAmount,jdbcType=DECIMAL},claimSubsidyAmount = #{item.claimSubsidyAmount,jdbcType=DECIMAL},claimOtherAmount = #{item.claimOtherAmount,jdbcType=DECIMAL}) WHERE billNo = #{item.billNo,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java index 16fc279893..f8264a8b03 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java @@ -97,7 +97,15 @@ public class AsBusclaimBillRest { resultList = getSheetVal(sheet, resultCell); System.out.println("结果是--->" + resultList); try { - asBusclaimBillService.saveList(resultList); + for (AsBusclaimBill asBusclaimBill : resultList) { + int i = asBusclaimBillService.checkBillNo(asBusclaimBill.getBillNo()); + if (i == 0){ + return ResultBean.fireFail().setMsg(asBusclaimBill.getBillNo() + "不存在"); + } + } + for (AsBusclaimBill asBusclaimBill : resultList) { + asBusclaimBillService.updateByBillNo(asBusclaimBill); + } return ResultBean.fireSuccess().setMsg("数据导入成功"); } catch (Exception e) { e.printStackTrace(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java index f77fec0ea2..a1a5dc7626 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java @@ -30,6 +30,10 @@ import java.util.List; public class AsBusclaimBillService extends MybatisBaseService { public ResultBean saveBill(AsBusclaimBillDto dto) { ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.checkBillNo(dto.getBillNo()); + if (i > 0){ + return rb.setMsg("索赔单号已存在"); + } AsBusclaimBill asBusclaimBill = new AsBusclaimBill(); BeanUtil.copyProperties(dto, asBusclaimBill, "sid"); asBusclaimBill.setReportDate(DateUtil.today()); @@ -74,4 +78,16 @@ public class AsBusclaimBillService extends MybatisBaseService selectByRepairBillSid(String repairBillSid) { + return baseMapper.selectByRepairBillSid(repairBillSid); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 05cec008aa..7867df35c4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -113,7 +113,7 @@