Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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/dao/ExamSongDao.java

@@ -4,11 +4,9 @@ import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.entity.ExamSong;
 import com.keao.edu.user.enums.SongTypeEnum;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Map;
 
 public interface ExamSongDao extends BaseDAO<Integer, ExamSong> {
 
@@ -27,7 +25,8 @@ public interface ExamSongDao extends BaseDAO<Integer, ExamSong> {
      * @param subjectId:
      * @return java.util.List<com.keao.edu.user.entity.ExamSong>
      */
-    List<ExamSong> getWithSubject(@Param("subjectId") Integer subjectId);
+    List<ExamSong> getWithSubject(@Param("subjectId") Integer subjectId,
+                                  @Param("tenantId") String tenantId);
 
     /**
      * @describe 根据级别和类型获取曲库

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 Integer examId;
+    private String examId;
     
     private String tenantId;
     
@@ -32,11 +32,11 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
         this.targetOrganId = targetOrganId;
     }
 
-    public Integer getExamId() {
+    public String getExamId() {
         return examId;
     }
 
-    public void setExamId(Integer examId) {
+    public void setExamId(String examId) {
         this.examId = examId;
     }
 

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/java/com/keao/edu/user/service/impl/ExamSongServiceImpl.java

@@ -7,6 +7,7 @@ import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.dao.ExamRegistrationDao;
 import com.keao.edu.user.dao.ExamSongDao;
 import com.keao.edu.user.entity.ExamSong;
@@ -71,7 +72,7 @@ public class ExamSongServiceImpl extends BaseServiceImpl<Integer, ExamSong> impl
 	    if(Objects.isNull(subjectId)){
 	        throw new BizException("请选择专业");
         }
-        return examSongDao.getWithSubject(subjectId);
+        return examSongDao.getWithSubject(subjectId, TenantContextHolder.getTenantId());
     }
 
     @Override

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

@@ -258,6 +258,9 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+        params.put("organIds", childOrganIds);
+
         List<ExaminationBasicDto> dataList = new ArrayList<>();
         int count = examinationBasicDao.countExaminationBasics(params);
         if (count > 0) {
@@ -267,7 +270,6 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             List<Long> examIds = dataList.stream().map(ExaminationBasicDto::getId).collect(Collectors.toList());
             List<ExamOrganizationRelation> examOrgans = new ArrayList<>();
             if (!CollectionUtils.isEmpty(examIds)) {
-                List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
                 examOrgans = examOrganizationRelationDao.getWithExamsAndOrgans(examIds, childOrganIds);
             }
             Map<Integer, List<ExamOrganizationRelation>> examOrgansMap = new HashMap<>();

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

@@ -101,7 +101,7 @@
 	<sql id="queryExamManualLedgersCondition">
 		<where>
 			<if test="examId != null">
-				AND eml.examination_basic_id_=#{examId}
+				AND (eml.examination_basic_id_ like concat('%',#{examId},'%') or eb.name_ like concat('%',#{examId},'%'))
 			</if>
 			<if test="tenantId != null">
 				AND eml.tenant_id_=#{tenantId}
@@ -122,7 +122,7 @@
 				AND eml.create_time_ &lt;= #{endTime}
 			</if>
 			<if test="search != null">
-				AND eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%')
+				AND (eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%'))
 			</if>
 		</where>
 	</sql>
@@ -142,9 +142,17 @@
 		<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_
+		left join examination_basic eb on eb.id_ = eml.examination_basic_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_
+		left join examination_basic eb on eb.id_ = eml.examination_basic_id_
 		<include refid="queryExamManualLedgersCondition"/>
 	</select>
 

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

@@ -238,6 +238,7 @@
         WHERE
             examination_basic_id_ = #{examId}
             AND DATE_FORMAT( create_time_, '%Y-%m-%d' ) = #{day}
+            AND trans_status_ IN ('SUCCESS')
             AND organ_id_ IN
             <foreach collection="organIds" item="organId" separator="," open="(" close=")">
                 #{organId}

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

@@ -116,7 +116,7 @@
 		SELECT * FROM exam_song WHERE FIND_IN_SET(id_,#{ids})
 	</select>
 	<select id="getWithSubject" resultMap="ExamSong">
-		SELECT * FROM exam_song WHERE FIND_IN_SET(#{subjectId}, subject_list_) AND del_flag_=0
+		SELECT * FROM exam_song WHERE FIND_IN_SET(#{subjectId}, subject_list_) AND del_flag_=0 AND tenant_id_ = #{tenantId}
 	</select>
 
     <select id="getWithLevelAndType" resultMap="ExamSong">

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

@@ -210,7 +210,12 @@
 		<where>
 			eb.status_!='DELETE'
 			<if test="organId!=null">
-				AND eor.organ_id_ = #{organId}
+				AND (eor.organ_id_ = #{organId}
+					OR eb.organ_id_ IN
+					<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+						  #{organId}
+					</foreach>
+				)
 			</if>
 			<if test="examStatus!=null">
 				AND eb.status_=#{examStatus}

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")