Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/exam

exam-06173-api/src/main/java/com/gyee/exam/modules/course/mapper/CourseMapper.java

@@ -40,7 +40,7 @@ public interface CourseMapper extends BaseMapper<Course> {
      */
     IPage<UserCourseRespDTO> userPaging(Page page, @Param("query") UserCourseReqDTO reqDTO);
 
-    List<UserCourseProcessDTO> userPagingToal(Page page, @Param("query") UserCourseReqDTO reqDTO);
+    List<UserCourseProcessDTO> userPagingToal(@Param("query") UserCourseReqDTO reqDTO);
 
     List<CourseDepartRankDTO> courseDepartRank(@Param("query") BaseQueryReqDTO reqDTO);
 

exam-06173-api/src/main/java/com/gyee/exam/modules/course/service/impl/CourseServiceImpl.java

@@ -227,7 +227,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Override
     public IPage<UserCourseRespDTO> userPaging(PagingReqDTO<UserCourseReqDTO> reqDTO) {
         IPage<UserCourseRespDTO> page = baseMapper.userPaging(reqDTO.toPage(), reqDTO.getParams());
-        Map<String, UserCourseProcessDTO> map = baseMapper.userPagingToal(reqDTO.toPage(), reqDTO.getParams()).stream().collect(Collectors.toMap(UserCourseProcessDTO::getId, userCourseProcessDTO -> userCourseProcessDTO));
+
+        Map<String, UserCourseProcessDTO> map = baseMapper.userPagingToal(reqDTO.getParams()).stream().collect(Collectors.toMap(UserCourseProcessDTO::getId, userCourseProcessDTO -> userCourseProcessDTO));
         page.getRecords().stream().forEach(i->{
             i.setNeedLearnCount(map.get(i.getId()).getNeedLearn());
             i.setLearnMinCount(map.get(i.getId()).getLearnMin());

exam-06173-api/src/main/java/com/gyee/exam/modules/exam/service/impl/ExamServiceImpl.java

@@ -292,7 +292,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements Ex
             totalDTO.setDeptCode(groupexam.get(key).get(0).getDeptCode());
             totalDTO.setDeptName(groupexam.get(key).get(0).getDeptName());
             totalDTO.setEeActualUser(groupexam.get(key).get(0).getEeActualUser()+groupuser.get(key).get(0).getEeActualUser());
-            totalDTO.setEePassUser(groupexam2.get(key).get(0).getEePassUser()+groupuser.get(key).get(0).getEePassUser());
+            totalDTO.setEePassUser(null == groupexam2.get(key) ? 0 : groupexam2.get(key).get(0).getEePassUser()+groupuser.get(key).get(0).getEePassUser());
             totalDTO.setEeTotalUser(groupexam.get(key).get(0).getEeTotalUser()+groupuser.get(key).get(0).getEeTotalUser());
             allList.add(totalDTO);
         }
@@ -308,7 +308,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements Ex
             totalDTO.setDeptName(null != groupexams ? groupexams.get(0).getDeptName() : groupusers.get(0).getDeptName());
             if (null != groupexams && groupexams.size() == 1){
                 totalDTO.setEeActualUser(groupexams.get(0).getEeActualUser());
-                totalDTO.setEePassUser(groupexams2.get(0).getEePassUser());
+                totalDTO.setEePassUser(null == groupexams2 ? 0: groupexams2.get(0).getEePassUser());
                 totalDTO.setEeTotalUser(groupexams.get(0).getEeTotalUser());
                 allList.add(totalDTO);
             }

exam-06173-api/src/main/java/com/gyee/exam/modules/paper/dto/ext/PaperQuAnswerExtDTO.java

@@ -26,6 +26,9 @@ public class PaperQuAnswerExtDTO extends PaperQuAnswerDTO {
     private String image;
 
     public void setContent(String content) {
-        this.content = content.trim();
+        if(null !=content && content.length()>0){
+            this.content = content.trim();
+        }
+
     }
 }

exam-06173-api/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: gyee-exam-api
   profiles:
-      active: dev
+      active: uat
   main:
     allow-bean-definition-overriding: true
 server: