教材发放条件搜索报错

src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java

@@ -252,9 +252,9 @@ public class BasePersonnelLabourCapitalController {
     public ResponseEntity<byte[]> exportData(@Valid WeeklyDutySchedulePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<BasePersonnelLabourCapital> list = basePersonnelLabourCapitalService.list();
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
-        EasyExcel.write(bot, WeeklyDutyScheduleListVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(list);
+        EasyExcel.write(bot, BasePersonnelLabourCapital.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(list);
 
-        return RT.fileStream(bot.toByteArray(), "WeeklyDutySchedule" + ExcelTypeEnum.XLSX.getValue());
+        return RT.fileStream(bot.toByteArray(), "BasePersonnelLabourCapital" + ExcelTypeEnum.XLSX.getValue());
     }
 
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentGraduatePageVo.java

@@ -46,6 +46,23 @@ public class BaseStudentGraduatePageVo {
     @ExcelProperty("学生姓名")
     @ApiModelProperty("学生姓名")
     private String name;
+
+    /**
+     * 性别
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("性别")
+    @ApiModelProperty("性别")
+    private String gender;
+
+    /**
+     * 性别
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("性别")
+    @ApiModelProperty("性别")
+    private String genderCn;
+
     /**
      * 联系方式
      */

src/main/resources/mapper/student/BaseStudentGraduateMapper.xml

@@ -53,6 +53,7 @@
         <if test="dto.status != null">
             and t5.status = #{dto.status}
         </if>
+
     </select>
 
     <select id="getInfoById" resultType="com.xjrsoft.module.student.vo.BaseStudentGraduateVo">

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -268,9 +268,10 @@
                 sum(t2.stock) as num,
                 sum(t1.issue_number) as claimNum
             from wf_textbook_claim t
-                left join wf_textbook_claim_item t1 on t1.wf_textbook_claim_id = t.id
+                inner join wf_textbook_claim_item t1 on t1.wf_textbook_claim_id = t.id
                 left join textbook t2 on t2.id = t1.textbook_id
             where claim_type = 'claim_student'
+                AND t.status = 1
             <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
                 and t.base_semester_id = #{dto.baseSemesterId}
             </if>