解决机构扩展信息 保存后出现重复的情况， 解决安全检查临时登记 登记时间不能选择小于当前时间的问题

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -414,6 +414,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
         data.setPlanEndTime(DateUtil.endOfDay(data.getPlanStartTime()).setField(DateField.MILLISECOND, 0));
         data.setPlanStartTime(DateUtil.beginOfDay(data.getPlanStartTime()));
+        data.setSubmitTime(data.getPlanStartTime());
         return webSubmit(data, true);
     }
 
@@ -428,7 +429,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("任务未到开始时间");
         }
 
-        if (DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))) {
+        if (!isNewTask && DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))) {
             throw new ServiceException("任务已过结束时间");
         }
 
@@ -641,7 +642,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         task.setYmdWeek(ymd.getWeek().longValue());
         task.setYmdYear(ymd.getYear().longValue());
         task.setYmdHalfyear(ymd.getHalfyear().longValue());
-        task.setSubmitTime(new Date());
+        task.setSubmitTime(data.getPlanStartTime());
         task.setSubmitorId(SecurityUtils.getUserId());
         task.setSubmitBy(SecurityUtils.getLoginUser().getName());
 

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

@@ -116,6 +116,7 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
     @Override
     public int insertSysOrgExtend(SysOrgExtend sysOrgExtend) {
         sysOrgExtend.setCreateTime(DateUtils.getNowDate());
+        sysOrgExtendMapper.delete(new LambdaQueryWrapper<SysOrgExtend>().eq(SysOrgExtend::getOrgId,sysOrgExtend.getOrgId()));
         return sysOrgExtendMapper.insert(sysOrgExtend);
     }
 
@@ -198,7 +199,9 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
     @Override
     public int updateSysOrgExtend(SysOrgExtend sysOrgExtend) {
         sysOrgExtend.setUpdateTime(DateUtils.getNowDate());
-        return sysOrgExtendMapper.updateById(sysOrgExtend);
+        sysOrgExtendMapper.delete(new LambdaQueryWrapper<SysOrgExtend>().eq(SysOrgExtend::getOrgId,sysOrgExtend.getOrgId()));
+        sysOrgExtend.setId(null);
+        return sysOrgExtendMapper.insert(sysOrgExtend);
     }
 
     /**