update

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

@@ -75,7 +75,7 @@ public class ExamOrganizationRelationController extends BaseController {
     }
 
     @ApiOperation("获取本单位项目信息")
-    @PostMapping(value = "/getExamOrganStatistics")
+    @GetMapping(value = "/getExamOrganStatistics")
     public HttpResponseResult getExamOrganStatistics(Long examId){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){

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

@@ -59,6 +59,9 @@ public class ExamRegistrationController extends BaseController {
         }else if(sysUser.getIsSuperAdmin()){
             queryInfo.setOrganId(null);
         }
+        if(Objects.nonNull(queryInfo.getOrganizationId())){
+            queryInfo.setOrganId(queryInfo.getOrganizationId());
+        }
         return succeed(examRegistrationService.queryExamRegistrationStudents(queryInfo));
     }
 

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

@@ -2,8 +2,12 @@ package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.entity.ExamLifecycleLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ExamLifecycleLogDao extends BaseDAO<Long, ExamLifecycleLog> {
 
+    List<ExamLifecycleLog> findWithExam(@Param("examId") Long examId);
 	
 }

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

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.dto.ExamOrganStatisticsDto;
 import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.Organization;
@@ -104,7 +105,7 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
      * @param OrganId
      * @return
      */
-    ExamOrganizationRelation getExamOrganizationRelation(@Param("examId") Long examId, @Param("OrganId") Integer OrganId);
+    ExamOrganStatisticsDto getExamOrganizationRelation(@Param("examId") Long examId, @Param("OrganId") Integer OrganId);
 
     /**
      * 获取考级项目关联合作单位信息

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

@@ -306,20 +306,25 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		if(Objects.isNull(examinationBasic)){
 			throw new BizException("考级项目不存在");
 		}
-		ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examId, organId);
-		ExamOrganStatisticsDto examOrganStatistics = new ExamOrganStatisticsDto();
-		try {
-			examOrganStatistics = (ExamOrganStatisticsDto) BeanUtils.cloneBean(examOrganizationRelation);
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InstantiationException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-		}
+		ExamOrganStatisticsDto examOrganStatistics = examOrganizationRelationDao.getExamOrganizationRelation(examId, organId);
+
+		Map<String, BigDecimal> dayTransAmount=new HashMap<>();
+		Map<String, BigDecimal> dayPaymentAmount=new HashMap<>();
 
+		LocalDate today = LocalDate.now();
+		List<String> days=new ArrayList<>();
+		days.add(today.toString());
+		for (int i=-1;i>-7;i--){
+			today.plusDays(i);
+			days.add(today.toString());
+		}
+		for (String day : days) {
+			dayTransAmount.put(day, BigDecimal.valueOf(Math.random()*100));
+			dayPaymentAmount.put(day, BigDecimal.valueOf(Math.random()*100));
+		}
+		examOrganStatistics.setDayTransAmount(dayTransAmount);
+		examOrganStatistics.setDayPaymentAmount(dayPaymentAmount);
+		examOrganStatistics.setExamLifecycleLogs(examLifecycleLogDao.findWithExam(examId));
 		return examOrganStatistics;
 	}
 

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

@@ -72,4 +72,8 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM exam_lifecycle_log
 	</select>
+
+    <select id="findWithExam" resultType="com.keao.edu.user.entity.ExamLifecycleLog">
+		SELECT * FROM exam_lifecycle_log WHERE examination_basic_id_=#{examId} ORDER id_ DESC
+	</select>
 </mapper>

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

@@ -28,6 +28,10 @@
 	<resultMap id="ExamOrganizationRelationExtraDto" type="com.keao.edu.user.dto.ExamOrganizationRelationExtraDto" extends="ExamOrganizationRelation">
 		<result column="organ_name_" property="organizationName"/>
 	</resultMap>
+
+	<resultMap id="ExamOrganStatisticsDto" type="com.keao.edu.user.dto.ExamOrganStatisticsDto" extends="ExamOrganizationRelation">
+
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ExamOrganizationRelation" >
@@ -319,7 +323,7 @@
     </select>
 
 	<!-- 获取项目合作机构关联信息 -->
-    <select id="getExamOrganizationRelation" resultMap="ExamOrganizationRelation">
+    <select id="getExamOrganizationRelation" resultMap="ExamOrganStatisticsDto">
 		SELECT * FROM exam_organization_relation WHERE examination_basic_id_=#{examId} AND organ_id_=#{OrganId} FOR UPDATE
 	</select>
 	<select id="getExamOrganizationRelations" resultMap="ExamOrganizationRelation">