Merge branch 'refs/heads/test_zjn' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -1164,6 +1164,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         if (request == null) {
         if (request == null) {
             return queryWrapper;
             return queryWrapper;
         }
         }
+
+        // 默认查询条件 是否分期出账 1-是 0-否 2-拆分的原纪录
+        queryWrapper.in("is_part", 0, 1);
+
         // 获取参数
         // 获取参数
         String payableNo = request.getPayableNo();
         String payableNo = request.getPayableNo();
         String policyNo = request.getPolicyNo();
         String policyNo = request.getPolicyNo();

yd-csf-service/src/main/java/com/yd/csf/service/model/Fortune.java

@@ -43,7 +43,7 @@ public class Fortune implements Serializable {
     private String fortuneBizType;
     private String fortuneBizType;
 
 
     /**
     /**
-     * 是否部分出账拆分出来的出账记录 0=No, 1=Yes
+     * 是否拆分出来的出账 1-是 0-否 2-拆分的原纪录
      */
      */
     private Integer isPart;
     private Integer isPart;
 
 

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -79,6 +79,11 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         if (fortuneQueryRequest == null) {
         if (fortuneQueryRequest == null) {
             return queryWrapper;
             return queryWrapper;
         }
         }
+
+        // 默认查询条件 是否分期出账 1-是 0-否 2-拆分的原纪录
+        queryWrapper.in("is_part", 0, 1);
+
+        // 获取参数
         String reconciliationYearMonth = fortuneQueryRequest.getReconciliationYearMonth();
         String reconciliationYearMonth = fortuneQueryRequest.getReconciliationYearMonth();
         List<String> statusList = fortuneQueryRequest.getStatusList();
         List<String> statusList = fortuneQueryRequest.getStatusList();
         String policyNo = fortuneQueryRequest.getPolicyNo();
         String policyNo = fortuneQueryRequest.getPolicyNo();

yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java

@@ -42,6 +42,12 @@ public class FortuneVO implements Serializable {
     private String fortuneBizType;
     private String fortuneBizType;
 
 
     /**
     /**
+     * 是否拆分出来的出账 1-是 0-否 2-拆分的原纪录
+     */
+    @Schema(description = "是否拆分出来的出账 1-是 0-否 2-拆分的原纪录")
+    private Integer isPart;
+
+    /**
      * 预计出账业务ID
      * 预计出账业务ID
      */
      */
     @Schema(description = "预计出账业务ID")
     @Schema(description = "预计出账业务ID")

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -48,6 +48,7 @@
                     #{item}
                     #{item}
                 </foreach>
                 </foreach>
             </if>
             </if>
+            AND ef.is_part in (0,1)
         </where>
         </where>
     </select>
     </select>
 
 

yd-csf-service/src/main/resources/mappers/FortuneMapper.xml

@@ -80,6 +80,7 @@
                 #{fortuneId}
                 #{fortuneId}
             </foreach>
             </foreach>
         </if>
         </if>
+          AND f.is_part in (0,1)
         GROUP BY f.policy_no
         GROUP BY f.policy_no
     </select>
     </select>