فهرست منبع

学生消费导出

dzx 1 سال پیش
والد
کامیت
0a92e335dc

+ 2 - 2
src/main/java/com/xjrsoft/module/student/dto/PbVXssfdetailExcelDto.java

@@ -42,6 +42,6 @@ public class PbVXssfdetailExcelDto extends PageInput {
     @ApiModelProperty("缴费类型(-1:退费 1:缴费)")
     private Integer category;
 
-    @ApiModelProperty("缴费类型(-1:退费 1:缴费)")
-    private List<Long> id;
+    @ApiModelProperty("订单号")
+    private List<Long> payorders;
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/student/vo/PbVXssfdetailPageVo.java

@@ -33,7 +33,7 @@ public class PbVXssfdetailPageVo {
     @ApiModelProperty("支付类型")
     private String paytype;
 
-    @ApiModelProperty("订单号")
+    @ApiModelProperty("订单号(唯一主键)")
     private String payorder;
 
     @ApiModelProperty("支付时间")

+ 31 - 23
src/main/resources/mapper/student/PbVXssfdetailMapper.xml

@@ -46,31 +46,39 @@
         LEFT JOIN pb_semester_config t5 ON t3.beltcode = t5.beltcode AND t5.delete_mark = 0
         LEFT JOIN base_semester t6 ON t6.id = t5.base_semester_id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
-        <if test="dto.name != null and dto.name != ''">
-            and t1.name like concat('%', #{dto.name},'%')
-        </if>
-        <if test="dto.semesterId != null">
-            and t6.id = #{dto.semesterId}
-        </if>
-        <if test="dto.feeitemname != null and dto.feeitemname != ''">
-            and t3.feeitemname like concat('%', #{dto.feeitemname},'%')
-        </if>
-        <if test="dto.studentId != null and dto.studentId != ''">
-            and t2.student_id like concat('%', #{dto.studentId},'%')
-        </if>
-        <if test="dto.payorder != null and dto.payorder != ''">
-            and t3.payorder like concat('%', #{dto.payorder},'%')
-        </if>
-        <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
-            and t3.paydate between #{dto.startDate} and #{dto.endDate}
-        </if>
-        <if test="dto.category != null">
-            <if test="dto.category == 1">
-                and t3.mny > 0
+        <if test="dto.payorders == null">
+            <if test="dto.name != null and dto.name != ''">
+                and t1.name like concat('%', #{dto.name},'%')
             </if>
-            <if test="dto.category == -1">
-                and 0 > t3.mny
+            <if test="dto.semesterId != null">
+                and t6.id = #{dto.semesterId}
+            </if>
+            <if test="dto.feeitemname != null and dto.feeitemname != ''">
+                and t3.feeitemname like concat('%', #{dto.feeitemname},'%')
+            </if>
+            <if test="dto.studentId != null and dto.studentId != ''">
+                and t2.student_id like concat('%', #{dto.studentId},'%')
+            </if>
+            <if test="dto.payorder != null and dto.payorder != ''">
+                and t3.payorder like concat('%', #{dto.payorder},'%')
             </if>
+            <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
+                and t3.paydate between #{dto.startDate} and #{dto.endDate}
+            </if>
+            <if test="dto.category != null">
+                <if test="dto.category == 1">
+                    and t3.mny > 0
+                </if>
+                <if test="dto.category == -1">
+                    and 0 > t3.mny
+                </if>
+            </if>
+        </if>
+        <if test="dto.payorders != null">
+            and t3.payorder in
+            <foreach item="payorder" index="index" collection="dto.payorders" open="(" close=")" separator=",">
+                #{payorder}
+            </foreach>
         </if>
     </select>
 </mapper>