update

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

@@ -5,6 +5,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.tenant.OrganContextHolder;
 import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
 import com.keao.edu.user.entity.ExamManualLedger;
@@ -43,6 +44,7 @@ public class ExamManualLedgerController extends BaseController {
         examManualLedger.setTransDirection(TransDirectionEnum.EXPENDITURE);
         examManualLedger.setTenantId(TenantContextHolder.getTenantId());
         examManualLedger.setOperatorUserId(sysUser.getId());
+        examManualLedger.setOrganId(OrganContextHolder.getOrganId());
         examManualLedgerService.addExamManualLedger(examManualLedger);
         return succeed();
     }
@@ -65,7 +67,7 @@ public class ExamManualLedgerController extends BaseController {
     @ApiOperation("获取考级项目支出统计信息")
     @GetMapping(value = "/getExamManualLedgerStatistics")
     public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(Long examId){
-        return succeed(examManualLedgerService.getExamManualLedgerStatistics(examId));
+        return succeed(examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),examId));
     }
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamManualLedgerDao.java

@@ -20,6 +20,7 @@ public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
      * @param examId:
      * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
      */
-    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(@Param("examId") Long examId);
+    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(@Param("organId") Integer organId,
+                                                                @Param("examId") Long examId);
 
 }

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

@@ -22,6 +22,6 @@ public interface ExamManualLedgerService extends BaseService<Long, ExamManualLed
      * @param examId:
      * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
      */
-    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Long examId);
+    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId,Long examId);
 
 }

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

@@ -97,10 +97,10 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	}
 
 	@Override
-	public ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Long examId) {
+	public ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId, Long examId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
-		return examManualLedgerDao.getExamManualLedgerStatistics(examId);
+		return examManualLedgerDao.getExamManualLedgerStatistics(organId, examId);
 	}
 }

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

@@ -129,6 +129,9 @@
 			exam_manual_ledger
 		WHERE
 			examination_basic_id_ = #{examId}
+			<if test="organId!=null and organId!=0">
+				AND organ_id_=#{organId}
+			</if>
 			AND trans_direction_ = 'EXPENDITURE'
 	</select>
 </mapper>