教材新增

src/main/java/com/xjrsoft/module/student/service/impl/PbCseFeeobjupdateServiceImpl.java

@@ -56,6 +56,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 //                .selectAs(PbCseFeeobjupdate::getResourcename, PbCseFeeobjupdate::getResourcename)
                 .selectAs(PbCseFeeobjupdate::getQuartername, PbCseFeeobjupdate::getQuartername)
                 .selectAs(PbCseFeeobjupdate::getSex, PbCseFeeobjupdate::getSex)
+                .selectAs(PbCseFeeobjupdate::getGraduations, PbCseFeeobjupdate::getGraduations)
                 .eq(dto.getYear() != null, PbCseFeeobjupdate::getEnteryear, dto.getYear())
         ;
 
@@ -111,10 +112,16 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
             }
 
             //学生类型
-            Map<String, Long> studentSource = pbCseFeeobjupdateList.stream().filter(x -> x.getResourcename() != null).collect(Collectors.groupingBy(PbCseFeeobjupdate::getResourcename, Collectors.counting()));
-            List<EnrollmentStatisticsInfoKeyValue> studentSourceRes = new ArrayList<>();
-            for (Map.Entry<String, Long> entry : studentSource.entrySet()) {
-                studentSourceRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+//            Map<String, Long> studentSource = pbCseFeeobjupdateList.stream().filter(x -> x.getResourcename() != null).collect(Collectors.groupingBy(PbCseFeeobjupdate::getResourcename, Collectors.counting()));
+//            List<EnrollmentStatisticsInfoKeyValue> studentSourceRes = new ArrayList<>();
+//            for (Map.Entry<String, Long> entry : studentSource.entrySet()) {
+//                studentSourceRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
+//            }
+
+            Map<String, Long> graduations = pbCseFeeobjupdateList.stream().filter(x -> x.getGraduations() != null).collect(Collectors.groupingBy(PbCseFeeobjupdate::getGraduations, Collectors.counting()));
+            List<EnrollmentStatisticsInfoKeyValue> graduationsRes = new ArrayList<>();
+            for (Map.Entry<String, Long> entry : graduations.entrySet()) {
+                graduationsRes.add(new EnrollmentStatisticsInfoKeyValue(entry.getKey(), entry.getValue()));
             }
 
             //住宿类型
@@ -133,7 +140,7 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
             result.setRegistrationPopulation(pbCseFeeobjupdateList.size());
             result.setProfessionalHeadCount(professionalHeadCountRes);
-            result.setStudentSource(studentSourceRes);
+            result.setStudentSource(graduationsRes);
             result.setAccommodationType(accommodationTypeRes);
             result.setGender(genderRes);
 

src/main/java/com/xjrsoft/module/student/vo/EnrollmentStatisticsInfoVo.java

@@ -33,6 +33,7 @@ public class EnrollmentStatisticsInfoVo {
      */
     @ApiModelProperty("学生来源")
     private List<EnrollmentStatisticsInfoKeyValue> studentSource;
+
     /**
      * 住宿类型
      */

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -87,10 +87,16 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
     private final ITextbookCoreAttributeService textbookCoreAttributeService;
 
+    private final TextbookCoreAttributeMapper textbookCoreAttributeMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(Textbook textbook) {
         textbook.setCreateDate(new Date());
+        TextbookCoreAttribute textbookCoreAttribute = new TextbookCoreAttribute();
+        BeanUtils.copyProperties(textbook, textbookCoreAttribute);
+        textbookCoreAttributeMapper.insert(textbookCoreAttribute);
+        textbook.setTextbookCoreAttributeId(textbookCoreAttribute.getId());
         textbookTextbookMapper.insert(textbook);
         for (TextbookClassRelation textbookClassRelation : textbook.getTextbookClassRelationList()) {
             textbookClassRelation.setTextbookId(textbook.getId());