Merge branch 'master' of http://139.224.213.4:3000/winhc-back/repal-service

src/main/java/com/winhc/repal/model/bo/SearchBillPageBO.java

@@ -27,5 +27,7 @@ public class SearchBillPageBO {
 
     private Integer repalBillType;
 
+    private Integer statusFlag;
+
 
 }

src/main/java/com/winhc/repal/model/dto/GetRepalBillPageDTO.java

@@ -36,7 +36,7 @@ public class GetRepalBillPageDTO extends PageRequest {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
 
-    @ApiModelProperty(value = "账款逾期状态，[1]正常，[2]即将逾期(7天内)，[3]已逾期.[4]已结清。[5]已终止.[6]进行中(不包含终止和结清)")
+    @ApiModelProperty(value = "账款逾期状态，[1]正常，[2]即将逾期(7天内)，[3]已逾期.[4]已结清。[5]已终止")
     private Integer overdueStatus;
 
     @ApiModelProperty(value = "[1]风险预警。[2]财产提醒。[3]评级动态。[4]逾期动态")

src/main/java/com/winhc/repal/model/dto/SearchBillDTO.java

@@ -23,4 +23,8 @@ public class SearchBillDTO extends PageDTO {
 
     @ApiModelProperty("1应收2应付")
     private Integer repalBillType;
+
+    @ApiModelProperty("1进行中(不包含终止和结清)")
+    private Integer statusFlag;
+
 }

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -279,6 +279,7 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         searchBillPageBO.setRepalGroupId(groupId);
         searchBillPageBO.setRepalBookId(dto.getRepalBookId());
         searchBillPageBO.setAllFlag(searchBillPageBO.getReceivableFlag() && searchBillPageBO.getReceiptFlag());
+        searchBillPageBO.setStatusFlag(dto.getStatusFlag());
         repalBillPage = repalBillMapper.searchPage(repalBillPage, searchBillPageBO);
         voPage.setTotalPage(Math.toIntExact(repalBillPage.getPages()));
         voPage.setTotalNum(repalBillPage.getTotal());

src/main/resources/mapper/RepalBillMapper.xml

@@ -36,9 +36,6 @@
            <if test="param2.overdueStatus == 5">
                AND bill.REPAL_BILL_STATUS = 4
            </if>
-            <if test="param2.overdueStatus == 6">
-                AND bill.REPAL_BILL_STATUS IN (1,2)
-            </if>
         </if>
         <if test="param2.diagnosisGrade != null">
             <if test='param2.diagnosisGrade == "E"'>
@@ -196,6 +193,9 @@
         AND bill.REPAL_BOOK_ID = #{param2.repalBookId}
         AND bill.REPAL_GROUP_ID = #{param2.repalGroupId}
         AND bill.DELETED = 0
+        <if test="param2.statusFlag == 1">
+            AND bill.REPAL_BILL_STATUS IN (1,2)
+        </if>
         <if test='param2.keyword != null'>
             AND bill.CUSTOMER_NAME LIKE concat('%', #{param2.keyword}, '%')
         </if>