Merge remote-tracking branch 'origin/dev' into pre

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -219,20 +219,20 @@ public class WfAssetManageController {
 
     }
 
-    @PostMapping("/select-record-query")
+    @PostMapping("/select-record-export-query")
     @ApiOperation(value = "选中记录导出")
     public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
-//    @GetMapping("/select-record-query")
+//    @GetMapping("/select-record-export-query")
 //    @ApiOperation(value = "选中记录导出")
 //    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid WfAssetManageSelectRecordQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageSelectRecordQuery(dto);
         return RT.fileStream(bot.toByteArray(), "WfAssetManage" + ExcelTypeEnum.XLSX.getValue());
     }
 
-    @PostMapping("/conditional-search-query")
+    @PostMapping("/conditional-search-export-query")
     @ApiOperation(value = "条件搜索导出")
     public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
-//    @GetMapping("/conditional-search-query")
+//    @GetMapping("/conditional-search-export-query")
 //    @ApiOperation(value = "条件搜索导出")
 //    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageConditionalSearchQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageConditionalSearchQuery(dto);

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

@@ -40,7 +40,7 @@
         INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
         LEFT JOIN base_class t4 ON t3.class_id = t4.id
         LEFT JOIN xjr_user t5 ON t4.teacher_id = t5.id
-        LEFT JOIN base_student_family_member t6 ON t6.user_id = t2.id AND t6.delete_mark = 0 AND t6.is_guardian = 1
+        LEFT JOIN xjr_dictionary_detail t6 ON t6.code = t1.nation
         LEFT JOIN xjr_dictionary_detail t7 ON t7.code = t2.gender
         LEFT JOIN xjr_dictionary_detail t8 ON t8.code = t3.stduy_status
         LEFT JOIN xjr_dictionary_detail t11 ON t11.code = t3.student_type