解决缺陷

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -500,7 +500,7 @@ public class AppCockpitServiceImpl implements AppCockpitService {
     @Override
     public AppSyntheticOtherVo syntheticOther(Long orgId, Date date) throws ExecutionException, InterruptedException, TimeoutException {
         SysOrg org = getLoginOrg(orgId);
-        DateRange range = DateUtils.getStartAndEnd(date, CycleCommonEnum.QUARTERLY);
+        DateRange range = DateUtils.getStartAndEnd(date, CycleCommonEnum.MONTHLY);
         CompletableFuture<AppSyntheticTaskCategoryDto> edu = CompletableFuture.supplyAsync(() ->
                 {
                     AppSyntheticTaskCategoryDto result = appCockpitMapper.selectSyntheticEdu(org.getPath(), range.getStartTime(), range.getEndTime());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -97,7 +97,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         for (SysLearningMaterialsPageVo record : page.getRecords()) {
             record.setNo(page.getRecords().indexOf(record));
         }
-        page.getRecords().sort(Comparator.comparing(SysLearningMaterialsPageVo::getCreateTime).reversed());
+        //page.getRecords().sort(Comparator.comparing(SysLearningMaterialsPageVo::getCreateTime).reversed());
         return TableDataInfo.success(page);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/export/CoreIntroduceLetterOutInRequestExcelVo.java

@@ -139,13 +139,13 @@ public class CoreIntroduceLetterOutInRequestExcelVo {
 //    @ExcelProperty(value = {"${cellWriterValue}","备注图片"})
 //    private String remarkImage;
 
-    @ApiModelProperty(value = "人员名称")
-    @ExcelProperty(value = {"${cellWriterValue}","人员名称"})
+    @ApiModelProperty(value = "出入人员")
+    @ExcelProperty(value = {"${cellWriterValue}","出入人员"})
     private String userName;
 
     /** 出入人员单位名称 */
-    @ApiModelProperty(value = "单位名称")
-    @ExcelProperty(value = {"${cellWriterValue}","单位名称"})
+    @ApiModelProperty(value = "申请单位")
+    @ExcelProperty(value = {"${cellWriterValue}","申请单位"})
     private String companyName;
 
     /** 证件类型 */