Merge remote-tracking branch 'origin/master'

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

@@ -52,4 +52,26 @@ public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
      */
     List<Map<Integer, BigDecimal>> countOrgansLedgerWithExam(@Param("examId") Long examId,
                                                              @Param("organIds") List<Integer> organIds);
+
+    /**
+     * 获取每天支出
+     * @param tenantId
+     * @param days
+     * @return
+     */
+    List<Map<String, BigDecimal>> getDayPayment(@Param("tenantId") String tenantId, @Param("days") List<String> days);
+
+    /**
+     * 获取当年支出
+     * @param tenantId
+     * @return
+     */
+    BigDecimal getAnnualPayment(String tenantId);
+
+    /**
+     * 获取当月支出
+     * @param tenantId
+     * @return
+     */
+    BigDecimal getMonthPayment(String tenantId);
 }

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

@@ -182,8 +182,8 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @describe 统计合作单位的招生人数
      * @author Joburgess
      * @date 2020.08.12
-     * @param organIds:
      * @return com.keao.edu.user.dto.OrganExamRegistStatisticsDto
      */
     List<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(Map<String, Object> params);
+    int countOrganExamRegistStatistics(Map<String, Object> params);
 }

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

@@ -109,5 +109,5 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      * @param tenantId
      * @return
      */
-    List<Map<String, BigDecimal>> getDayIncome(@Param("tenantId") String tenantId, @Param("day") Integer day);
+    List<Map<String, BigDecimal>> getDayIncome(@Param("tenantId") String tenantId, @Param("days") List<String> days);
 }

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

@@ -46,7 +46,8 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
      * @param organIds:
      * @return java.util.List<com.keao.edu.user.dto.ExaminationBasicDto>
      */
-    List<ExaminationBasicDto> getUnderwayExams(@Param("organs") List<Integer> organIds);
+    List<ExaminationBasicDto> getUnderwayExams(@Param("organId") Integer organId,
+                                                @Param("organIds") List<Integer> organIds);
 
     /**
      * @describe 获取机构考级项目统计信息
@@ -55,5 +56,5 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
      * @param organIds:
      * @return com.keao.edu.user.dto.ExamStatisticsDto
      */
-    ExamStatisticsDto getTenantExamStatistics(@Param("organs") List<Integer> organIds);
+    ExamStatisticsDto getTenantExamStatistics(@Param("organIds") List<Integer> organIds);
 }

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

@@ -94,8 +94,12 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
 
 
     /**
-     * 获取首页收入支出
-     * @return
+     * @describe 获取首页收入支出
+     * @author zouxuan
+     * @date 15:42
+     * @param tenantId:
+     * @param day:
+     * @return java.lang.Object
      */
     Object homeBalanceOfPayment(String tenantId,Integer day);
 

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

@@ -410,7 +410,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         params.put("organIds", childOrganIds);
 
         List<OrganExamRegistStatisticsDto> dataList = null;
-        int count = childOrganIds.size();
+        int count = examRegistrationDao.countOrganExamRegistStatistics(params);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());

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

@@ -738,10 +738,16 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	}
 
 	public PublishMessageDto getPublishMessage(Long examRegistrationId){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.getStudentExamRoom(examRegistrationId);
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		String userId;
+		if(sysUser == null || sysUser.getId() == null){
+			ExamRoom examRoom = examRoomDao.get(examRoomStudentRelation.getExamRoomId());
+			userId = examRoom.getMainTeacherUserId().toString();
+		}else {
+			userId = sysUser.getId().toString();
+		}
 		PublishMessageDto publishMessageDto = new PublishMessageDto();
-		String userId = sysUser.getId().toString();
 		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(examRoomStudentRelation.getExamRoomId().toString());
 		MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Student_Queue, examRoomStudentRelation.getStudentId().toString(),3);

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

@@ -3,7 +3,6 @@ package com.keao.edu.user.service.impl;
 import com.keao.edu.common.dal.BaseDAO;
 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.ExamSongDao;
@@ -20,7 +19,6 @@ import com.keao.edu.user.page.ExamSubjectSongQueryInfo;
 import com.keao.edu.user.service.ExamSubjectSongService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -65,6 +63,14 @@ public class ExamSubjectSongServiceImpl extends BaseServiceImpl<Long, ExamSubjec
 			throw new BizException("此状态考级项目不支持添加考级内容");
 		}
 
+		examSubjectSongs.stream()
+				.collect(Collectors.groupingBy(ExamSubjectSong::getExamSubjectId)).values().forEach(e->{
+			Set<Integer> levels = e.stream().map(ExamSubjectSong::getLevel).collect(Collectors.toSet());
+			if(levels.size()!=e.size()){
+				throw new BizException("考级内容等级重复");
+			}
+		});
+
 		List<ExamSubjectSong> existExamSubjectSongs=examSubjectSongDao.findByExam(examSubjectSongs.get(0).getExaminationBasicId());
 		Map<Long, List<Integer>> subjectLevelMap = new HashMap<>();
 		Set<Long> existSubjectIds = new HashSet<>();

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

@@ -1,6 +1,5 @@
 package com.keao.edu.user.service.impl;
 
-import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.enums.MessageTypeEnum;
@@ -67,7 +66,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     @Autowired
     private ExamRegistrationPaymentDao examRegistrationPaymentDao;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private ExamManualLedgerDao examManualLedgerDao;
     @Autowired
     private ExamTeacherSalaryService examTeacherSalaryService;
 
@@ -451,7 +450,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     public Map<String, Object> getHomePageExams(Integer organId) {
         Map<String, Object> result=new HashMap<>();
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
-        List<ExaminationBasicDto> dataList = examinationBasicDao.getUnderwayExams(childOrganIds);
+        List<ExaminationBasicDto> dataList = examinationBasicDao.getUnderwayExams(organId,childOrganIds);
         if(CollectionUtils.isEmpty(dataList)){
             return result;
         }
@@ -484,10 +483,46 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
     @Override
     public Object homeBalanceOfPayment(String tenantId,Integer day) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(day == null){
+            day = 7;
+        }
+        day = day * -1;
+
         BigDecimal annualIncome = examRegistrationPaymentDao.getAnnualIncome(tenantId);
         BigDecimal monthIncome = examRegistrationPaymentDao.getMonthIncome(tenantId);
-        List<Map<String,BigDecimal>> dayIncomes = examRegistrationPaymentDao.getDayIncome(tenantId,day);
-        return null;
+
+        LocalDate today = LocalDate.now();
+        List<String> days=new ArrayList<>();
+        days.add(today.toString());
+        for (int i = -1 ;i > day;i--){
+            days.add(today.plusDays(i).toString());
+        }
+        Map<String,BigDecimal> dayIncomes = MapUtil.convertMybatisMap(examRegistrationPaymentDao.getDayIncome(tenantId,days),String.class,BigDecimal.class);
+        Map<String,BigDecimal> dayPayments = MapUtil.convertMybatisMap(examManualLedgerDao.getDayPayment(tenantId,days),String.class,BigDecimal.class);
+        days.forEach(e->{
+            if(dayIncomes.get(e) == null){
+                dayIncomes.put(e,BigDecimal.ZERO);
+            }
+            if(dayPayments.get(e) == null){
+                dayPayments.put(e,BigDecimal.ZERO);
+            }
+        });
+        LinkedHashMap<String,BigDecimal> hashMap1 = new LinkedHashMap<>();
+        dayIncomes.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered(e -> hashMap1.put(e.getKey(), e.getValue()));
+        LinkedHashMap<String,BigDecimal> hashMap2 = new LinkedHashMap<>();
+        dayPayments.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered(e -> hashMap2.put(e.getKey(), e.getValue()));
+
+        BigDecimal annualPayment = examManualLedgerDao.getAnnualPayment(tenantId);
+        BigDecimal monthPayment = examManualLedgerDao.getMonthPayment(tenantId);
+        HashMap<Object, Object> resultMap = new HashMap<>(6);
+        resultMap.put("annualIncome",annualIncome);
+        resultMap.put("monthIncome",monthIncome);
+        resultMap.put("dayIncomes",hashMap1);
+        resultMap.put("annualPayment",annualPayment);
+        resultMap.put("monthPayment",monthPayment);
+        resultMap.put("dayPayments",hashMap2);
+        return resultMap;
     }
 }

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

@@ -215,9 +215,16 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			for (Object examResultConfig : examResultConfigs) {
 				Integer startScore = ((JSONObject) examResultConfig).getInteger("startScore");
 				Integer endScore = ((JSONObject) examResultConfig).getInteger("endScore");
-				if(studentExamResult.getAvgScore()>=startScore&&studentExamResult.getAvgScore()<=endScore){
-					String levelName = ((JSONObject) examResultConfig).getString("levelName");
+				String levelName = ((JSONObject) examResultConfig).getString("levelName");
+				boolean b;
+				if(levelName.equals(ExamEvaluationResultEnum.EXCELLENT.getCode())){
+					b = studentExamResult.getAvgScore()>=startScore&&studentExamResult.getAvgScore()<=endScore;
+				}else{
+					b = studentExamResult.getAvgScore()>=startScore&&studentExamResult.getAvgScore()<endScore;
+				}
+				if(b){
 					studentExamResult.setResult(ExamEvaluationResultEnum.valueOf(levelName));
+					break;
 				}
 			}
 		}

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

@@ -206,4 +206,23 @@
 		GROUP BY
 			target_organ_id_;
     </select>
+    <select id="getDayPayment" resultType="java.util.Map">
+		SELECT DATE_FORMAT(eml.trans_time_,'%Y-%m-%d') 'key',SUM(eml.amount_) 'value' FROM exam_manual_ledger eml
+		WHERE eml.tenant_id_ = #{tenantId} AND eml.trans_direction_ = 'EXPENDITURE'
+		AND DATE_FORMAT(eml.trans_time_,'%Y-%m-%d') IN
+		<foreach collection="days" open="(" close=")" item="day" separator=",">
+			#{day}
+		</foreach>
+		GROUP BY DATE_FORMAT(eml.trans_time_,'%Y-%m-%d')
+	</select>
+	<select id="getAnnualPayment" resultType="java.math.BigDecimal">
+		SELECT SUM(eml.amount_) FROM exam_manual_ledger eml
+        WHERE eml.trans_direction_ = 'EXPENDITURE' AND DATE_FORMAT(eml.trans_time_,'%Y') = DATE_FORMAT(NOW(),'%Y')
+        AND eml.tenant_id_ = #{tenantId}
+	</select>
+	<select id="getMonthPayment" resultType="java.math.BigDecimal">
+		SELECT SUM(eml.amount_) FROM exam_manual_ledger eml
+        WHERE eml.trans_direction_ = 'EXPENDITURE' AND DATE_FORMAT(eml.trans_time_,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
+        AND eml.tenant_id_ = #{tenantId}
+	</select>
 </mapper>

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

@@ -655,15 +655,31 @@
 			SUM(CASE WHEN YEAR(er.create_time_)!=YEAR(NOW()) THEN 1 ELSE 0 END) 'historyRegistStudentNum'
 		FROM
 			organization o
-			LEFT JOIN exam_registration er ON er.organ_id_ = o.id_
-		WHERE er.status_ IN ('AUDIT_WAIT', 'AUDIT_PASS', 'AUDIT_REJECT')
-		AND o.id_ IN
-		<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-			#{organId}
-		</foreach>
+			LEFT JOIN exam_registration er ON er.organ_id_ = o.id_ AND er.status_ IN ('AUDIT_WAIT', 'AUDIT_PASS', 'AUDIT_REJECT')
+		WHERE 1=1
+			<if test="organIds!=null">
+				AND o.id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 		GROUP BY
-			er.organ_id_
+			o.id_
 		ORDER BY o.id_
 		<include refid="global.limit"/>
 	</select>
+
+	<select id="countOrganExamRegistStatistics" resultType="int">
+		SELECT
+			COUNT(o.id_)
+		FROM
+			organization o
+		WHERE 1=1
+			<if test="organIds!=null">
+				AND o.id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
+	</select>
 </mapper>

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

@@ -246,18 +246,22 @@
     </select>
     <select id="getAnnualIncome" resultType="java.math.BigDecimal">
         SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
-        WHERE erp.examination_basic_id_ = 1 AND erp.trans_status_ = 'SUCCESS'
-        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') = DATE_FORMAT('2020-08-12','%Y-%m-%d')
+        WHERE erp.trans_status_ = 'SUCCESS' AND DATE_FORMAT(erp.trans_successed_time_,'%Y') = DATE_FORMAT(NOW(),'%Y')
+        AND erp.tenant_id_ = #{tenantId};
     </select>
     <select id="getMonthIncome" resultType="java.math.BigDecimal">
         SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
-        WHERE erp.examination_basic_id_ = 1 AND erp.trans_status_ = 'SUCCESS'
-        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') = DATE_FORMAT('2020-08-12','%Y-%m-%d')
+        WHERE erp.trans_status_ = 'SUCCESS' AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
+        AND erp.tenant_id_ = #{tenantId}
     </select>
     <select id="getDayIncome" resultType="java.util.Map">
-        SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
-        WHERE erp.examination_basic_id_ = 1 AND erp.trans_status_ = 'SUCCESS'
-        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') = DATE_FORMAT('2020-08-12','%Y-%m-%d')
+        SELECT DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') 'key',SUM(erp.trans_amount_) 'value' FROM exam_registration_payment erp
+        WHERE erp.tenant_id_ = #{tenantId} AND erp.trans_status_ = 'SUCCESS'
+        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') IN
+        <foreach collection="days" open="(" close=")" item="day" separator=",">
+            #{day}
+        </foreach>
+        GROUP BY DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d')
     </select>
 
     <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto"

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

@@ -197,7 +197,7 @@
 		</if>
 	</select>
     <select id="getStudentExamRoom" resultMap="ExamRoomStudentRelation">
-		SELECT * FROM exam_room_student_relation WHERE exam_registration_id_ = #{registId}
+		SELECT * FROM exam_room_student_relation WHERE exam_registration_id_ = #{registId} LIMIT 1 FOR UPDATE
     </select>
 	<select id="findByStudentIdAndRoomId" resultMap="ExamRoomStudentRelation">
 		SELECT ersr.* FROM exam_room_student_relation ersr

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

@@ -290,19 +290,22 @@
 	</select>
 
     <select id="getUnderwayExams" resultMap="ExaminationBasicDto">
-		SELECT
-			*
+		SELECT DISTINCT eb.*
 		FROM
-			examination_basic
-		WHERE
-			status_ IN ( 'APPLYING', 'APPLIED' )
-			AND organ_id_ IN
-			<foreach collection="organs" item="organ" separator="," open="(" close=")">
-				#{organ}
-			</foreach>
+		exam_organization_relation eor
+		LEFT JOIN examination_basic eb ON eor.examination_basic_id_ = eb.id_
+		WHERE status_ IN ( 'APPLYING', 'APPLIED' )
+		<if test="organId!=null">
+			AND (eor.organ_id_ = #{organId}
+				OR eb.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+				)
+		</if>
 		ORDER BY
-			create_time_ DESC
-			LIMIT 6;
+		create_time_ DESC
+		LIMIT 6;
 	</select>
 
 	<select id="getTenantExamStatistics" resultType="com.keao.edu.user.dto.ExamStatisticsDto">
@@ -313,9 +316,11 @@
 			examination_basic
 		WHERE
 			status_ NOT IN ( 'CLOSE', 'DELETE' )
-			AND organ_id_ IN
-			<foreach collection="organs" item="organ" separator="," open="(" close=")">
-				#{organ}
-			</foreach>
+			<if test="organIds!=null">
+				AND organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 	</select>
 </mapper>

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

@@ -281,7 +281,7 @@
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	<select id="getStudentExamResultApiDto" resultMap="StudentExamResultApiDto">
-		SELECT * FROM student_exam_result WHERE exam_registration_id_ = #{examRegistrationId} LIMIT 1
+		SELECT * FROM student_exam_result WHERE exam_registration_id_ = #{examRegistrationId} LIMIT 1 FOR UPDATE
 	</select>
 
 	<select id="getWithExam" resultMap="StudentExamResult">

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

@@ -116,7 +116,7 @@ public class ExaminationBasicController extends BaseController {
     }
 
     @ApiOperation("获取首页进行中项目")
-    @PostMapping(value = "/getHomePageExams")
+    @GetMapping(value = "/getHomePageExams")
     @PreAuthorize("@pcs.hasPermissions('examinationBasic/getHomePageExams')")
     public HttpResponseResult getHomePageExams(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();

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

@@ -38,6 +38,7 @@ public class StudentExamResultController extends BaseController {
     @Autowired
     private EmployeeService employeeService;
 
+
     @RequestMapping(value = "/recordSync")
     public void recordSync(@RequestBody String body) throws Exception {
         RecordNotify recordNotify = JSONObject.parseObject(body, RecordNotify.class);