收费统计调整

src/main/java/com/xjrsoft/module/base/controller/BaseCourseSubjectController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.base.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
@@ -29,6 +30,7 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -80,6 +82,8 @@ public class BaseCourseSubjectController {
     @XjrLog(value = "新增课程学科")
     public RT<Boolean> add(@Valid @RequestBody AddBaseCourseSubjectDto dto) {
         BaseCourseSubject baseCourseSubject = BeanUtil.toBean(dto, BaseCourseSubject.class);
+        baseCourseSubject.setCreateDate(new Date());
+        baseCourseSubject.setCreateUserId(StpUtil.getLoginIdAsLong());
         boolean isSuccess = baseCourseSubjectService.add(baseCourseSubject);
         return RT.ok(isSuccess);
     }
@@ -89,8 +93,9 @@ public class BaseCourseSubjectController {
     @SaCheckPermission("basecoursesubject:edit")
     @XjrLog(value = "修改课程学科")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseCourseSubjectDto dto) {
-
         BaseCourseSubject baseCourseSubject = BeanUtil.toBean(dto, BaseCourseSubject.class);
+        baseCourseSubject.setModifyDate(new Date());
+        baseCourseSubject.setModifyUserId(StpUtil.getLoginIdAsLong());
         return RT.ok(baseCourseSubjectService.update(baseCourseSubject));
 
     }

src/main/java/com/xjrsoft/module/student/dto/PbVXsxxsfytbPageDto.java

@@ -53,4 +53,7 @@ public class PbVXsxxsfytbPageDto extends PageInput {
 
     @ApiModelProperty("班主任id")
     private Long teacherId;
+
+    @ApiModelProperty("身份证")
+    private String credentialNumber;
 }

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

@@ -119,8 +119,9 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
         pbVXsxxsfytbMPJLambdaWrapper
                 .disableSubLogicDel()
                 .like(dto.getFeeitemname() != null && !dto.getFeeitemname().isEmpty(), PbVXsxxsfytb::getFeeitemname, dto.getFeeitemname())
-                .like(dto.getName() != null && !dto.getName().isEmpty(), PbVXsxxsfytb::getFeeobjname, dto.getName())
-                .eq(dto.getStudentId() != null && !dto.getStudentId().isEmpty(), BaseStudent::getStudentId, dto.getStudentId())
+                .like(StrUtil.isNotEmpty(dto.getName()), PbVXsxxsfytb::getFeeobjname, dto.getName())
+                .eq(StrUtil.isNotEmpty(dto.getStudentId()), BaseStudent::getStudentId, dto.getStudentId())
+                .eq(StrUtil.isNotEmpty(dto.getCredentialNumber()), XjrUser::getCredentialNumber, dto.getCredentialNumber())
                 .in(dto.getClassIdList() != null && !dto.getClassIdList().isEmpty(), BaseStudentSchoolRoll::getClassId, dto.getClassIdList())
                 .eq(dto.getSemesterId() != null && dto.getSemesterId() > 0, PbSemesterConfig::getBaseSemesterId, dto.getSemesterId())
                 .like(dto.getJfzt() != null && !"".equals(dto.getJfzt()), PbVXsxxsfytb::getJfzt, dto.getJfzt())
@@ -138,6 +139,7 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 .selectAs(BaseSemester::getId, PbVXsxxsfytbPageVo::getBaseSemester)
                 .selectAs(XjrUser::getId, PbVXsxxsfytbPageVo::getUserId)
                 .selectAs(BaseClass::getName, PbVXsxxsfytbPageVo::getClassname)
+                .selectAs(PbVXsxxsfytb::getPersonalid, PbVXsxxsfytbPageVo::getCredentialNumber)
                 .selectAs(BaseSemester::getName, PbVXsxxsfytbPageVo::getBaseSemesterCn)
                 .select(PbVXsxxsfytb.class, x -> VoToColumnUtil.fieldsToColumns(PbVXsxxsfytbPageVo.class).contains(x.getProperty()))
         ;

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

@@ -73,7 +73,7 @@ public class PbVXsxxsfytbPageVo {
      * 身份证号
      */
     @ApiModelProperty("身份证号")
-    private String personalid;
+    private String credentialNumber;
     /**
      * 招生老师
      */