修改还款问题

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RepaymentMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface RepaymentMapper extends BaseMapper<Repayment> {
     @UserEmpower(field = {"regional_companies_code"}, dealerField = {"regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
     List<RepaymentDto> queryPage(@Param("sequenceNbr") String sequenceNbr, @Param("companyName")String companyName, @Param("loanPeriod")String loanPeriod,
-                                 @Param("messageState")String messageState, @Param("repayState")String repayState);
+                                 @Param("messageState")String messageState, @Param("repayState")String repayState,@Param("repayDate")String repayDate,@Param("period")String period);
 
     /**
      * 获取区域公司通过OrgCode

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RepaymentMapper.xml

@@ -14,6 +14,12 @@
             <if test="loanPeriod != null and loanPeriod != ''">
                 and loan_period like CONCAT('%',#{loanPeriod},'%' )
             </if>
+            <if test="repayDate != null and repayDate != ''">
+                and repay_date = #{repayDate}
+            </if>
+            <if test="period != null and period != ''">
+                and period like CONCAT('%',#{period},'%' )
+            </if>
             <if test="messageState != null and messageState != ''">
                 and message_state = #{messageState}
             </if>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/RepaymentController.java

@@ -221,8 +221,10 @@ public class RepaymentController extends BaseController {
                                                           @RequestParam(value = "loanPeriod",required = false) String loanPeriod,
                                                           @RequestParam(value = "messageState",required = false) String messageState,
                                                           @RequestParam(value = "repayState",required = false) String repayState,
+                                                          @RequestParam(value = "repayDate",required = false) String repayDate,
+                                                          @RequestParam(value = "period",required = false) String period,
                                                           @RequestParam(value = "current") int current,
                                                           @RequestParam(value = "size") int size) {
-        return ResponseHelper.buildResponse(repaymentService.queryForRepaymentPage(sequenceNbr, companyName,loanPeriod,messageState,repayState,current, size));
+        return ResponseHelper.buildResponse(repaymentService.queryForRepaymentPage(sequenceNbr, companyName,loanPeriod,messageState,repayState,repayDate,period,current, size));
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -62,9 +62,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
     CommonServiceImpl commonService;
 
     public Page<RepaymentDto> queryForRepaymentPage(String sequenceNbr, String companyName, String loanPeriod,
-                                                    String messageState, String repayState, int current, int size) {
+                                                    String messageState, String repayState, String repayDate,String period,int current, int size) {
         PageHelper.startPage(current, size);
-        List<RepaymentDto> list = repaymentMapper.queryPage(sequenceNbr, companyName, loanPeriod , messageState, repayState);
+        List<RepaymentDto> list = repaymentMapper.queryPage(sequenceNbr, companyName, loanPeriod , messageState, repayState,repayDate,period);
         PageInfo<RepaymentDto> pages = new PageInfo(list);
         List<RepaymentDto> pagesList = pages.getList();
         if (CollectionUtil.isNotEmpty(pagesList)) {