Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherCourseRewardQueryInfo.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
 
+import java.util.Date;
+
 public class TeacherCourseRewardQueryInfo extends QueryInfo {
     private Integer teacherId;
 
@@ -9,6 +11,26 @@ public class TeacherCourseRewardQueryInfo extends QueryInfo {
 
     private Integer settlementStatus;
 
+    private Date startTime;
+
+    private Date endTime;
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -135,18 +135,24 @@
 
     <sql id="queryCondition">
         <where>
-            <if test="teacherId!=null">
+            <if test="teacherId != null">
                 AND tcr.teacher_id_=#{teacherId}
             </if>
-            <if test="search!=null">
+            <if test="search != null and search != ''">
                 AND (tcr.course_group_name_ LIKE CONCAT('%', #{search}, '%') OR tcr.music_group_id_ LIKE CONCAT(#{search}, '%'))
             </if>
-            <if test="organId!=null">
+            <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(tcr.organ_id_ ,#{organId})
             </if>
-            <if test="settlementStatus!=null">
+            <if test="settlementStatus != null">
                 AND tcr.settlement_status_ = #{settlementStatus}
             </if>
+            <if test="startTime != null">
+                AND tcr.settlement_date_ >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND tcr.settlement_date_ &lt; #{endTime}
+            </if>
         </where>
     </sql>
 

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

@@ -80,6 +80,8 @@ public class ExportController extends BaseController {
     private StudentExtracurricularExercisesSituationService studentExtracurricularExercisesSituationService;
     @Autowired
     private TeacherSalaryComplaintsService teacherSalaryComplaintsService;
+    @Autowired
+    private TeacherCourseRewardService teacherCourseRewardService;
 
     @ApiOperation(value = "导出申述处理列表")
     @PostMapping("export/teacherSalaryComplaints")
@@ -235,6 +237,57 @@ public class ExportController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "导出老师结转奖励")
+    @PostMapping("export/teacherCourseReward")
+    @PreAuthorize("@pcs.hasPermissions('export/teacherCourseReward')")
+    public void teacherCourseReward(HttpServletResponse response, TeacherCourseRewardQueryInfo queryInfo) throws IOException {
+        queryInfo.setRows(99999);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                throw new BizException("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                    throw new BizException("非法请求");
+                }
+            }
+        }
+        Date endTime = queryInfo.getEndTime();
+        if(endTime != null){
+            queryInfo.setEndTime(DateUtil.addDays(endTime, 1));
+        }
+        List<TeacherCourseReward> rows = teacherCourseRewardService.queryPage(queryInfo).getRows();
+        OutputStream outputStream = response.getOutputStream();
+        try {
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"课程组编号", "课程组名称", "分部", "指导老师", "是否结转", "结转金额", "结转日期", "备注"}, new String[]{
+                    "musicGroupId", "courseGroupName", "organName", "teacherName", "settlementStatus.msg",
+                    "expectRewardAmount", "settlementDate", "memo"}, rows);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
 
     @ApiOperation(value = "导出学员列表")
     @PostMapping("export/studentHasCourse")

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.page.TeacherCourseRewardQueryInfo;
 import com.ym.mec.biz.service.TeacherCourseRewardService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @RequestMapping("teacherCourseReward")
@@ -55,6 +57,10 @@ public class TeacherCourseRewardController extends BaseController {
                 }
             }
         }
+        Date endTime = queryInfo.getEndTime();
+        if(endTime != null){
+            queryInfo.setEndTime(DateUtil.addDays(endTime, 1));
+        }
         return succeed(teacherCourseRewardService.queryPage(queryInfo));
     }
 }