wangliang 1 年間 前
コミット
22f80b9e3e

+ 12 - 6
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEOrgSummaryServiceImpl.java

@@ -19,7 +19,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -97,18 +96,25 @@ public class TEOrgSummaryServiceImpl extends ServiceImpl<TEOrgSummaryMapper, TEO
     @Override
     public void orgSummary(Long orgId) {
         List<Long> examIdSet = null;
+        TEOrgSummary teOrgSummary = null;
         if (orgId.longValue() != 0) {//全局机构
             List<TEExam> teExamList = teExamService.list(new QueryWrapper<TEExam>().lambda().eq(TEExam::getOrgId, orgId));
             if (!CollectionUtils.isEmpty(teExamList)) {
                 examIdSet = teExamList.stream().map(s -> s.getId()).collect(Collectors.toList());
+                OrgSummaryBean orgSummaryBean = this.baseMapper.orgSummary(orgId, examIdSet, true);
+                Integer finishStudentCount = this.baseMapper.orgSummaryByFinishStudentCount(orgId, examIdSet);
+                orgSummaryBean.setFinishStudentCount(finishStudentCount);
+                teOrgSummary = new TEOrgSummary(orgId, orgSummaryBean);
             } else {
-                examIdSet = Arrays.asList(-1L);
+                OrgSummaryBean orgSummaryBean = new OrgSummaryBean();
+                teOrgSummary = new TEOrgSummary(orgId, orgSummaryBean);
             }
+        } else {
+            OrgSummaryBean orgSummaryBean = this.baseMapper.orgSummary(orgId, null, true);
+            Integer finishStudentCount = this.baseMapper.orgSummaryByFinishStudentCount(orgId, null);
+            orgSummaryBean.setFinishStudentCount(finishStudentCount);
+            teOrgSummary = new TEOrgSummary(orgId, orgSummaryBean);
         }
-        OrgSummaryBean orgSummaryBean = this.baseMapper.orgSummary(orgId, examIdSet, true);
-        Integer finishStudentCount = this.baseMapper.orgSummaryByFinishStudentCount(orgId, examIdSet);
-        orgSummaryBean.setFinishStudentCount(finishStudentCount);
-        TEOrgSummary teOrgSummary = new TEOrgSummary(orgId, orgSummaryBean);
         teOrgSummaryService.save(teOrgSummary);
         themisCacheService.updateOrgSummaryCache(orgId);
     }