|
|
|
|
@ -1,5 +1,7 @@
|
|
|
|
|
package com.hnac.hzims.operational.duty.service.impl; |
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
import com.alibaba.fastjson.serializer.SerializerFeature; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
@ -16,15 +18,18 @@ import com.hnac.hzims.operational.duty.enume.JoinStatus;
|
|
|
|
|
import com.hnac.hzims.operational.duty.mapper.*; |
|
|
|
|
import com.hnac.hzims.operational.duty.scheduled.ThreadTask; |
|
|
|
|
import com.hnac.hzims.operational.duty.service.*; |
|
|
|
|
import com.hnac.hzims.operational.duty.utils.ExcelToolListener; |
|
|
|
|
import com.hnac.hzims.operational.duty.vo.*; |
|
|
|
|
import com.hnac.hzims.operational.main.vo.DutyPersonalReportVO; |
|
|
|
|
import com.hnac.hzims.operational.report.vo.DutyReportVO; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.apache.commons.lang3.SerializationUtils; |
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.*; |
|
|
|
|
import org.springblade.system.cache.SysCache; |
|
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
|
import org.springblade.system.user.feign.IUserClient; |
|
|
|
|
@ -33,19 +38,25 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
import org.springframework.util.ObjectUtils; |
|
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
|
import java.io.IOException; |
|
|
|
|
import java.io.InputStream; |
|
|
|
|
import java.sql.Time; |
|
|
|
|
import java.text.DateFormat; |
|
|
|
|
import java.text.ParseException; |
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
|
import java.time.YearMonth; |
|
|
|
|
import java.time.ZoneId; |
|
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.function.Function; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
import static com.hnac.hzims.operational.duty.utils.ExcelUtil.asyncReadModel; |
|
|
|
|
/** |
|
|
|
|
* 服务实现类 |
|
|
|
|
* |
|
|
|
|
@ -292,6 +303,446 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
|
|
|
|
|
return cycleSchedulingTowV2(imsSchedulingVo, dates, imsDutyMainEntity1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R getSchedulingV3(ImsSchedulingNewVo vo) { |
|
|
|
|
String startDate=vo.getStartDate(); |
|
|
|
|
String endDate=vo.getEndDate(); |
|
|
|
|
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
try { |
|
|
|
|
Date start=sdf.parse(startDate); |
|
|
|
|
Date end=sdf.parse(endDate); |
|
|
|
|
Date now=new Date(); |
|
|
|
|
if(start.compareTo(now) <= 0){ |
|
|
|
|
return R.fail("开始时间应从明天开始"); |
|
|
|
|
} |
|
|
|
|
if(end.compareTo(now) <= 0){ |
|
|
|
|
return R.fail("结束时间应从明天开始"); |
|
|
|
|
} |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
return R.fail("开始时间格式不对"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//判断是否符合排班规则。
|
|
|
|
|
String[] start = startDate.split("-"); |
|
|
|
|
String[] end = endDate.split("-"); |
|
|
|
|
Calendar cal = Calendar.getInstance(); |
|
|
|
|
int year = cal.get(Calendar.YEAR); |
|
|
|
|
int month = cal.get(Calendar.MONTH) + 1;//获取月份
|
|
|
|
|
int day = cal.get(Calendar.DAY_OF_MONTH); |
|
|
|
|
String date1 = getDate(year, month, day); |
|
|
|
|
String date2 = DateUtils.dayStringDate(date1, 1, true); |
|
|
|
|
if (!vo.getStartDate().equals(date2)) { |
|
|
|
|
String minusOnedDay = DateUtils.dayStringDate(vo.getStartDate(), 1, false); |
|
|
|
|
log.info("--------------Auth:" + AuthUtil.getDeptId() + "--------createDept:" + vo.getDeptId()); |
|
|
|
|
List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, vo.getDeptId()); |
|
|
|
|
if (CollectionUtil.isEmpty(imsDutyMainEntities)) { |
|
|
|
|
return R.fail("所选日期之前存在未排班情况，请重新选择日期区间!"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
List<String> dates = getTwoPeriodsAll(Integer.valueOf(start[0]), Integer.valueOf(start[1]), Integer.valueOf(start[2]), Integer.valueOf(end[0]), Integer.valueOf(end[1]), Integer.valueOf(end[2])); |
|
|
|
|
if (Integer.valueOf(start[0]) < year) { |
|
|
|
|
return R.fail("年份必须大于或等于当前年份！"); |
|
|
|
|
} |
|
|
|
|
if (Integer.valueOf(start[0]) == year && Integer.valueOf(start[1]) < month) { |
|
|
|
|
return R.fail("时间必须大于或等于当前时间"); |
|
|
|
|
} |
|
|
|
|
List<ImsDutyMainEntity> imsDutyMainEntities2 = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{ |
|
|
|
|
ge(ImsDutyMainEntity::getDutyDate, vo.getStartDate()); |
|
|
|
|
le(ImsDutyMainEntity::getDutyDate, vo.getEndDate()); |
|
|
|
|
eq(ImsDutyMainEntity::getCreateDept, vo.getDeptId()); |
|
|
|
|
}}); |
|
|
|
|
List<ImsDutyMainPersonEntity> imsDutyMainPersonEntities = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{ |
|
|
|
|
ge(ImsDutyMainPersonEntity::getDutyDate, vo.getStartDate()); |
|
|
|
|
le(ImsDutyMainPersonEntity::getDutyDate, vo.getEndDate()); |
|
|
|
|
eq(ImsDutyMainPersonEntity::getCreateDept, vo.getDeptId()); |
|
|
|
|
}}); |
|
|
|
|
if (CollectionUtil.isNotEmpty(imsDutyMainPersonEntities) || CollectionUtil.isNotEmpty(imsDutyMainEntities2)) { |
|
|
|
|
if (CollectionUtil.isNotEmpty(dates)) { |
|
|
|
|
//重新修改已有的排版，先删除，在添加
|
|
|
|
|
this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{ |
|
|
|
|
eq(ImsDutyMainEntity::getCreateDept, vo.getDeptId()); |
|
|
|
|
in(ImsDutyMainEntity::getDutyDate, dates); |
|
|
|
|
}}); |
|
|
|
|
imsDutyMainPersonMapper.delete(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{ |
|
|
|
|
in(ImsDutyMainPersonEntity::getDutyDate, dates); |
|
|
|
|
eq(ImsDutyMainPersonEntity::getCreateDept, vo.getDeptId()); |
|
|
|
|
}}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
String subDayDate = DateUtils.dayDate(DateUtil.parse(vo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE); |
|
|
|
|
//获取最后一个排班的信息
|
|
|
|
|
ImsDutyMainEntity preDutyMain = this.baseMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{ |
|
|
|
|
eq(ImsDutyMainEntity::getDutyDate, subDayDate); |
|
|
|
|
eq(ImsDutyMainEntity::getCreateDept, vo.getDeptId()); |
|
|
|
|
ne(ImsDutyMainEntity::getStatus, "-1"); |
|
|
|
|
orderByDesc(ImsDutyMainEntity::getId).last("LIMIT 1"); |
|
|
|
|
}}); |
|
|
|
|
|
|
|
|
|
String proDutyMainId=null; |
|
|
|
|
|
|
|
|
|
List<ImsDutyMainEntity> imsDutyMainEntityList=getImsDutyMainEntityList(vo,dates); |
|
|
|
|
if(imsDutyMainEntityList!=null && !imsDutyMainEntityList.isEmpty()){ |
|
|
|
|
ImsDutyMainEntity entity=imsDutyMainEntityList.get(0); |
|
|
|
|
if(preDutyMain!=null) { |
|
|
|
|
Long dutyMainId = preDutyMain.getId(); |
|
|
|
|
proDutyMainId =String.valueOf(dutyMainId); |
|
|
|
|
entity.setPreDutyId(dutyMainId); |
|
|
|
|
} |
|
|
|
|
dealCreator(entity,vo.getDeptId()); |
|
|
|
|
}else{ |
|
|
|
|
return R.fail("排班失败"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//统一处理preDutyId
|
|
|
|
|
for(int i=1,count=imsDutyMainEntityList.size();i<count;i++){ |
|
|
|
|
ImsDutyMainEntity entity=imsDutyMainEntityList.get(i); |
|
|
|
|
dealCreator(entity,vo.getDeptId()); |
|
|
|
|
ImsDutyMainEntity preEntity=imsDutyMainEntityList.get(i-1); |
|
|
|
|
entity.setPreDutyId(preEntity.getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// this.saveBatch(imsDutyMainEntityList);
|
|
|
|
|
|
|
|
|
|
List<ImsDutyMainPersonEntity> mainPersonEntityList=new ArrayList<>(); |
|
|
|
|
for(ImsDutyMainEntity imsDutyMainEntity:imsDutyMainEntityList) { |
|
|
|
|
String[] personIds=imsDutyMainEntity.getDutyPersonIds().split("\\^"); |
|
|
|
|
List<Long> collect=Arrays.asList(personIds).stream().map(e->Long.valueOf(e)).collect(Collectors.toList()); |
|
|
|
|
//每个人员对应一条排班-人员计划
|
|
|
|
|
for (Long personId : collect) { |
|
|
|
|
ImsDutyMainPersonEntity imsDutyMainPersonEntity = new ImsDutyMainPersonEntity(); |
|
|
|
|
imsDutyMainPersonEntity.setClassId(imsDutyMainEntity.getClassId()); |
|
|
|
|
imsDutyMainPersonEntity.setCreateDept(imsDutyMainEntity.getCreateDept()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyGroupName(imsDutyMainEntity.getDutyGroupName()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyGroupId(imsDutyMainEntity.getDutyGroupId()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyDate(imsDutyMainEntity.getDutyDate()); |
|
|
|
|
imsDutyMainPersonEntity.setStatus(imsDutyMainEntity.getStatus()); |
|
|
|
|
imsDutyMainPersonEntity.setCreateTime(imsDutyMainEntity.getCreateTime()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyMainId(imsDutyMainEntity.getId()); |
|
|
|
|
imsDutyMainPersonEntity.setCreateUser(imsDutyMainEntity.getCreateUser()); |
|
|
|
|
imsDutyMainPersonEntity.setUpdateUser(imsDutyMainEntity.getUpdateUser()); |
|
|
|
|
imsDutyMainPersonEntity.setTenantId(imsDutyMainEntity.getTenantId()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyPerson(personId); |
|
|
|
|
long id1 = IdWorker.getId(imsDutyMainPersonEntity); |
|
|
|
|
imsDutyMainPersonEntity.setId(id1); |
|
|
|
|
imsDutyMainPersonEntity.setDutyChargePerson(imsDutyMainEntity.getManageId()); |
|
|
|
|
mainPersonEntityList.add(imsDutyMainPersonEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
log.error("=排班====imsDutyMainEntityList{}====mainPersonEntityList:{}",imsDutyMainEntityList,mainPersonEntityList); |
|
|
|
|
ThreadTask.dutyTask(imsDutyMainEntityList, mainPersonEntityList, vo.getEndDate(), proDutyMainId, vo.getDeptId(), vo.getDutyClassTypeId()); |
|
|
|
|
|
|
|
|
|
return R.success("排班成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void dealCreator(ImsDutyMainEntity entity,Long deptId){ |
|
|
|
|
entity.setCreateDept(deptId); |
|
|
|
|
entity.setCreateUser(AuthUtil.getUserId()); |
|
|
|
|
entity.setCreateTime(new Date()); |
|
|
|
|
entity.setTenantId(AuthUtil.getTenantId()); |
|
|
|
|
entity.setIsDeleted(0); |
|
|
|
|
entity.setStatus(0); |
|
|
|
|
entity.setUpdateUser(AuthUtil.getUserId()); |
|
|
|
|
entity.setUpdateTime(new Date()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private List<ImsDutyMainEntity> getImsDutyMainEntityList(ImsSchedulingNewVo vo,List<String> dates){ |
|
|
|
|
List<ImsDutyMainEntity> list=new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
////班次信息
|
|
|
|
|
String[] classIdArr=vo.getClassIds().split("\\^"); |
|
|
|
|
List<Long> classIds=Arrays.asList(classIdArr).stream().map(e->Long.valueOf(e)).collect(Collectors.toList()); |
|
|
|
|
String[] classNameArr=vo.getClassNames().split("\\^"); |
|
|
|
|
Map<Long,String> classMap=new HashMap<>(); |
|
|
|
|
for(int i=0;i<classIds.size();i++){ |
|
|
|
|
classMap.put(classIds.get(i),classNameArr[i]); |
|
|
|
|
} |
|
|
|
|
if(vo.getPersonType().intValue() == 1){//班组
|
|
|
|
|
String[] groupIdsArr=vo.getGroupIds().split("\\^"); |
|
|
|
|
List<Long> groupIds=Arrays.asList(groupIdsArr).stream().map(e->Long.valueOf(e)).collect(Collectors.toList()); |
|
|
|
|
LambdaQueryWrapper<ImsDutyGroupEntity> groupWrapper=new LambdaQueryWrapper<>(); |
|
|
|
|
groupWrapper.in(ImsDutyGroupEntity::getId,groupIds); |
|
|
|
|
List<ImsDutyGroupEntity> groupEntities=dutyGroupMapper.selectList(groupWrapper); |
|
|
|
|
Map<Long,ImsDutyGroupEntity> groupMap=groupEntities.stream().collect(Collectors.toMap(ImsDutyGroupEntity::getId,Function.identity())); |
|
|
|
|
|
|
|
|
|
List<ImsDutyGroupPEntity> groupPEntities = imsDutyGroupPService.selectByGroupIds(groupIds); |
|
|
|
|
Map<Long,List<ImsDutyGroupPEntity>> personMap=groupPEntities.stream().collect(Collectors.groupingBy(ImsDutyGroupPEntity::getGroupId)); |
|
|
|
|
|
|
|
|
|
//班组信息
|
|
|
|
|
List<Map<String,String>> groups=new ArrayList<>(); |
|
|
|
|
for(Long groupId :groupIds){ |
|
|
|
|
Map<String,String> map=new HashMap<>(); |
|
|
|
|
map.put("groupId",String.valueOf(groupId)); |
|
|
|
|
ImsDutyGroupEntity groupEntity=groupMap.get(groupId); |
|
|
|
|
map.put("groupName",groupEntity.getGroupName()); |
|
|
|
|
map.put("managerId",String.valueOf(groupEntity.getManagerId())); |
|
|
|
|
List<ImsDutyGroupPEntity> groupPList=personMap.get(groupId); |
|
|
|
|
List<String> personIds=groupPList.stream().map(e->String.valueOf(e.getPersonId())).collect(Collectors.toList()); |
|
|
|
|
String personStrIds=personIds.stream().collect(Collectors.joining("^")); |
|
|
|
|
map.put("personIds",personStrIds);//包含了值长id
|
|
|
|
|
groups.add(map); |
|
|
|
|
} |
|
|
|
|
dealImsDutyMainEntityList(list,dates,classIds,groups,classMap); |
|
|
|
|
}else if(vo.getPersonType().intValue() == 2){//人员
|
|
|
|
|
List<Map<String,String>> persons=vo.getPersonIds(); |
|
|
|
|
for(Map<String,String> person:persons){ |
|
|
|
|
String personIds=person.get("personIds"); |
|
|
|
|
person.put("personIds",person.get("managerId")+"^"+personIds); |
|
|
|
|
} |
|
|
|
|
dealImsDutyMainEntityList(list,dates,classIds,persons,classMap); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void dealImsDutyMainEntityList(List<ImsDutyMainEntity> list,List<String> dates, |
|
|
|
|
List<Long> classIds, |
|
|
|
|
List<Map<String,String>> persons,Map<Long,String> classMap){ |
|
|
|
|
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
int dateCount=dates.size(); |
|
|
|
|
int classCount=classIds.size(); |
|
|
|
|
int count=dateCount * classCount;//总工共排多少个
|
|
|
|
|
|
|
|
|
|
List<Map<String,String>> allPerson=new ArrayList<>();//总数队列
|
|
|
|
|
|
|
|
|
|
while (allPerson.size() < count){ |
|
|
|
|
for(Map<String,String> person:persons){ |
|
|
|
|
allPerson.add(person); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
for (int i = 0; i < dateCount; i++) { |
|
|
|
|
String ts = dates.get(i); |
|
|
|
|
for (int j = 0; j < classCount; j++) { |
|
|
|
|
int personIndex = (i * classCount) + j; |
|
|
|
|
Map<String, String> person = allPerson.get(personIndex); |
|
|
|
|
Long classId = classIds.get(j); |
|
|
|
|
ImsDutyMainEntity res = new ImsDutyMainEntity(); |
|
|
|
|
res.setId(IdWorker.getId()); |
|
|
|
|
if (person.get("groupId") != null) { |
|
|
|
|
res.setDutyGroupId(Long.valueOf(person.get("groupId").toString())); |
|
|
|
|
} |
|
|
|
|
if (person.get("groupName") != null) { |
|
|
|
|
res.setDutyGroupName(person.get("groupName").toString()); |
|
|
|
|
} |
|
|
|
|
res.setDutyPersonIds(person.get("personIds")); |
|
|
|
|
res.setDutyDate(sdf.parse(ts)); |
|
|
|
|
res.setClassId(classId); |
|
|
|
|
res.setClassName(classMap.get(classId)); |
|
|
|
|
res.setManageId(Long.valueOf(person.get("managerId"))); |
|
|
|
|
list.add(res); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}catch (ParseException e){ |
|
|
|
|
log.error("日期格式不对"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R importScheduling(MultipartFile file,String yearMonth,Long deptId) { |
|
|
|
|
String filename = file.getOriginalFilename(); |
|
|
|
|
ExcelToolListener excelToolListener = new ExcelToolListener(); |
|
|
|
|
if (org.springframework.util.StringUtils.isEmpty(filename)) { |
|
|
|
|
return R.fail("请上传文件!"); |
|
|
|
|
} else if (!org.springframework.util.StringUtils.endsWithIgnoreCase(filename, ".xls") && !org.springframework.util.StringUtils.endsWithIgnoreCase(filename, ".xlsx")) { |
|
|
|
|
return R.fail("请上传正确的excel文件!"); |
|
|
|
|
} else { |
|
|
|
|
try { |
|
|
|
|
InputStream inputStream = file.getInputStream(); |
|
|
|
|
asyncReadModel(inputStream, excelToolListener, SchedulingExcelDTO.class, 0, 2); |
|
|
|
|
} catch (IOException e) { |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
List entityList = excelToolListener.getDataList(); |
|
|
|
|
if(entityList==null || entityList.isEmpty()){ |
|
|
|
|
return R.fail("请在表格中填写数据"); |
|
|
|
|
} |
|
|
|
|
List<SchedulingExcelDTO> list = JSONArray.parseArray(JSON.toJSONString(entityList), SchedulingExcelDTO.class).stream() |
|
|
|
|
.filter(e->StringUtils.isNotBlank(e.getDay())) |
|
|
|
|
.filter(e->StringUtils.isNotBlank(e.getMainDuty())) |
|
|
|
|
.filter(e->StringUtils.isNotBlank(e.getDeputyDuty())) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
int days=getMaxDays(yearMonth); |
|
|
|
|
if(list==null || list.isEmpty() || list.size()!=days){ |
|
|
|
|
return R.fail("日期，主值，副值数据不够完整，请补充"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
R<List<User>> listR=userClient.userList(AuthUtil.getTenantId(),deptId); |
|
|
|
|
if(listR==null || !listR.isSuccess() || listR.getData()==null || listR.getData().isEmpty()){ |
|
|
|
|
return R.fail("该部门未创建用户"); |
|
|
|
|
} |
|
|
|
|
List<User> users=listR.getData(); |
|
|
|
|
//记录系统中不存在的用户
|
|
|
|
|
Set<String> userNameSet=new HashSet<>(); |
|
|
|
|
Set<Long> mainDutyIds=new HashSet<>(); |
|
|
|
|
//获取所有用户名称以及对应的用户id
|
|
|
|
|
Map<String,Long> map=new HashMap<>(); |
|
|
|
|
for(SchedulingExcelDTO dto:list){ |
|
|
|
|
Long id=map.get(dto.getMainDuty()); |
|
|
|
|
if(id==null){ |
|
|
|
|
Long tmpId=getByName(users,dto.getMainDuty()); |
|
|
|
|
if(tmpId!=null) { |
|
|
|
|
map.put(dto.getMainDuty(), tmpId); |
|
|
|
|
mainDutyIds.add(tmpId); |
|
|
|
|
}else{ |
|
|
|
|
userNameSet.add(dto.getMainDuty()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
id=map.get(dto.getDeputyDuty()); |
|
|
|
|
if(id==null){ |
|
|
|
|
Long tmpId=getByName(users,dto.getDeputyDuty()); |
|
|
|
|
if(tmpId!=null) { |
|
|
|
|
map.put(dto.getDeputyDuty(), tmpId); |
|
|
|
|
}else{ |
|
|
|
|
userNameSet.add(dto.getDeputyDuty()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//判断用户是否在系统中存在
|
|
|
|
|
if(userNameSet.size() >=0 ){ |
|
|
|
|
return R.fail("用户("+StringUtils.join(userNameSet,"、")+")在系统中不存在，需要在用户管理中创建！"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
String[] arr=yearMonth.split("-"); |
|
|
|
|
int year=Integer.valueOf(arr[0]); |
|
|
|
|
int month=Integer.valueOf(arr[1]); |
|
|
|
|
List<String> dates = getTwoPeriodsAll(year, month, 1, year, month, days); |
|
|
|
|
//先删除
|
|
|
|
|
this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{ |
|
|
|
|
eq(ImsDutyMainEntity::getCreateDept, deptId); |
|
|
|
|
in(ImsDutyMainEntity::getDutyDate, dates); |
|
|
|
|
}}); |
|
|
|
|
imsDutyMainPersonMapper.delete(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{ |
|
|
|
|
in(ImsDutyMainPersonEntity::getDutyDate, dates); |
|
|
|
|
eq(ImsDutyMainPersonEntity::getCreateDept, deptId); |
|
|
|
|
}}); |
|
|
|
|
//查询导入数据的上一班的值班对象 比如10月1号的前一班9月30号
|
|
|
|
|
LambdaQueryWrapper<ImsDutyMainEntity> wrapper=new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.eq(ImsDutyMainEntity::getDutyDate,beforeDutyDate(dates.get(0))); |
|
|
|
|
wrapper.eq(ImsDutyMainEntity::getCreateDept,deptId); |
|
|
|
|
ImsDutyMainEntity beforeEntity=this.getOne(wrapper); |
|
|
|
|
Long beforeDutyId=null; |
|
|
|
|
if(beforeEntity!=null){ |
|
|
|
|
beforeDutyId=beforeEntity.getId(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//再增加
|
|
|
|
|
//查询最新的班次
|
|
|
|
|
LambdaQueryWrapper<ImsDutyClassEntity> wrapper1=new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper1.eq(ImsDutyClassEntity::getCreateDept,deptId); |
|
|
|
|
wrapper1.last(" limit 1"); |
|
|
|
|
List<ImsDutyClassEntity> classList=iImsDutyClassService.list(wrapper1); |
|
|
|
|
if(classList==null || classList.isEmpty()){ |
|
|
|
|
return R.fail("该机构还未创建班次"); |
|
|
|
|
} |
|
|
|
|
ImsDutyClassEntity classEntity=classList.get(0); |
|
|
|
|
Long classId=classEntity.getId(); |
|
|
|
|
|
|
|
|
|
//查询班组
|
|
|
|
|
LambdaQueryWrapper<ImsDutyGroupEntity> wrapper2=new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper2.in(ImsDutyGroupEntity::getManagerId,mainDutyIds); |
|
|
|
|
wrapper2.eq(ImsDutyGroupEntity::getCreateDept,deptId); |
|
|
|
|
List<ImsDutyGroupEntity> groups=dutyGroupMapper.selectList(wrapper2); |
|
|
|
|
if(groups==null || groups.isEmpty()){ |
|
|
|
|
return R.fail("该机构还未创建班组"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//组装数据
|
|
|
|
|
List<ImsDutyMainEntity> dutyMainList=new ArrayList<>(); |
|
|
|
|
List<ImsDutyMainPersonEntity> dutyMainPList=new ArrayList<>(); |
|
|
|
|
for(int i=0;i<dates.size();i++){ |
|
|
|
|
String date=dates.get(i); |
|
|
|
|
SchedulingExcelDTO dto=list.get(i); |
|
|
|
|
//排班主表
|
|
|
|
|
ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity(); |
|
|
|
|
Long managerId=map.get(dto.getMainDuty()); |
|
|
|
|
ImsDutyGroupEntity dutyGroup=getGroupByManageId(groups,managerId); |
|
|
|
|
setMainEntity(imsDutyMainEntity, classId, dutyGroup.getId(), date); |
|
|
|
|
imsDutyMainEntity.setStatus(-1); |
|
|
|
|
String personIds=managerId+"^"+map.get(dto.getDeputyDuty()); |
|
|
|
|
imsDutyMainEntity.setDutyPersonIds(personIds); |
|
|
|
|
imsDutyMainEntity.setCreateDept(deptId); |
|
|
|
|
Long id = IdWorker.getId(); |
|
|
|
|
imsDutyMainEntity.setId(id); |
|
|
|
|
imsDutyMainEntity.setPreDutyId(beforeDutyId); |
|
|
|
|
imsDutyMainEntity.setCreateUser(AuthUtil.getUserId()); |
|
|
|
|
imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId()); |
|
|
|
|
imsDutyMainEntity.setTenantId(AuthUtil.getTenantId()); |
|
|
|
|
dutyMainList.add(imsDutyMainEntity); |
|
|
|
|
beforeDutyId = id; |
|
|
|
|
|
|
|
|
|
//排班人员表
|
|
|
|
|
String[] personIdArr=personIds.split("^"); |
|
|
|
|
for(String personId:personIdArr) { |
|
|
|
|
ImsDutyMainPersonEntity imsDutyMainPersonEntity = new ImsDutyMainPersonEntity(); |
|
|
|
|
imsDutyMainPersonEntity.setClassId(imsDutyMainEntity.getClassId()); |
|
|
|
|
imsDutyMainPersonEntity.setCreateDept(imsDutyMainEntity.getCreateDept()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyGroupName(dutyGroup.getGroupName()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyGroupId(dutyGroup.getId()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyDate(imsDutyMainEntity.getDutyDate()); |
|
|
|
|
imsDutyMainPersonEntity.setStatus(imsDutyMainEntity.getStatus()); |
|
|
|
|
imsDutyMainPersonEntity.setCreateTime(imsDutyMainEntity.getCreateTime()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyMainId(imsDutyMainEntity.getId()); |
|
|
|
|
imsDutyMainPersonEntity.setCreateUser(imsDutyMainEntity.getCreateUser()); |
|
|
|
|
imsDutyMainPersonEntity.setUpdateUser(imsDutyMainEntity.getUpdateUser()); |
|
|
|
|
imsDutyMainPersonEntity.setTenantId(imsDutyMainEntity.getTenantId()); |
|
|
|
|
imsDutyMainPersonEntity.setDutyPerson(Long.valueOf(personId)); |
|
|
|
|
long id1 = IdWorker.getId(imsDutyMainPersonEntity); |
|
|
|
|
imsDutyMainPersonEntity.setId(id1); |
|
|
|
|
imsDutyMainPersonEntity.setDutyChargePerson(managerId); |
|
|
|
|
dutyMainPList.add(imsDutyMainPersonEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//批量保存
|
|
|
|
|
this.saveBatch(dutyMainList); |
|
|
|
|
iImsDutyMainPersonService.saveBatch(dutyMainPList); |
|
|
|
|
|
|
|
|
|
return R.success("导入成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private ImsDutyGroupEntity getGroupByManageId(List<ImsDutyGroupEntity> groups,Long managerId){ |
|
|
|
|
for(ImsDutyGroupEntity entity:groups){ |
|
|
|
|
if(entity.getManagerId().equals(managerId)){ |
|
|
|
|
return entity; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static int getMaxDays(String yearMonthStr){ |
|
|
|
|
String[] arr=yearMonthStr.split("-"); |
|
|
|
|
int year=Integer.valueOf(arr[0]); |
|
|
|
|
int month=Integer.valueOf(arr[1]); |
|
|
|
|
YearMonth yearMonth = YearMonth.of(year, month); |
|
|
|
|
int maxDays = yearMonth.lengthOfMonth(); |
|
|
|
|
return maxDays; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private String beforeDutyDate(String date){ |
|
|
|
|
LocalDate today = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
|
|
|
|
|
|
|
|
|
LocalDate yesterday = today.minusDays(1); // 获取前一天的日期
|
|
|
|
|
|
|
|
|
|
// 如果需要格式化日期，可以使用DateTimeFormatter
|
|
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); |
|
|
|
|
return yesterday.format(formatter); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Long getByName(List<User> users,String name){ |
|
|
|
|
for(User user:users){ |
|
|
|
|
if(user.getName().equals(name)){ |
|
|
|
|
return user.getId(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 轮询排班 |
|
|
|
|
* |
|
|
|
|
@ -478,7 +929,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
|
|
|
|
|
} |
|
|
|
|
if (StringUtil.isNotBlank(dutyGroupId)) { |
|
|
|
|
ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity(); |
|
|
|
|
setMainEntity(imsDutyMainEntity, classId, Long.valueOf(dutyGroupId), date); |
|
|
|
|
setMainEntity(imsDutyMainEntity, Long.valueOf(classId), Long.valueOf(dutyGroupId), date); |
|
|
|
|
imsDutyMainEntity.setStatus(-1); |
|
|
|
|
imsDutyMainEntity.setDutyPersonIds(personIds); |
|
|
|
|
imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept()); |
|
|
|
|
@ -1502,6 +1953,111 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
|
|
|
|
|
return dutyMainReportExcelList; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R changDutyMainGroupLeader(ExchangeGroupLeader changeGroupLeader) { |
|
|
|
|
if(changeGroupLeader == null){ |
|
|
|
|
return R.fail("传入换班数据不能为空"); |
|
|
|
|
} |
|
|
|
|
if(!changeGroupLeader.getFromDeptId().equals(changeGroupLeader.getToDeptId())){ |
|
|
|
|
return R.fail("不同机构间不能换班"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(changeGroupLeader.getFromDate().compareTo(changeGroupLeader.getToDate())>0){ |
|
|
|
|
return R.fail("换班日期不能大于被换班日期"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(changeGroupLeader.getFromDate().compareTo(changeGroupLeader.getToDate()) == 0 |
|
|
|
|
&& changeGroupLeader.getFromClassId().equals(changeGroupLeader.getToClassId())){ |
|
|
|
|
return R.fail("同一日期同一班次无须换班"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<ImsDutyMainEntity> aDutyList = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{ |
|
|
|
|
eq(ImsDutyMainEntity::getDutyDate, changeGroupLeader.getFromDate()); |
|
|
|
|
eq(ImsDutyMainEntity::getCreateDept, changeGroupLeader.getFromDeptId()); |
|
|
|
|
eq(ImsDutyMainEntity::getClassId, changeGroupLeader.getFromClassId()); |
|
|
|
|
eq(ImsDutyMainEntity::getIsDeleted, 0); |
|
|
|
|
}}); |
|
|
|
|
|
|
|
|
|
if(aDutyList== null|| aDutyList.isEmpty()){ |
|
|
|
|
return R.fail("换班人无排班计划"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<ImsDutyMainEntity> bDutyList = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{ |
|
|
|
|
eq(ImsDutyMainEntity::getDutyDate, changeGroupLeader.getToDate()); |
|
|
|
|
eq(ImsDutyMainEntity::getCreateDept, changeGroupLeader.getToDeptId()); |
|
|
|
|
eq(ImsDutyMainEntity::getClassId, changeGroupLeader.getToClassId()); |
|
|
|
|
eq(ImsDutyMainEntity::getIsDeleted, 0); |
|
|
|
|
}}); |
|
|
|
|
if(bDutyList== null|| bDutyList.isEmpty()){ |
|
|
|
|
return R.fail("被换班人无排班计划"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ImsDutyMainEntity aDutyMainEntity=aDutyList.get(0); |
|
|
|
|
//查询换换班是否在值班
|
|
|
|
|
if(aDutyMainEntity.getStatus()!=0){ |
|
|
|
|
return R.fail("换班人待值班状态才能换班"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ImsDutyGroupEntity aGroupEntity = dutyGroupMapper.selectById(aDutyMainEntity.getDutyGroupId()); |
|
|
|
|
Long aManagerId=aGroupEntity.getManagerId(); |
|
|
|
|
List<ImsDutyMainPersonEntity> aPersonEntityList = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{ |
|
|
|
|
eq(ImsDutyMainPersonEntity::getDutyMainId, aDutyMainEntity.getId()); |
|
|
|
|
eq(ImsDutyMainPersonEntity::getIsDeleted, 0); |
|
|
|
|
}}); |
|
|
|
|
|
|
|
|
|
ImsDutyMainEntity bDutyMainEntity=bDutyList.get(0); |
|
|
|
|
//查询换换班是否在值班
|
|
|
|
|
if(bDutyMainEntity.getStatus()!=0){ |
|
|
|
|
return R.fail("被换班人待值班状态才能换班"); |
|
|
|
|
} |
|
|
|
|
ImsDutyGroupEntity bGroupEntity = dutyGroupMapper.selectById(bDutyMainEntity.getDutyGroupId()); |
|
|
|
|
Long bManagerId=bGroupEntity.getManagerId(); |
|
|
|
|
List<ImsDutyMainPersonEntity> bPersonEntityList = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{ |
|
|
|
|
eq(ImsDutyMainPersonEntity::getDutyMainId, bDutyMainEntity.getId()); |
|
|
|
|
eq(ImsDutyMainPersonEntity::getIsDeleted, 0); |
|
|
|
|
}}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String aPersonIds=aDutyMainEntity.getDutyPersonIds(); |
|
|
|
|
String bPersonIds=bDutyMainEntity.getDutyPersonIds(); |
|
|
|
|
//更新duty_main
|
|
|
|
|
ImsDutyMainEntity aEntity= SerializationUtils.clone(aDutyMainEntity); |
|
|
|
|
ImsDutyMainEntity bEntity=SerializationUtils.clone(bDutyMainEntity); |
|
|
|
|
|
|
|
|
|
aEntity.setDutyGroupId(bDutyMainEntity.getDutyGroupId()); |
|
|
|
|
aPersonIds=aPersonIds.replaceAll(aManagerId+"",bManagerId+""); |
|
|
|
|
aEntity.setDutyPersonIds(aPersonIds); |
|
|
|
|
this.baseMapper.updateById(aEntity); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bEntity.setDutyGroupId(aDutyMainEntity.getDutyGroupId()); |
|
|
|
|
bPersonIds=bPersonIds.replaceAll(bManagerId+"",aManagerId+""); |
|
|
|
|
bEntity.setDutyPersonIds(bPersonIds); |
|
|
|
|
this.baseMapper.updateById(bEntity); |
|
|
|
|
|
|
|
|
|
//更新 duty_main_person
|
|
|
|
|
for(ImsDutyMainPersonEntity entity:aPersonEntityList){ |
|
|
|
|
if(entity.getDutyPerson().equals(aManagerId)){ |
|
|
|
|
entity.setDutyPerson(bManagerId); |
|
|
|
|
} |
|
|
|
|
// entity.setDutyGroupName(bGroupEntity.getGroupName());
|
|
|
|
|
entity.setDutyChargePerson(bManagerId); |
|
|
|
|
} |
|
|
|
|
iImsDutyMainPersonService.updateBatchById(aPersonEntityList); |
|
|
|
|
|
|
|
|
|
for(ImsDutyMainPersonEntity entity:bPersonEntityList){ |
|
|
|
|
if(entity.getDutyPerson().equals(bManagerId)){ |
|
|
|
|
entity.setDutyPerson(aManagerId); |
|
|
|
|
} |
|
|
|
|
// entity.setDutyGroupName(aGroupEntity.getGroupName());
|
|
|
|
|
entity.setDutyChargePerson(aManagerId); |
|
|
|
|
} |
|
|
|
|
iImsDutyMainPersonService.updateBatchById(bPersonEntityList); |
|
|
|
|
|
|
|
|
|
return R.success("班组长换班成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 获取上一班组 |
|
|
|
|
@ -1676,7 +2232,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
|
|
|
|
|
} |
|
|
|
|
if (StringUtil.isNotBlank(dutyGroupId)) { |
|
|
|
|
ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity(); |
|
|
|
|
setMainEntity(imsDutyMainEntity, classId, Long.valueOf(dutyGroupId), date); |
|
|
|
|
setMainEntity(imsDutyMainEntity, Long.valueOf(classId), Long.valueOf(dutyGroupId), date); |
|
|
|
|
imsDutyMainEntity.setStatus(-1); |
|
|
|
|
imsDutyMainEntity.setDutyPersonIds(personIds); |
|
|
|
|
imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept()); |
|
|
|
|
@ -1699,7 +2255,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity(); |
|
|
|
|
setMainEntity(imsDutyMainEntity, classId, Long.valueOf(groupId), date); |
|
|
|
|
setMainEntity(imsDutyMainEntity, Long.valueOf(classId), Long.valueOf(groupId), date); |
|
|
|
|
if (Func.isBlank(proDutyMainId)) { |
|
|
|
|
if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) { |
|
|
|
|
proDutyMainId = imsDutyMainEntity1.getId().toString(); |
|
|
|
|
@ -1731,9 +2287,9 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setMainEntity(ImsDutyMainEntity imsDutyMainEntity, String classId, Long groupId, String date) { |
|
|
|
|
public void setMainEntity(ImsDutyMainEntity imsDutyMainEntity, Long classId, Long groupId, String date) { |
|
|
|
|
imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE)); |
|
|
|
|
imsDutyMainEntity.setClassId(Long.valueOf(classId)); |
|
|
|
|
imsDutyMainEntity.setClassId(classId); |
|
|
|
|
imsDutyMainEntity.setDutyGroupId(groupId); |
|
|
|
|
imsDutyMainEntity.setStatus(0); |
|
|
|
|
imsDutyMainEntity.setCreateTime(new Date()); |
|
|
|
|
|
luyie
walton