Merge remote-tracking branch 'origin/master'

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

@@ -185,5 +185,5 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @param organIds:
      * @return com.keao.edu.user.dto.OrganExamRegistStatisticsDto
      */
-    OrganExamRegistStatisticsDto getOrganExamRegistStatistics(@Param("organIds") List<Integer> organIds);
+    List<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(Map<String, Object> params);
 }

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

@@ -96,8 +96,8 @@ public interface ExamRegistrationService extends BaseService<Long, ExamRegistrat
     * @describe 统计合作单位的招生人数
     * @author Joburgess
     * @date 2020.08.12
-    * @param organId:
+    * @param queryInfo:
     * @return com.keao.edu.user.dto.OrganExamRegistStatisticsDto
     */
-   OrganExamRegistStatisticsDto getOrganExamRegistStatistics(Integer organId);
+   PageInfo<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(QueryInfo queryInfo);
 }

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

@@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -402,11 +401,25 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     }
 
     @Override
-    public OrganExamRegistStatisticsDto getOrganExamRegistStatistics(Integer organId) {
-        List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, false);
-        if(CollectionUtils.isEmpty(childOrganIds)){
-            return null;
+    public PageInfo<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(QueryInfo queryInfo) {
+        PageInfo<OrganExamRegistStatisticsDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), false);
+        params.put("organIds", childOrganIds);
+
+        List<OrganExamRegistStatisticsDto> dataList = null;
+        int count = childOrganIds.size();
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = examRegistrationDao.getOrganExamRegistStatistics(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
         }
-        return examRegistrationDao.getOrganExamRegistStatistics(childOrganIds);
+        pageInfo.setRows(dataList);
+        return pageInfo;
     }
 }

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

@@ -447,7 +447,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		}
 
 		Set<Integer> locationIds = examRoomStudentWithOrgans.stream().filter(e -> Objects.nonNull(e.getExamLocationId())).map(ExamRoomStudentRelation::getExamLocationId).collect(Collectors.toSet());
-		Map<Integer, String> idLocationMap = this.getMap("exam_location", "id_", "name_", new ArrayList(locationIds), Integer.class, String.class);
+		Map<Integer, String> idLocationMap = this.getMap("exam_location", "id_", "address_", new ArrayList(locationIds), Integer.class, String.class);
 
 		Set<Integer> allStudentIds = examRoomStudentWithOrgans.stream().map(ExamRoomStudentRelation::getStudentId).collect(Collectors.toSet());
 		Map<Integer, String> idPhoneMap = this.getMap("sys_user", "id_", "phone_", new ArrayList(allStudentIds), Integer.class, String.class);

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

@@ -172,7 +172,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 				ec.setExamStartTime(examRoom.getExamStartTime());
 				ec.setExamEndTime(examRoom.getExamEndTime());
 				if(ExamModeEnum.OFFLINE.equals(examRoom.getExamMode())){
-					ec.setExamAddress(examLocation.getName());
+					ec.setExamAddress(examLocation.getAddress());
 				}
 				ec.setTenantId(TenantContextHolder.getTenantId());
 				examCertifications.add(ec);

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

@@ -116,10 +116,10 @@
 				AND eml.target_organ_id_ IS NULL
 			</if>
 			<if test="startTime != null">
-				AND eml.trans_time_ &gt;= #{startTime}
+				AND date(eml.trans_time_) &gt;= #{startTime}
 			</if>
 			<if test="endTime != null">
-				AND eml.trans_time_ &lt;= #{endTime}
+				AND date(eml.trans_time_) &lt;= #{endTime}
 			</if>
 			<if test="search != null">
 				AND (eml.id_ like concat('%',#{search},'%') or su.real_name_ like concat('%',#{search},'%'))

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

@@ -663,5 +663,7 @@
 		</foreach>
 		GROUP BY
 			er.organ_id_
+		ORDER BY o.id_
+		<include refid="global.limit"/>
 	</select>
 </mapper>

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

@@ -155,18 +155,17 @@ public class ExamRegistrationController extends BaseController {
 
     @ApiOperation(value = "统计合作单位的招生人数")
     @GetMapping(value = "getOrganExamRegistStatistics")
-//    @PreAuthorize("@pcs.hasPermissions('examRegistration/getOrganExamRegistStatistics')")
-    public HttpResponseResult<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(){
+    @PreAuthorize("@pcs.hasPermissions('examRegistration/getOrganExamRegistStatistics')")
+    public HttpResponseResult<PageInfo<OrganExamRegistStatisticsDto>> getOrganExamRegistStatistics(QueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        Integer organId = null;
         if(!sysUser.getIsSuperAdmin()){
             Employee employee = employeeService.get(sysUser.getId());
             if(Objects.isNull(employee)){
                 return failed("用户信息异常");
             }
-            organId = employee.getOrganId();
+            queryInfo.setOrganId(employee.getOrganId());
         }
-        return succeed(examRegistrationService.getOrganExamRegistStatistics(organId));
+        return succeed(examRegistrationService.getOrganExamRegistStatistics(queryInfo));
     }
 
 }