|
@@ -1,5 +1,6 @@
|
|
package com.persagy.calendar.service.impl;
|
|
package com.persagy.calendar.service.impl;
|
|
|
|
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -10,10 +11,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
|
|
import com.persagy.calendar.constant.WorkCalendarConstant;
|
|
import com.persagy.calendar.constant.WorkCalendarConstant;
|
|
|
|
+import com.persagy.calendar.mapper.WorkCalendarDateMapper;
|
|
import com.persagy.calendar.mapper.WorkCalendarRuleMapper;
|
|
import com.persagy.calendar.mapper.WorkCalendarRuleMapper;
|
|
|
|
+import com.persagy.calendar.pojo.dto.WorkCalendarDate;
|
|
import com.persagy.calendar.pojo.dto.WorkCalendarRule;
|
|
import com.persagy.calendar.pojo.dto.WorkCalendarRule;
|
|
import com.persagy.calendar.pojo.dto.WorkCalendarRule.Builder;
|
|
import com.persagy.calendar.pojo.dto.WorkCalendarRule.Builder;
|
|
import com.persagy.calendar.service.IWorkCalendarRuleService;
|
|
import com.persagy.calendar.service.IWorkCalendarRuleService;
|
|
|
|
+import com.persagy.common.utils.DateUtil;
|
|
import com.persagy.common.utils.StringUtil;
|
|
import com.persagy.common.utils.StringUtil;
|
|
import com.persagy.db.service.impl.SuperServiceImpl;
|
|
import com.persagy.db.service.impl.SuperServiceImpl;
|
|
|
|
|
|
@@ -32,6 +36,9 @@ public class WorkCalendarRuleServiceImpl extends SuperServiceImpl<WorkCalendarRu
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private WorkCalendarRuleMapper workCalendarRuleMapper;
|
|
private WorkCalendarRuleMapper workCalendarRuleMapper;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private WorkCalendarDateMapper workCalendarDateMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<WorkCalendarRule> queryRuleByCalendarId(String calendarId, String projectId) {
|
|
public List<WorkCalendarRule> queryRuleByCalendarId(String calendarId, String projectId) {
|
|
@@ -108,11 +115,24 @@ public class WorkCalendarRuleServiceImpl extends SuperServiceImpl<WorkCalendarRu
|
|
updateWrapper = builder.idEq(id).delFlagEq(WorkCalendarConstant.WORK_CALENDAR_DEL_FLAG_NOR)
|
|
updateWrapper = builder.idEq(id).delFlagEq(WorkCalendarConstant.WORK_CALENDAR_DEL_FLAG_NOR)
|
|
.builderUpdateWrapper();
|
|
.builderUpdateWrapper();
|
|
result = workCalendarRuleMapper.delete(updateWrapper);
|
|
result = workCalendarRuleMapper.delete(updateWrapper);
|
|
|
|
+ if (SqlHelper.retBool(result)) {
|
|
|
|
+ // 删除此工作历规则下当天的非自定义的作息时间数据
|
|
|
|
+ QueryWrapper<WorkCalendarDate> wrapper = new WorkCalendarDate.Builder().createQueryWrapper().ruleIdEq(id).dictTypeEq(dictType)
|
|
|
|
+ .workDateEq(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYYMMDD)).builderQueryWrapper();
|
|
|
|
+ result = this.workCalendarDateMapper.delete(wrapper);
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
updateWrapper = builder.calendarIdEq(calendarId).dictTypeEq(dictType)
|
|
updateWrapper = builder.calendarIdEq(calendarId).dictTypeEq(dictType)
|
|
.delFlagEq(WorkCalendarConstant.WORK_CALENDAR_DEL_FLAG_NOR).builderUpdateWrapper();
|
|
.delFlagEq(WorkCalendarConstant.WORK_CALENDAR_DEL_FLAG_NOR).builderUpdateWrapper();
|
|
result = workCalendarRuleMapper.delete(updateWrapper);
|
|
result = workCalendarRuleMapper.delete(updateWrapper);
|
|
|
|
+ if (SqlHelper.retBool(result)) {
|
|
|
|
+ // 删除此工作历规则下当天的非自定义的作息时间数据
|
|
|
|
+ QueryWrapper<WorkCalendarDate> wrapper = new WorkCalendarDate.Builder().createQueryWrapper().calendarIdEq(calendarId)
|
|
|
|
+ .dictTypeEq(dictType).workDateEq(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYYMMDD)).builderQueryWrapper();
|
|
|
|
+ result = this.workCalendarDateMapper.delete(wrapper);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
return SqlHelper.retBool(result);
|
|
return SqlHelper.retBool(result);
|
|
}
|
|
}
|
|
|
|
|