From d32ac7aed10b9a7e98f42b8f4b960ada788530cb Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 21 Jul 2023 17:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=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/basevehicle/BaseVehicleMapper.xml     |  2 +-
 .../finfundscarriedforwardapply/TzDto.java    |  8 +---
 .../FinCollectionConfirmationMapper.xml       |  2 +-
 .../FinFundsCarriedForwardApplyService.java   | 47 +++++++++++++------
 .../FinSelectedReceivablesDetailedMapper.java |  2 +-
 .../FinSelectedReceivablesDetailedMapper.xml  |  2 +-
 ...ReceivableBillCastToKingDeeBillFields.java | 14 +++---
 7 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 198978dd32..330fb597e6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1244,7 +1244,7 @@
     <select id="selVehicleByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         SELECT *
         FROM base_vehicle
-        WHERE vinNo = #{vinNo}
+        WHERE vinNo LIKE concat('%', #{vinNo}, '%')
           AND createOrgSid = #{createOrgSid}
           AND isDelete = 0
           AND vehicleState != "0004"
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java
index 8a186ac345..81f66cabec 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java
@@ -10,10 +10,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class TzDto {
 
-    @ApiModelProperty("业务sud")
-    private String busSid;
     @ApiModelProperty("调账类型")
     private String tzType;
+    @ApiModelProperty("业务sud")
+    private String busSid;
     @ApiModelProperty("合同编号")
     private String conNo;
     @ApiModelProperty("客户sid")
@@ -28,8 +28,4 @@ public class TzDto {
     private Integer dcje = 0;
     @ApiModelProperty("调入金额")
     private Integer drje = 0;
-
-    public TzDto(String busSid, String zc, String conNo, String name, String custNo, String vinNo, int i) {
-
-    }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
index 87f012c889..48a3fe8816 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
@@ -207,7 +207,7 @@
         fcc.staffUserSid AS staffSid,
         fcc.staffName,
         fcc.`billNo`,
-        fsrd.`customerName`,
+        fsrd.`customerName` AS payerName,
         bd.`draweeMobile` AS phone,
         fcc.collectionDate,
         fcc.collectionMoney,
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
index d18bf54974..bcaafb5397 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
@@ -574,8 +574,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 dto.setIsOneSale(true);
                 String sid = saveOrUpdateAll(dto).getData();
                 finFundsCarriedForwardApply = fetchBySid(sid);
-                //String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
-                //baseMapper.updatePathBySid(pdfPath, sid);
+                String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
+                baseMapper.updatePathBySid(pdfPath, sid);
                 tsqtysd(sid);
                 return rb.success();
             }
@@ -721,11 +721,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         List<TzDto> listOne;
         List<TzDto> listMany;
         if (zcList.size() > 1) {
-            listOne = zcList;
-            listMany = zrList;
-        } else {
             listOne = zrList;
             listMany = zcList;
+        } else {
+            listOne = zcList;
+            listMany = zrList;
         }
         //3.循环判断多条中是否存在相同的财务系统客户编码,如果有相同的则合并为一条，结转金额相加
         List<TzDto> manyRemoveList = manyHB(listMany);
@@ -801,16 +801,33 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private List<TzDto> manyHB(List<TzDto> list) {
         //转出为多条，转入为一条
         List<TzDto> manyRemoveList = new ArrayList<>();
-        list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
-            transfer.stream().reduce((a, b) -> new TzDto(
-                    a.getBusSid(),
-                    a.getTzType(),
-                    a.getConNo(),
-                    a.getName(),
-                    a.getCustNo(),
-                    a.getVinNo(),
-                    a.getDcje() + b.getDcje())).ifPresent(manyRemoveList::add);
-        });
+        if (list.get(0).getTzType().equals("转出")){
+            list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
+                transfer.stream().reduce((a, b) -> new TzDto(
+                        a.getTzType(),
+                        a.getBusSid(),
+                        a.getConNo(),
+                        a.getCustSid(),
+                        a.getName(),
+                        a.getCustNo(),
+                        a.getVinNo(),
+                        a.getDcje() + b.getDcje(),
+                        a.getDrje())).ifPresent(manyRemoveList::add);
+            });
+        }else {
+            list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
+                transfer.stream().reduce((a, b) -> new TzDto(
+                        a.getTzType(),
+                        a.getBusSid(),
+                        a.getConNo(),
+                        a.getCustSid(),
+                        a.getName(),
+                        a.getCustNo(),
+                        a.getVinNo(),
+                        a.getDcje(),
+                        a.getDrje() + b.getDrje())).ifPresent(manyRemoveList::add);
+            });
+        }
         return manyRemoveList;
     }
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
index ff50224259..5dd9c6dc1e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
@@ -143,7 +143,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     @Select("SELECT SUM(subscriptionMoney) AS seYs FROM fin_selected_receivables_detailed WHERE receivablesSid = #{ysSid} and auditState = 3")
     String fetchSumSeYsByReceivablesSid(String ysSid);
 
-    int updateAuditStateBySid(@Param("auditState") int i, @Param("collSid") String sid);
+    int updateAuditStateBySid(@Param("auditState") int i, @Param("sid") String sid);
 
     FinSelectedReceivablesDetailed fetchByReceivablesSidLimt(String ysSid);
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
index ccfc30c0b6..c16d37f1c2 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
@@ -294,7 +294,7 @@
     <update id="updateAuditStateBySid">
         update fin_selected_receivables_detailed
         set auditState = #{auditState}
-        where collSid = #{collSid}
+        where sid = #{sid}
     </update>
 
     <select id="fetchByReceivablesSidLimt"
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillCastToKingDeeBillFields.java
index 07b1942cde..96ccc0e5e0 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillCastToKingDeeBillFields.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillCastToKingDeeBillFields.java
@@ -36,21 +36,21 @@ public class OtherReceivableBillCastToKingDeeBillFields {
         fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
         JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField);
 
-        List<JSONObject> list_fEntityDetail_=new ArrayList<>();
+        List<JSONObject> list_fEntity_=new ArrayList<>();
 
         //对模板字段赋值  根据传递进来的map数据的集合进行赋值
         for(int i=0;i<vehicleList.size();i++){
-            String fEntityDetail_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json");
+            String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_FEntity.json");
             Map<String,String> params=vehicleList.get(i);
-            Map<String,String> map_fEntityDetail_=new HashMap<>();
+            Map<String,String> map_fEntity_=new HashMap<>();
             for (Map.Entry<String, String> entry : params.entrySet()) {
-                map_fEntityDetail_.put(entry.getKey(),entry.getValue());
+                map_fEntity_.put(entry.getKey(),entry.getValue());
             }
-            fEntityDetail_ =KingDeeUtils.replaceTemplateParams(fEntityDetail_, map_fEntityDetail_);
-            list_fEntityDetail_.add(JSONObject.parseObject(fEntityDetail_,Feature.OrderedField));
+            fEntity_ =KingDeeUtils.replaceTemplateParams(fEntity_, map_fEntity_);
+            list_fEntity_.add(JSONObject.parseObject(fEntity_,Feature.OrderedField));
         }
 
-        jsonFEntityModel_.put("FEntityDetail", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));
+        jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntity_)));
         jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField));
         jsonObj.put("data",jsonFEntityData_.toJSONString());