产品续费——显示（修改入参时间，添加续费编号）

diagbotman-service/src/main/java/com/diagbot/dto/RenewalsInfosDTO.java

@@ -57,4 +57,9 @@ public class RenewalsInfosDTO {
      * 产品id
      */
     private Long productId;
+
+    /**
+     * 续费单号
+     */
+    private String renewalsNo;
 }

diagbotman-service/src/main/java/com/diagbot/entity/UserRenewals.java

@@ -81,7 +81,6 @@ public class UserRenewals implements Serializable {
 
     /**
      * 续费单号
-
      */
     private String renewalsNo;
 

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/UserRenewalsWrapper.java

@@ -35,7 +35,12 @@ public class UserRenewalsWrapper {
     /**
      * 开始时间
      */
-    private String applyTime;
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 
     /**
      * 用户id

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -72,7 +72,7 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
             userRenewalsWrapper.setUserId(rlist.data);
         }
         List<RenewalsInfosDTO> list = this.selectUserRenewals(page,userRenewalsWrapper).getRecords();
-        List<ProductLineDTO> productList =lantoneProductFacade.productLine().data;
+        List<ProductLineDTO> productList =lantoneProductFacade.productLines();
         List<Long> userIds =new ArrayList<>();
         for (RenewalsInfosDTO renewalsInfosDTO:list) {
             Long userId = renewalsInfosDTO.getUserId();

diagbotman-service/src/main/java/com/diagbot/vo/RenewalsInfosVO.java

@@ -25,6 +25,11 @@ public class RenewalsInfosVO extends Page {
     /**
      * 开始时间
      */
-    private String applyTime;
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 
 }

diagbotman-service/src/main/java/com/diagbot/web/UserRenewalsController.java

@@ -35,7 +35,8 @@ public class UserRenewalsController {
     @ApiOperation(value = "续费管理——显示[by:wangyu]",
             notes = "orgName：机构名称 <br>" +
                     "renewalsStutas：续费状态 <br>" +
-                    "applyTime：<br>" +
+                    "startTime：开始时间<br>" +
+                    "endTime：结束时间<br>" +
                     "size：每页显示的条数 <br>" +
                     "curent：页数 <br>")
     @PostMapping("/renewalsInfos")

diagbotman-service/src/main/resources/mapper/UserRenewalsMapper.xml

@@ -26,8 +26,8 @@
         <if test="renewalsInfosVO.renewalsStutas != null and renewalsInfosVO.renewalsStutas != ''">
               AND renewals_stutas = #{renewalsInfosVO.renewalsStutas}
         </if>
-        <if test="renewalsInfosVO.applyTime != null and renewalsInfosVO.applyTime != ''">
-            AND apply_time = #{renewalsInfosVO.applyTime}
+        <if test="renewalsInfosVO.startTime != null and renewalsInfosVO.endTime != null">
+            AND apply_time BETWEEN #{renewalsInfosVO.startTime} and #{renewalsInfosVO.endTime}
         </if>
         <if test="renewalsInfosVO.userId != null and renewalsInfosVO.userId.size > 0">
             <foreach collection="renewalsInfosVO.userId" item="renewalsInfosVO.userId" open="and(" separator="or" close=")">