修复履职一系列bug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/WorkTimeUpdateResumption.java

@@ -0,0 +1,4 @@
+package com.xunmei.core.resumption.vo;
+
+public class WorkTimeUpdateResumption {
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeController.java

@@ -74,7 +74,7 @@ public class SysWorkTimeController extends BaseController {
 
         sysWorkTimeService.handleTodayChanged(orgIds, sysWorkTimeSet.getWorkTimeList(), exists, today);
         //生成任务
-        // TODO: 2023/6/19
+//         TODO: 2023/6/19
 //        if(CollectionUtil.isNotEmpty(orgIds)){
 //            this.workTimeService.handleTodayChanged(orgIds, request.getWorkTimeList(), exists, today);
 //            this.workTimeMonthService.toLogNote("批量操作作息月[ %s ][ %s ]", request.getOrgIdList(), today);

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

@@ -51,6 +51,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
     @Autowired
     private ApplicationContext context;
 
+
     public static Date extractDate(String dateString, String dateFormat) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, Locale.ENGLISH);
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -326,6 +327,8 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
                 s.setOrgId(orgId);
                 s.setIsManual(1L);
                 s.setUpdateTime(updateTime);
+                s.setModifiedId(SecurityUtils.getUserId());
+                s.setModifiedName(SecurityUtils.getUsername());
                 baseMapper.insert(s);
             }
 
@@ -384,7 +387,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
         sysWorkTime.setModifiedName(SecurityUtils.getUsername());
         sysWorkTime.setModifiedId(SecurityUtils.getUserId());
         if (DateUtil.format(sysWorkTime.getYmdDate(), "yyyy-MM-dd").equals(DateUtil.format(new Date(), "yyyy-MM-dd"))) {
-            context.publishEvent(WorkChangeEvent.builder().orgIds(Lists.newArrayList(sysWorkTime.getOrgId())).dateTime(DateTime.of(sysWorkTime.getYmdDate())).build());
+//            context.publishEvent(WorkChangeEvent.builder().orgIds(Lists.newArrayList(sysWorkTime.getOrgId())).dateTime(DateTime.of(sysWorkTime.getYmdDate())).build());
         }
         return sysWorkTimeMapper.updateById(sysWorkTime);
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/util/WorkChangeEvent.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/WorkChangeEvent.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * 作息改变的事件
  */
-public class WorkChangeEvent extends Event {
+public class WorkChangeEvent extends com.xunmei.system.util.Event {
 
     private List<Long> orgIds;