1，同步实收款认领修改。2，超期预警修改

dao/src/main/java/com/dayou/mapper/DyoaRecordMapper.java

@@ -46,4 +46,6 @@ public interface DyoaRecordMapper extends CustomBaseMapper<DyoaRecord> {
     Long getPersonalTargetId(@Param("id")String id);
 
     FinanceInvoice getMbsIdByDyOAiDForInvoice(@Param("dyoaId") String dyoaId);
+
+    Long getMbsRealAmountId(@Param("incomeId")String incomeId, @Param("name")String name);
 }

dao/src/main/resources/mapper/DyoaRecordMapper.xml

@@ -105,4 +105,8 @@
                   AND mbs_type = 'FINANCE_INVOICE')
     </select>
 
+    <select id="getMbsRealAmountId" resultType="java.lang.Long">
+        select mbs_id from dyoa_record where mbs_type = #{name} and dyoa_id = #{incomeId} and deleted = 0
+    </select>
+
 </mapper>

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -308,6 +308,7 @@
         LEFT JOIN customer_company cc1 ON cc1.id = m.clientele_id
         LEFT JOIN customer_company cc2 ON cc2.id = m.clientele_sub_id
         <where>
+            and mp.repertory_out_time>'2024-01-01 00:00:00'
             <if test="overdueVO!=null and overdueVO.overdueMin!=null">
                 AND DATEDIFF(CURDATE(),DATE( mp.repertory_out_time )) >= #{overdueVO.overdueMin}
             </if>
@@ -1127,6 +1128,7 @@
         LEFT JOIN `user` u2 ON u2.id = p.inward_staff
         LEFT JOIN `user` u3 ON u3.id = p.pricing_staff
         <where>
+                                 pp.rot>'2024-01-01 00:00:00'
             <if test="overdueVO!=null and overdueVO.overdueMin!=null">
                 AND DATEDIFF(CURDATE(),DATE ( pp.rot )) >= #{overdueVO.overdueMin}
             </if>
@@ -1706,6 +1708,7 @@
         WHERE
         ap.productionType != 'STATEMENT'
         AND ( pf.production_no IS NULL OR pf.real_amount IS NULL )
+        and ap.repertory_out_time>'2024-01-01 00:00:00'
             <if test="overdueVO!=null and overdueVO.overdueMin!=null">
                 AND DATEDIFF(CURDATE(),DATE( ap.repertory_out_time )) &gt;= #{overdueVO.overdueMin}
             </if>

service/src/main/java/com/dayou/dyoa/DyoaHistoryServiceImpl.java

@@ -566,9 +566,20 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
 
     }
 
+
     private void fetchClaimRecord(String id) {
         try{
             Map<String, Object> resultMap = dyoaHistoryMapper.getNewClaimRecord(id);
+            //需要检查老系统最新的认领记录，同样的认领，是否在新系统已经认领过
+            String incomeId = (String) resultMap.get("incomeId");
+            Long mbsRealFundId = dyoaRecordService.getMbsRealAmountId(incomeId,REAL_AMOUNT.name());
+            //检查实收款总金额
+            if (mbsRealFundId!=null){
+                BigDecimal notClaimAmount = financeRealFundService.getNotClaimAmount(mbsRealFundId);
+                if (notClaimAmount.compareTo(BigDecimal.ZERO)==0){
+                    return;
+                }
+            }
             FinanceClaim financeClaim = new FinanceClaim();
             Class<FinanceClaim> fClass = FinanceClaim.class;
             String dyoaId = (String) resultMap.get("id");

service/src/main/java/com/dayou/service/IDyoaRecordService.java

@@ -49,5 +49,7 @@ public interface IDyoaRecordService extends IService<DyoaRecord> {
     Long getMbsIdByDyOAIdForAssets(String id);
 
     FinanceInvoice getMbsIdByDyOAiDForInvoice(String dyoaId);
+
+    Long getMbsRealAmountId(String incomeId, String name);
 }
 

service/src/main/java/com/dayou/service/impl/DyoaRecordServiceImpl.java

@@ -114,5 +114,10 @@ public class DyoaRecordServiceImpl extends ServiceImpl<DyoaRecordMapper, DyoaRec
         return dyoaRecordMapper.getMbsIdByDyOAiDForInvoice(dyoaId);
     }
 
+    @Override
+    public Long getMbsRealAmountId(String incomeId, String name) {
+        return dyoaRecordMapper.getMbsRealAmountId(incomeId,name);
+    }
+
 
 }