Merge remote-tracking branch 'origin/V0.0.6-iot' into V0.0.6-iot

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -159,6 +159,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         List<EvaluateTaskExportVO> list = new ArrayList<>();
         Double all = 0d;
+        // baseMapper.statisticsAll 方法不应该加机构类型参数
+        evaluateTaskStatisticsDTO.setType(null);
         for (int i = 0; i < sysOrgs.size(); i++) {
             EvaluateTaskExportVO evaluateTaskExportVO = new EvaluateTaskExportVO();
             evaluateTaskExportVO.setOrderNum(i + 1);
@@ -229,6 +231,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         List<LinkedHashMap> rows = new ArrayList<>();
         Double average = null;
         Integer all = 0;
+        // 下方baseMapper.statisticsAll 方法不应该加机构类型参数
+        evaluateTaskStatisticsDTO.setType(null);
         for (int i = 0; i < sysOrgs.size(); i++) {
             evaluateTaskStatisticsDTO.setOrgId(sysOrgs.get(i).getId());
             LinkedHashMap linkedHashMap = new LinkedHashMap();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -1204,7 +1204,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     public void buildPdf(Date date) {
 
         List<Resumption> resumptions = resumptionMapper.selectList(new LambdaQueryWrapper<Resumption>()
-                .like(Resumption::getYmdDate, DateUtils.toLocalDate(date))
+                .le(Resumption::getPlanStartTime, DateUtils.toLocalDate(date))
+                .ge(Resumption::getPlanEndTime, DateUtils.toLocalDate(date))
 //                .eq(Resumption::getStatus, 3)
                 .select(Resumption::getOrgId));
         List<Long> orgIds = resumptions.stream().map(Resumption::getOrgId).distinct().collect(Collectors.toList());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -492,12 +492,13 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             for (SysWorkTimeSet workTime : sets) {
                 List<SysWorkTime> workTimeEditDtoList = new ArrayList<>();
                 for (DateTime time : dateTimeList) {
-                    Optional<SysWorkTimeSetDayofweek> dayOfWeekSetNew = workTime.getDayOfWeeks().stream().filter(w -> w.getDayOfWeek() == time.dayOfWeek() && ObjectUtil.isNotNull(w.getIsWorkday()) && w.getIsWorkday() > 0).findFirst();
+                    Optional<SysWorkTimeSetDayofweek> dayOfWeekSetNew = workTime.getDayOfWeeks().stream().filter(w -> w.getDayOfWeek() == time.dayOfWeek() ).findFirst();
                     SysWorkTimeSetDayofweek dayOfWeekSet = dayOfWeekSetNew.orElse(null);
-                    boolean isEnable = ObjectUtil.isNotNull(dayOfWeekSet) && dayOfWeekSet.getIsWorkday() > 0;
+                    boolean isEnable = ObjectUtil.isNotNull(dayOfWeekSet) && ObjectUtil.isNotNull(dayOfWeekSet.getIsWorkday()) && dayOfWeekSet.getIsWorkday() > 0;
                     SysWorkTime dto = new SysWorkTime();
                     dto.setDate(time);
                     dto.setIsEnable(isEnable ? 1L : 0);
+                    dto.setIsDuty(ObjectUtil.isNotNull(dayOfWeekSet)?dayOfWeekSet.getIsDuty():null);
 
                     if (ObjectUtil.isNull(dayOfWeekSet) || !(dayOfWeekSet.getIsWorkday() > 0)) {
                         Optional<SysWorkTimeSetDayofweek> firstWorkDay = workTime.getDayOfWeeks().stream().filter(f -> f.getIsWorkday() > 0).findFirst();
@@ -856,6 +857,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                 dto.setDate(time);
                 dto.setOrgId(setMap.getKey());
                 dto.setIsEnable(isEnable ? 1L : 0L);
+                dto.setIsDuty(ObjectUtil.isNotNull(dayOfWeekSet)?dayOfWeekSet.getIsDuty():null);
                 if (ObjectUtil.isNull(dayOfWeekSet) || !(dayOfWeekSet.getIsWorkday() > 0)) {
                     Optional<SysWorkTimeSetDayofweek> firstWorkDay = set.getDayOfWeeks().stream().filter(f -> f.getIsWorkday() > 0).findFirst();
                     if (firstWorkDay.isPresent()) {