Pārlūkot izejas kodu

报名缴费优化

周箭河 4 gadi atpakaļ
vecāks
revīzija
386c2f2f30

+ 21 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -81,9 +81,14 @@ public class StudentApplyDetailDto{
     @ApiModelProperty(value = "云教练金额",required = false)
     private BigDecimal cloudTeacherAmount = BigDecimal.ZERO;
 
+    @ApiModelProperty(value = "缴费中状态 0-正常 1-缴费中 2-审核中",required = false)
+    private Integer payingStatus;
+
     @ApiModelProperty(value = "是否购买云教练",required = false)
     private Integer hasCloudTeacher;
 
+    private String payingStatusStr;
+
     public KitGroupPurchaseTypeEnum getKitGroupPurchaseTypeEnum() {
         return kitGroupPurchaseTypeEnum;
     }
@@ -259,4 +264,20 @@ public class StudentApplyDetailDto{
     public void setHasCloudTeacher(Integer hasCloudTeacher) {
         this.hasCloudTeacher = hasCloudTeacher;
     }
+
+    public Integer getPayingStatus() {
+        return payingStatus;
+    }
+
+    public void setPayingStatus(Integer payingStatus) {
+        this.payingStatus = payingStatus;
+    }
+
+    public String getPayingStatusStr() {
+        return payingStatusStr;
+    }
+
+    public void setPayingStatusStr(String payingStatusStr) {
+        this.payingStatusStr = payingStatusStr;
+    }
 }

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -341,12 +341,13 @@
         <result column="remark_" property="remark"/>
         <result column="create_time_" property="createTime"/>
         <result column="visit_num_" property="visitNum"/>
+        <result column="paying_status_" property="payingStatus"/>
         <result column="has_cloud_teacher_" property="hasCloudTeacher"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
         SELECT sr.id_,sr.create_time_, sr.user_id_,su.username_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,sr.current_grade_date_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
-        actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_,IFNULL(sv.num,0) visit_num_,sr.has_cloud_teacher_
+        actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_,IFNULL(sv.num,0) visit_num_,sr.has_cloud_teacher_,sr.paying_status_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON sr.subject_id_ = s.id_

+ 7 - 2
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1301,11 +1301,16 @@ public class ExportController extends BaseController {
             if (PaymentStatusEnum.YES.equals(studentApplyDetailDto.getPaymentStatus()) && studentApplyDetailDto.getKitGroupPurchaseTypeEnum() == null) {
                 studentApplyDetailDto.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.OWNED);
             }
+            if(studentApplyDetailDto.getPayingStatus().equals(1)){
+                studentApplyDetailDto.setPayingStatusStr("缴费中");
+            }else if(studentApplyDetailDto.getPayingStatus().equals(2)){
+                studentApplyDetailDto.setPayingStatusStr("审核中");
+            }
         }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学生姓名", "家长姓名", "年级", "班级", "性别", "服从调剂", "报名专业", "实际专业", "联系电话", "学员缴费状态", "乐器购买方式"}, new String[]{
-                    "studentName", "parentsName", "currentGrade", "currentClass", "gender.description", "isAllowAdjust.msg", "subjectName", "actualSubjectName", "parentsPhone", "paymentStatus.desc", "kitGroupPurchaseTypeEnum.msg"}, studentApplyDetail);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学生姓名", "家长姓名", "年级", "班级", "性别", "服从调剂", "报名专业", "实际专业", "联系电话", "学员缴费状态", "乐器购买方式","缴费中/审核中","是否购买云教练"}, new String[]{
+                    "studentName", "parentsName", "currentGrade", "currentClass", "gender.description", "isAllowAdjust.msg", "subjectName", "actualSubjectName", "parentsPhone", "paymentStatus.desc", "kitGroupPurchaseTypeEnum.msg","payingStatusStr","hasCloudTeacher==1?'有':'没有'"}, studentApplyDetail);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();