dzx před 8 měsíci
rodič
revize
7e581a8618

+ 3 - 0
src/main/java/com/xjrsoft/module/banding/dto/BandingTaskClassPageDto.java

@@ -29,4 +29,7 @@ public class BandingTaskClassPageDto{
 
     @ApiModelProperty("专业方向名称")
     private String majorSetName;
+
+    @ApiModelProperty("班主任id")
+    private Long teacherId;
 }

+ 15 - 0
src/main/java/com/xjrsoft/module/student/controller/StudentTryReadingReportController.java

@@ -11,7 +11,11 @@ import com.xjrsoft.common.enums.RoleCodeEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
+import com.xjrsoft.module.banding.entity.BandingTaskClass;
+import com.xjrsoft.module.banding.service.IBandingTaskClassService;
 import com.xjrsoft.module.banding.service.IBandingTaskClassStudentService;
+import com.xjrsoft.module.banding.vo.BandingTaskClassPageVo;
 import com.xjrsoft.module.student.dto.ChangeBandingStatusDto;
 import com.xjrsoft.module.student.dto.StudentReportRecordPageDto;
 import com.xjrsoft.module.student.dto.StudentReportSignDto;
@@ -52,6 +56,7 @@ public class StudentTryReadingReportController {
     private final IStudentReportRecordService recordService;
     private final IBandingTaskClassStudentService classStudentService;
     private final IStudentReportPlanService reportPlanService;
+    private final IBandingTaskClassService bandingTaskClassService;
 
 
     @GetMapping(value = "/page")
@@ -123,6 +128,7 @@ public class StudentTryReadingReportController {
     @PostMapping(value = "/export-query")
     @ApiOperation(value="导出")
     @SaCheckPermission("studentreportrecord:detail")
+    @XjrLog(value = "导出")
     public ResponseEntity<byte[]> exportQuerty(@Valid @RequestBody StudentReportRecordPageDto dto){
         List<StudentReportRecordExcelVo> dataList = new ArrayList<>();
 
@@ -154,5 +160,14 @@ public class StudentTryReadingReportController {
         return RT.fileStream(bot.toByteArray(), fileName);
     }
 
+    @GetMapping(value = "/class-list")
+    @ApiOperation(value="查询班级信息")
+    @SaCheckPermission("studentreportrecord:detail")
+    @XjrLog(value = "导出")
+    public RT<List<BandingTaskClassPageVo>> classList(@Valid Long teacherId){
+        List<BandingTaskClassPageVo> list = bandingTaskClassService.getList(new BandingTaskClassPageDto());
+        return RT.ok(list);
+    }
+
 
 }

+ 2 - 2
src/main/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImpl.java

@@ -267,8 +267,8 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
     public Long getIsArrears(String credentialNumber) {
         Long l = pbVXsxxsfytbMapper.selectCount(
                 new QueryWrapper<PbVXsxxsfytb>().lambda()
-                        .eq(PbVXsxxsfytb::getStudentcode, credentialNumber)
-                        .ge(PbVXsxxsfytb::getQfje, 0)
+                        .eq(PbVXsxxsfytb::getPersonalid, credentialNumber)
+                        .gt(PbVXsxxsfytb::getQfje, 0)
         );
         if(l > 1){
             l = 1L;

+ 31 - 0
src/test/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImplTest.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.module.student.service.IPbVXsxxsfytbService;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author dzx
+ * @date 2025/3/12
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = XjrSoftApplication.class)
+class PbVXsxxsfytbServiceImplTest {
+
+    @Autowired
+    private IPbVXsxxsfytbService pbVXsxxsfytbService;
+
+    @Test
+    void test(){
+        String idNumber = "500224200712252852";
+        Long isArrears = pbVXsxxsfytbService.getIsArrears(idNumber);
+        System.out.println(isArrears);
+
+    }
+}