From da71140823ed7d2aca77d77f1e859f1d78a3b937 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Thu, 14 Oct 2021 18:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=BB=9F=E8=AE=A1=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=AE=9E=E9=99=85=E8=BF=98=E6=AC=BE=E6=97=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AlCollectionStatisticsService.java        |  2 +-
 .../AlCollectionStatisticsServiceImpl.java    | 23 ++++----
 .../impl/AlInsuranceListServiceImpl.java      |  4 +-
 .../impl/AlRepaymentEntryServiceImpl.java     | 53 ++++++++++++++++---
 .../AlCollectionStatisticsMapper.xml          | 13 +++--
 5 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/AlCollectionStatisticsService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/AlCollectionStatisticsService.java
index bc89d2fa..d578a7cb 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/AlCollectionStatisticsService.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/AlCollectionStatisticsService.java
@@ -49,5 +49,5 @@ public interface AlCollectionStatisticsService extends IService<AlCollectionStat
 
     boolean selectGenerateYear(String year);
 
-    void updateCompleteStatistics(Integer repaymentId);
+    void updateCompleteStatistics(Integer repaymentId,String year);
 }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionStatisticsServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionStatisticsServiceImpl.java
index 7dcc5f40..a41a2f4e 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionStatisticsServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionStatisticsServiceImpl.java
@@ -137,7 +137,6 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
         String year = generateReq.getYear();
         List<Integer> personLiableIds = generateReq.getPersonLiableIds();
 
-        
         //有人员id生成数据
         if (personLiableIds.size() > 0){
             List<AlReimbursement> reimbursementList = reimbursementMapper.selectListByYear(year,personLiableIds);
@@ -156,7 +155,7 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
                 // BigDecimal guaranteeAmount = alInsuranceList.getGuaranteeAmount();
                 //统计业务还款记录清收现金和资产
                 QueryWrapper<AlRepaymentEntry> repaymentEntryWrapper = new QueryWrapper<>();
-                repaymentEntryWrapper.eq("insurance_id",insuranceId).orderByAsc("id");
+                repaymentEntryWrapper.eq("insurance_id",insuranceId).last("and YEAR(actual_repayment_date) = '"+year+"' ");
                 List<AlRepaymentEntry> repaymentEntryList = repaymentEntryMapper.selectList(repaymentEntryWrapper);
                 //清收现金
                 BigDecimal repaymentCash = new BigDecimal(0);
@@ -164,8 +163,8 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
                 BigDecimal repaymentAssets = new BigDecimal(0);
                 StringBuilder note = new StringBuilder();
                 for (AlRepaymentEntry repaymentEntry: repaymentEntryList){
-                    //无实际还款日不加入年度统计
-                    if (repaymentEntry.getActualRepaymentDate()==null){
+                    //无实际还款日不加入年度统计或不在此年度不加入该年度统计
+                    if (!year.equals(repaymentEntry.getActualRepaymentDate().substring(0,4))){
                         continue;
                     }
                     if (repaymentEntry.getRepaymentCash()!=null){
@@ -186,6 +185,7 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
 
                 collectionStatistics.setGroupId(collectionGroupId);
                 collectionStatistics.setInsuranceId(insuranceId);
+                collectionStatistics.setActualRepaymentDate(year);
                 collectionStatistics.setPersonLiable(personLiable);
                 collectionStatistics.setPersonLiableId(personLiableId);
                 collectionStatistics.setJobNumber(jobNumber);
@@ -343,7 +343,7 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
      * 还款添加或编辑或删除，根据还款记录id查询保后业务数据更新年度清收数据
      */
     @Override
-    public void updateCompleteStatistics(Integer insuranceId) {
+    public void updateCompleteStatistics(Integer insuranceId,String year) {
         //查询清收代偿信息
         QueryWrapper<AlReimbursement> wrapper = new QueryWrapper<>();
         wrapper.eq("insurance_id",insuranceId);
@@ -363,17 +363,17 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
             String customerName = alInsuranceList.getCustomerName();
             //统计该业务下还款记录清收现金和资产
             QueryWrapper<AlRepaymentEntry> repaymentEntryWrapper = new QueryWrapper<>();
-            repaymentEntryWrapper.eq("insurance_id",insuranceId).orderByAsc("id");
+            repaymentEntryWrapper.eq("insurance_id",insuranceId).last("and YEAR(actual_repayment_date) = '"+year+"' ");
             List<AlRepaymentEntry> repaymentEntryList = repaymentEntryMapper.selectList(repaymentEntryWrapper);
             //无还款记录则删除该年度业务统计
-            if (ObjectUtil.isNull(repaymentEntryList)){
+            if (ObjectUtil.isNull(repaymentEntryList)||repaymentEntryList.size()==0){
                 QueryWrapper<AlCollectionStatistics> deleteWrapper = new QueryWrapper<>();
-                deleteWrapper.eq("insurance_id",insuranceId).eq("group_id",groupId);
+                deleteWrapper.eq("insurance_id",insuranceId).eq("group_id",groupId).eq("actual_repayment_date",year);
                 baseMapper.delete(deleteWrapper);
             }else {
                 //先清空之前数据
                 QueryWrapper<AlCollectionStatistics> deleteWrapper = new QueryWrapper<>();
-                deleteWrapper.eq("insurance_id",insuranceId).eq("group_id",groupId);
+                deleteWrapper.eq("insurance_id",insuranceId).eq("group_id",groupId).eq("actual_repayment_date",year);
                 baseMapper.delete(deleteWrapper);
                 //清收现金
                 BigDecimal repaymentCash = new BigDecimal(0);
@@ -382,8 +382,8 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
 
                 StringBuilder note = new StringBuilder();
                 for (AlRepaymentEntry repayment: repaymentEntryList){
-                    //无实际还款日不加入年度统计
-                    if (repayment.getActualRepaymentDate()==null){
+                    //无实际还款日不加入年度统计或不在此年度不加入该年度统计
+                    if (!year.equals(repayment.getActualRepaymentDate().substring(0,4))){
                         continue;
                     }
                     if (repayment.getRepaymentCash()!=null){
@@ -404,6 +404,7 @@ public class AlCollectionStatisticsServiceImpl extends ServiceImpl<AlCollectionS
                 //添加年度数据
                 collectionStatistics.setGroupId(groupId);
                 collectionStatistics.setInsuranceId(insuranceId);
+                collectionStatistics.setActualRepaymentDate(year);
                 collectionStatistics.setPersonLiable(personLiable);
                 collectionStatistics.setPersonLiableId(personLiableId);
                 collectionStatistics.setJobNumber(jobNumber);
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java
index cfc0dff0..940626a9 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java
@@ -168,10 +168,10 @@ public class AlInsuranceListServiceImpl extends ServiceImpl<AlInsuranceListMappe
                     deleteWrapper.eq("insurance_id",alInsuranceList.getId());
                     int delete = collectionStatisticsMapper.delete(deleteWrapper);
                     // System.out.println("删除条数"+delete);
-                    if (delete>0){
+                    /*if (delete>0){
                         //根据业务id更新年度统计
                         collectionStatisticsService.updateCompleteStatistics(alInsuranceList.getId());
-                    }
+                    }*/
                 }
             }
             //更新清收代偿数据
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
index e629d38d..413750a2 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
@@ -81,8 +81,14 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
         updateRepaymentEntry(insuranceId);
         //更新统计还款记录数据
         repaymentStatistics(insuranceId);
-        //更新年度统计
-        collectionStatisticsService.updateCompleteStatistics(insuranceId);
+        String actualRepaymentDate = alRepaymentEntry.getActualRepaymentDate();
+        //添加无实际还款不进行年度统计
+        if (actualRepaymentDate!=null){
+            //获取实际还款日年份
+            String year = actualRepaymentDate.substring(0,4);
+            //更新年度统计
+            collectionStatisticsService.updateCompleteStatistics(insuranceId,year);
+        }
         return insert;
     }
 
@@ -132,15 +138,38 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
 
     @Override
     public int updateRepayment(AlRepaymentEntry alRepaymentEntryReq) {
+        String actualRepaymentDate = alRepaymentEntryReq.getActualRepaymentDate();
+
+        //查询更新之前的年份
+        String before = "";
+        AlRepaymentEntry repaymentEntry = baseMapper.selectById(alRepaymentEntryReq.getId());
+        before = repaymentEntry.getActualRepaymentDate();
+        before = before.substring(0,4);
+
         int update = baseMapper.updateById(alRepaymentEntryReq);
+
+        // if (actualRepaymentDate==null){
+        //     //查询更新之前数据
+        //     AlRepaymentEntry repaymentEntry1 = baseMapper.selectById(alRepaymentEntryReq.getId());
+        //     actualRepaymentDate = repaymentEntry1.getActualRepaymentDate();
+        // }else {
+        // }
+        //查询更新之前数据进行更新
+        collectionStatisticsService.updateCompleteStatistics(alRepaymentEntryReq.getInsuranceId(),before);
         //更新代偿信息
         updateReimbursementData(alRepaymentEntryReq.getInsuranceId());
         //更新业务状态
         updateRepaymentEntry(alRepaymentEntryReq.getInsuranceId());
         //更新统计还款记录数据
         repaymentStatistics(alRepaymentEntryReq.getInsuranceId());
-        //更新年度统计
-        collectionStatisticsService.updateCompleteStatistics(alRepaymentEntryReq.getInsuranceId());
+
+        //无实际还款不进行年度统计
+        if (actualRepaymentDate!=null){
+            //获取实际还款日年份
+            String year = actualRepaymentDate.substring(0,4);
+            //更新年度统计
+            collectionStatisticsService.updateCompleteStatistics(alRepaymentEntryReq.getInsuranceId(),year);
+        }
         return update;
     }
 
@@ -148,13 +177,25 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
     public int delRepayment(List<Integer> ids) {
         if (ids.size()>0){
             AlRepaymentEntry repaymentEntry = baseMapper.selectById(ids.get(0));
+
+            //删除前更新年度统计
+            for (Integer id : ids){
+                AlRepaymentEntry repaymentEntry1 = baseMapper.selectById(id);
+                String actualRepaymentDate = repaymentEntry1.getActualRepaymentDate();
+                //添加无实际还款不进行年度统计
+                if (actualRepaymentDate!=null){
+                    //获取实际还款日年份
+                    String year = actualRepaymentDate.substring(0,4);
+                    //更新年度统计
+                    collectionStatisticsService.updateCompleteStatistics(repaymentEntry.getInsuranceId(),year);
+                }
+            }
+
             int i = baseMapper.deleteBatchIds(ids);
             //更新统计还款记录数据
             repaymentStatistics(repaymentEntry.getInsuranceId());
             //更新代偿信息
             updateReimbursementData(repaymentEntry.getInsuranceId());
-            //更新年度统计
-            collectionStatisticsService.updateCompleteStatistics(repaymentEntry.getInsuranceId());
             return i;
         }
         return 0;
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionStatisticsMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionStatisticsMapper.xml
index ec40b113..ff7a1f29 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionStatisticsMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionStatisticsMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.daqing.financial.guarantee.mapper.AlCollectionStatisticsMapper">
     <delete id="deleteAnnualStatistics">
-        delete from al_collection_statistics where year(create_time) = #{year}
+        delete from al_collection_statistics where actual_repayment_date = #{year}
     </delete>
     <delete id="truncate">
         TRUNCATE al_collection_statistics
@@ -122,10 +122,9 @@
     </select>
 
     <select id="selectAnnualList" resultType="java.lang.String">
-        select DISTINCT(year(create_time)) from al_collection_statistics
+        select DISTINCT(actual_repayment_date) from al_collection_statistics
     </select>
 
-
     <select id="selectAnnualStatisticsList"
             resultType="com.daqing.framework.domain.guarantee.AlCollectionStatistics">
         select ac.id,ac.group_id,ac.person_liable,ac.job_number,ac.enterprise,ac.cash,ac.assets,
@@ -134,7 +133,7 @@
         ac.proportion,ac.description,ag.group_name
         from al_collection_statistics ac
         left join al_collection_group ag on ac.group_id = ag.id
-        where year(ac.create_time) = #{slr.year}
+        where ac.actual_repayment_date = #{slr.year}
         <if test="slr.groupId != null and slr.groupId != ''">
             AND ac.group_id = #{slr.groupId}
         </if>
@@ -151,7 +150,7 @@
         select count(1)
         from al_collection_statistics ac
         left join al_collection_group ag on ac.group_id = ag.id
-        where year(ac.create_time) = #{slr.year}
+        where ac.actual_repayment_date = #{slr.year}
         <if test="slr.groupId != null and slr.groupId != ''">
             AND ac.group_id = #{slr.groupId}
         </if>
@@ -168,11 +167,11 @@
     </select>
 
     <select id="selectGenerateYear" resultType="java.lang.Integer">
-        select count(1) from al_collection_statistics where year(actual_repayment_date) = #{year}
+        select count(1) from al_collection_statistics where actual_repayment_date = #{year}
     </select>
 
     <select id="selectYearPerson" resultType="java.lang.Integer">
-        select DISTINCT(person_liable_id) from al_collection_statistics where year(create_time) = #{year}
+        select DISTINCT(person_liable_id) from al_collection_statistics where actual_repayment_date = #{year}
     </select>
 
     <select id="selectGroupList" resultType="java.lang.Integer">