update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamManualLedgerController.java

@@ -57,11 +57,13 @@ public class ExamManualLedgerController extends BaseController {
     @ApiOperation("删除支出记录")
     @PostMapping(value = "/del")
     public HttpResponseResult del(Long id) {
-        return succeed(examManualLedgerService.delete(id));
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        examManualLedgerService.deleteExamManualLedger(sysUser.getId(),id);
+        return succeed();
     }
 
     @ApiOperation("获取考级项目支出统计信息")
-    @PostMapping(value = "/getExamManualLedgerStatistics")
+    @GetMapping(value = "/getExamManualLedgerStatistics")
     public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(Long examId){
         return succeed(examManualLedgerService.getExamManualLedgerStatistics(examId));
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamManualLedgerService.java

@@ -13,6 +13,8 @@ public interface ExamManualLedgerService extends BaseService<Long, ExamManualLed
 
     PageInfo<ExamManualLedger> queryExamManualLedgers(ExamManualLedgerQueryInfo queryInfo);
 
+    void deleteExamManualLedger(Integer operatorId,Long id);
+
     /**
      * @describe 获取考级项目支出统计信息
      * @author Joburgess

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamManualLedgerServiceImpl.java

@@ -78,6 +78,25 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+	public void deleteExamManualLedger(Integer operatorId,Long id) {
+		if(Objects.isNull(id)){
+			throw new BizException("请指定需要删除的支出记录");
+		}
+		sysUserDao.lockUser(operatorId);
+		ExamManualLedger examManualLedger = examManualLedgerDao.get(id);
+		if(Objects.nonNull(examManualLedger.getOrganId())&&examManualLedger.getOrganId()>0){
+			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId());
+			if(Objects.isNull(examOrganizationRelation)){
+				throw new BizException("合作单位信息异常");
+			}
+			examOrganizationRelation.setTotalTransAmount(examOrganizationRelation.getTotalTransAmount().subtract(examManualLedger.getAmount()));
+			examOrganizationRelationDao.update(examOrganizationRelation);
+		}
+		examManualLedgerDao.delete(id);
+	}
+
+	@Override
 	public ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Long examId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -121,6 +121,7 @@
 		FROM
 			exam_manual_ledger
 		WHERE
-			trans_direction_ = 'EXPENDITURE';
+			examination_basic_id_ = #{examId}
+			AND trans_direction_ = 'EXPENDITURE'
 	</select>
 </mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -159,9 +159,9 @@
 			<if test="resultConfirm!=null and resultConfirm==0">
 				AND eb.status_='EXAM_END'
 			</if>
-			<!--<if test="resultConfirm==null">-->
-				<!--AND eb.status_ IN ('EXAM_END','RESULT_CONFIRM')-->
-			<!--</if>-->
+			<if test="resultConfirm==null">
+				AND eb.status_ IN ('EXAM_END','RESULT_CONFIRM')
+			</if>
 		</where>
 	</sql>