From f1cafcaf67b26de442184cd501be898cf624d6d1 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 27 Sep 2023 13:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/busdeliveredapply/BusDeliveredApplyFeign.java        | 1 -
 .../biz/busvalcustfiling/BusValcustFilingService.java        | 3 +++
 .../FinUncollectedReceivablesDetailedDto.java                | 5 +++++
 .../FinUncollectedReceivablesDetailedService.java            | 1 +
 .../autoservice/valcustfiling/AppValcustFilingService.java   | 4 ++--
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
index 2981e745b2..2d893e8808 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
@@ -215,7 +215,6 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto);
 
-
     @ApiOperation("查看车辆的款票情况")
     @GetMapping("/deliveredFinSelect")
     @ResponseBody
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
index 58e671fca7..75be8dfb0b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
@@ -218,6 +218,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
             qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                     apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                     );
+            qw.orderByDesc("bf.createTime");
         }
         IPage<BusValcustFiling> page = PagerUtil.queryToPage(pq);
         IPage<BusValcustFilingVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -450,6 +451,8 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                         finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType());
                         finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName());
                         finUncollectedReceivablesDetailedDto.setKxState("01");
+                        finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+                        finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
                         finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
                     }
                 } else {
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
index ee310ca642..3176e89a59 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
@@ -84,4 +84,9 @@ public class FinUncollectedReceivablesDetailedDto implements Dto {
     private String useOrgName;
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
index f065e6d63c..e72bb49637 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
@@ -244,6 +244,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         FinUncollectedReceivablesDetailed entity = new FinUncollectedReceivablesDetailed();
         if (StringUtils.isBlank(sid)) {//新增
             BeanUtils.copyProperties(dto, entity);
+            entity.setCurrentReceivableMoney(BigDecimal.ZERO);
             save(entity);
             return rb.success().setMsg("添加成功");
         }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java
index a92f599f0e..a417086a35 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java
@@ -99,9 +99,9 @@ public class AppValcustFilingService {
         BeanUtil.copyProperties(busValcustFilingDetailsVo, vo);
         vo.setProcInsId(busValcustFilingDetailsVo.getProcInstId());
         if ("0".equals(busValcustFilingDetailsVo.getIsGdk())){
-            vo.setMoneyName("加装配置金额");
+            vo.setMoneyName("加装配置金额(元)：");
         }else {
-            vo.setMoneyName("销售让利金额");
+            vo.setMoneyName("销售让利金额(元)：");
         }
         return rb.success().setData(vo);
     }