Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,8 @@ package com.keao.edu.user.dao;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
 import com.keao.edu.user.entity.ExamManualLedger;
+import com.keao.edu.user.page.ExamManualLedgerQueryInfo;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -20,12 +22,9 @@ public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
      * @describe 获取考级项目支出统计信息
      * @author Joburgess
      * @date 2020.07.09
-     * @param examId:
      * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
      */
-    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(@Param("organId") Integer organId,
-                                                                @Param("examId") Long examId,
-                                                                @Param("targetOrganId") Integer targetOrganId);
+    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(ExamManualLedgerQueryInfo queryInfo);
 
 
     List<ExamManualLedger> getExamOrganManualLedgers(@Param("organId") Integer organId,

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/page/ExamManualLedgerQueryInfo.java

@@ -12,7 +12,7 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
 
     private Integer targetOrganId;
 
-    private Long examId;
+    private String examId;
     
     private Date startTime;
     
@@ -28,11 +28,11 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
         this.targetOrganId = targetOrganId;
     }
 
-	public Long getExamId() {
+	public String getExamId() {
 		return examId;
 	}
 
-	public void setExamId(Long examId) {
+	public void setExamId(String examId) {
 		this.examId = examId;
 	}
 

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

@@ -23,9 +23,8 @@ public interface ExamManualLedgerService extends BaseService<Long, ExamManualLed
      * @describe 获取考级项目支出统计信息
      * @author Joburgess
      * @date 2020.07.09
-     * @param examId:
      * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
      */
-    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId,Long examId, Integer targetOrganId);
+    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(ExamManualLedgerQueryInfo queryInfo);
 
 }

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

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

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

@@ -156,25 +156,17 @@
 		<include refid="queryExamManualLedgersCondition"/>
 	</select>
 
-	<select id="getExamManualLedgerStatistics" resultType="com.keao.edu.user.dto.ExamManualLedgerStatisticsDto">
+	<select id="getExamManualLedgerStatistics" resultType="com.keao.edu.user.dto.ExamManualLedgerStatisticsDto" parameterType="map">
 		SELECT
-			COUNT( id_ ) expenditureNum,
-			SUM( amount_ ) expenditureFee
+			COUNT( eml.id_ ) expenditureNum,
+			SUM( eml.amount_ ) expenditureFee
 		FROM
-			exam_manual_ledger
-		WHERE
-			examination_basic_id_ = #{examId}
-			<if test="organId!=null and organId!=0">
-				AND organ_id_=#{organId}
-			</if>
-			AND trans_direction_ = 'EXPENDITURE'
-			<if test="targetOrganId!=null and targetOrganId==-99">
-				AND target_organ_id_ IS NULL
-			</if>
-			<if test="targetOrganId!=null and targetOrganId!=-99">
-				AND target_organ_id_=#{targetOrganId}
-			</if>
+			exam_manual_ledger eml
+		LEFT JOIN sys_user su ON eml.operator_user_id_ = su.id_
+		left join examination_basic eb on eb.id_ = eml.examination_basic_id_
+		<include refid="queryExamManualLedgersCondition"/>
 	</select>
+	
     <select id="getExamOrganManualLedgers" resultMap="ExamManualLedger">
 		SELECT
 			*

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

@@ -42,10 +42,7 @@ public class ExamManualLedgerController extends BaseController {
 		PageInfo<ExamManualLedger> pageInfo = examManualLedgerService.queryExamManualLedgers(queryInfo);
 		ModelMap model = new ModelMap();
 		model.put("pageInfo", pageInfo);
-		model.put("totalAmount", examManualLedgerService.queryTotalAmount(queryInfo));
-		if(Objects.nonNull(queryInfo.getExamId())){
-            model.put("statistics", examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),queryInfo.getExamId(),queryInfo.getTargetOrganId()));
-        }
+		model.put("statistics", examManualLedgerService.getExamManualLedgerStatistics(queryInfo));
 		return succeed(model);
 	}
 
@@ -82,8 +79,9 @@ public class ExamManualLedgerController extends BaseController {
     @ApiOperation("获取考级项目支出统计信息")
     @GetMapping(value = "/getExamManualLedgerStatistics")
     @PreAuthorize("@pcs.hasPermissions('examManualLedger/getExamManualLedgerStatistics')")
-    public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(Long examId, Integer targetOrganId){
-        return succeed(examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),examId,targetOrganId));
+    public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(ExamManualLedgerQueryInfo queryInfo){
+    	queryInfo.setOrganId(OrganContextHolder.getOrganId());
+        return succeed(examManualLedgerService.getExamManualLedgerStatistics(queryInfo));
     }
 
 }