Browse Source

奖助学金发放bug修复

dzx 6 months ago
parent
commit
c4e16e37a8

+ 5 - 1
src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipReleaseController.java

@@ -106,6 +106,10 @@ public class BaseStudentScholarshipReleaseController {
     @ApiOperation(value = "新增奖学金发放记录表")
     @SaCheckPermission("basestudentscholarshiprelease:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseStudentScholarshipReleaseDto dto) {
+        BaseStudentScholarshipApplicant applicant = applicantService.getById(dto.getBaseStudentScholarshipApplicantId());
+        if(dto.getAmount() > applicant.getAmount()){
+            return RT.error("发放金额不能大于获奖金额");
+        }
         BaseStudentScholarshipRelease baseStudentScholarshipRelease = BeanUtil.toBean(dto, BaseStudentScholarshipRelease.class);
         boolean isSuccess = releaseService.save(baseStudentScholarshipRelease);
         return RT.ok(isSuccess);
@@ -149,7 +153,7 @@ public class BaseStudentScholarshipReleaseController {
                 insertList.add(
                         new BaseStudentScholarshipRelease(){{
                             setCreateDate(new Date());
-                            setAmount(applicantVo.getAmount());
+                            setAmount(0D);
                             setBaseStudentScholarshipApplicantId(applicantVo.getId());
                         }}
                 );

+ 1 - 1
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentScholarshipReleaseServiceImpl.java

@@ -37,7 +37,7 @@ public class BaseStudentScholarshipReleaseServiceImpl extends MPJBaseServiceImpl
         for (BaseStudentScholarshipApplicant applicant : applicantList) {
             UpdateWrapper<BaseStudentScholarshipApplicant> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("id", applicant.getId());
-            updateWrapper.setSql("review_status = null");
+            updateWrapper.setSql("review_status = 0");
             applicantMapper.update(applicant, updateWrapper);
         }