教育培训参数修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskReportDto.java

@@ -25,9 +25,9 @@ public class CoreEduTrainingTaskReportDto {
 
     private String orgPath;
 
-    @NotEmpty(message = "请选择月份范围!")
+    @NotNull(message = "请选择月份!")
     @ApiModelProperty(value = "统计月份")
-    private List<Date> date;
+    private Date date;
 
     @ApiModelProperty(value = "统计月份开始日期")
     private Date startTime;
@@ -35,4 +35,10 @@ public class CoreEduTrainingTaskReportDto {
     @ApiModelProperty(value = "统计月份结束日期")
     private Date endTime;
 
+    @ApiModelProperty(value = "web统计范围月份")
+    private List<Date> monthDate;
+
+    @ApiModelProperty(value = "提交来源：1.web")
+    private Integer sourceType;
+
 }

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

@@ -661,8 +661,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(baseHeaderName, "utf-8"));
             response.setContentType("application/octet-stream;charset=UTF-8");
             response.setCharacterEncoding("utf-8");
-            request.setStartTime(DateUtil.beginOfMonth(request.getDate().get(0)));
-            request.setEndTime(DateUtil.endOfMonth(request.getDate().get(1)));
+
             String header=baseHeaderName+"("+DateUtil.format( request.getStartTime(),"yyyy-MM")+"至"+ DateUtil.format( request.getEndTime(),"yyyy-MM") +")";
             // 数据导出
             EasyExcel.write(response.getOutputStream(), CoreEduTrainingTaskReportVo.class)
@@ -691,8 +690,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         if (ObjectUtil.isAllEmpty(planId, planIdList)) {
             return new ArrayList<>();
         }
-        request.setStartTime(DateUtil.beginOfMonth(request.getDate().get(0)));
-        request.setEndTime(DateUtil.endOfMonth(request.getDate().get(1)));
+        if (ObjectUtil.equal(request.getSourceType(),1)){
+            request.setStartTime(DateUtil.beginOfMonth(request.getMonthDate().get(0)));
+            request.setEndTime(DateUtil.endOfMonth(request.getMonthDate().get(1)));
+        }else {
+            request.setStartTime(DateUtil.beginOfMonth(request.getDate()));
+            request.setEndTime(DateUtil.endOfMonth(request.getDate()));
+        }
 
         Long orgId = request.getOrgId();
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);