update

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

@@ -13,6 +13,8 @@ public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
 
     List<ExamManualLedger> queryExamManualLedgers(Map<String, Object> params);
     int countExamManualLedgers(Map<String, Object> params);
+    
+    BigDecimal queryTotalAmount(Map<String, Object> params);
 
     /**
      * @describe 获取考级项目支出统计信息

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

@@ -1,6 +1,8 @@
 package com.keao.edu.user.service;
 
 
+import java.math.BigDecimal;
+
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
@@ -12,6 +14,8 @@ public interface ExamManualLedgerService extends BaseService<Long, ExamManualLed
     void addExamManualLedger(ExamManualLedger examManualLedger);
 
     PageInfo<ExamManualLedger> queryExamManualLedgers(ExamManualLedgerQueryInfo queryInfo);
+    
+    BigDecimal queryTotalAmount(ExamManualLedgerQueryInfo queryInfo);
 
     void deleteExamManualLedger(Integer operatorId,Long id);
 

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

@@ -13,6 +13,7 @@ import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.page.ExamManualLedgerQueryInfo;
 import com.keao.edu.user.service.ExamManualLedgerService;
 import com.keao.edu.util.collection.MapUtil;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -77,6 +78,13 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	}
 
 	@Override
+	public BigDecimal queryTotalAmount(ExamManualLedgerQueryInfo queryInfo) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+		return examManualLedgerDao.queryTotalAmount(params);
+	}
+
+	@Override
 	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	public void deleteExamManualLedger(Integer operatorId,Long id) {
 		if(Objects.isNull(id)){

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

@@ -142,12 +142,18 @@
 		<include refid="global.limit"/>
 	</select>
 
-	<select id="countExamManualLedgers" resultType="int">
+	<select id="countExamManualLedgers" resultType="int" parameterType="map">
 		SELECT COUNT(eml.id_) FROM exam_manual_ledger eml
 		LEFT JOIN sys_user su ON eml.operator_user_id_ = su.id_
 		<include refid="queryExamManualLedgersCondition"/>
 	</select>
 
+	<select id="queryTotalAmount" resultType="java.math.BigDecimal" parameterType="map">
+		SELECT sum(eml.amount_) FROM exam_manual_ledger eml
+		LEFT JOIN sys_user su ON eml.operator_user_id_ = su.id_
+		<include refid="queryExamManualLedgersCondition"/>
+	</select>
+
 	<select id="getExamManualLedgerStatistics" resultType="com.keao.edu.user.dto.ExamManualLedgerStatisticsDto">
 		SELECT
 			COUNT( id_ ) expenditureNum,

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

@@ -12,9 +12,12 @@ import com.keao.edu.user.entity.ExamManualLedger;
 import com.keao.edu.user.enums.TransDirectionEnum;
 import com.keao.edu.user.page.ExamManualLedgerQueryInfo;
 import com.keao.edu.user.service.ExamManualLedgerService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -33,9 +36,13 @@ public class ExamManualLedgerController extends BaseController {
 
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamManualLedger>> getList(ExamManualLedgerQueryInfo queryInfo) {
-        return succeed(examManualLedgerService.queryExamManualLedgers(queryInfo));
-    }
+	public HttpResponseResult<ModelMap> getList(ExamManualLedgerQueryInfo queryInfo) {
+		PageInfo<ExamManualLedger> pageInfo = examManualLedgerService.queryExamManualLedgers(queryInfo);
+		ModelMap model = new ModelMap();
+		model.put("pageInfo", pageInfo);
+		model.put("totalAmount", examManualLedgerService.queryTotalAmount(queryInfo));
+		return succeed(model);
+	}
 
     @ApiOperation("新增支出记录")
     @PostMapping(value = "/add")