Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -205,15 +205,16 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
             CourseHomework existHomework = courseHomeworkDao.findByCourseSchedule(courseScheduleId.longValue());
 
-            if (StringUtils.isNotBlank(courseScheduleReview.getHomeWork()) && Objects.isNull(existHomework)) {
+            if (StringUtils.isNotBlank(courseScheduleReview.getHomeWork())) {
                 //新增课堂作业
                 CourseHomework courseHomework = new CourseHomework();
                 List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
 
                 if(Objects.nonNull(existHomework)){
-                    existHomework.setContent(courseScheduleReview.getHomeWork());
-                    existHomework.setExpiryDate(DateUtil.addDays(date, 7));
-                    courseHomeworkService.update(existHomework);
+                    courseHomework.setId(existHomework.getId());
+                    courseHomework.setContent(courseScheduleReview.getHomeWork());
+                    courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
+                    courseHomeworkService.update(courseHomework);
                 }else{
                     courseHomework.setContent(courseScheduleReview.getHomeWork());
                     courseHomework.setCourseScheduleId(courseSchedule.getId());

mec-biz/src/main/resources/config/mybatis/TenantPaymentOrderMapper.xml

@@ -50,7 +50,7 @@
             <if test="userId != null">
                 AND tpo.user_id_ = #{userId}
             </if>
-            <if test="phone != null">
+            <if test="phone != null and phone != ''">
                 AND su.phone_ = #{phone}
             </if>
             <if test="paymentChannel != null">

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

@@ -126,15 +126,14 @@ public class ExportController extends BaseController {
         }
         List<TenantPaymentOrder> paymentOrders = tenantPaymentOrderService.queryPage(queryInfo).getRows();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"交易流水号", "订单号", "订单日期", "交易类型", "应付金额",
-                    "实付金额", "用户姓名", "交易方式", "收款账户", "交易状态", "备注", "交易方式"}, new String[]{
-                    "transNo", "orderNo", "createTime", "type.desc", "expectAmount",
-                    "actualAmount", "username", "paymentChannel", "merNos", "status.msg", "memo", "paymentChannel.desc"}, paymentOrders);
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
-            workbook.write(response.getOutputStream());
-            workbook.close();
+			HSSFWorkbook workbook = POIUtil.exportExcel(new String[] { "交易流水号", "订单号", "订单日期", "交易类型", "应付金额", "实付金额", "用户姓名", "手机号码", "交易方式", "收款账户", "交易状态",
+					"备注", "交易方式" }, new String[] { "transNo", "orderNo", "createTime", "type.desc", "expectAmount", "actualAmount", "user.username",
+					"user.phone", "paymentChannel", "merNos", "status.msg", "memo", "paymentChannel.desc" }, paymentOrders);
+			response.setContentType("application/octet-stream");
+			response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+			response.flushBuffer();
+			workbook.write(response.getOutputStream());
+			workbook.close();
         } catch (Exception e) {
             e.printStackTrace();
         }