diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyMainPersonEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyMainPersonEntity.java
index cf335e5..42f0ffa 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyMainPersonEntity.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyMainPersonEntity.java
@@ -1,6 +1,5 @@
 package com.hnac.hzims.operational.duty.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -65,7 +64,6 @@ public class ImsDutyMainPersonEntity extends TenantEntity {
 	/**
 	 * 值班班组名称
 	 */
-	@TableField(exist=false)
 	@ApiModelProperty(value = "值班班组名称")
 	private String dutyGroupName;
 	/**
diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
index 9455567..d723454 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 /**
  * @author hx
  */
-@Repository
 @FeignClient(
 	value = OperationalConstants.APP_NAME
 )
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java
index c1878e1..bd42089 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java
@@ -1,10 +1,9 @@
 package com.hnac.hzims.operational.duty.mapper;
 
+import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.vo.*;
-import io.swagger.annotations.Api;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
-import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
 import java.util.List;
@@ -40,6 +39,7 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper<ImsDutyMainEn
 
 	ImsDutyMainEntity selectMainByIdOne(Long id);
 
+	void deleteByUserId(List<Long> list);
 	void deleteDate(String date);
 
 	@UserDataAuth
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
index 4aa2676..0e8f2f6 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
@@ -47,7 +47,15 @@
             and id !=#{id}
         </if>
     </select>
-
+    <delete id="deleteByUserId" >
+        delete from hz_ims_duty_main where is_deleted = 0
+        <if test="list != null and list.size > 0">
+        and id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </if>
+    </delete>
     <select id="selectByDateList" resultType="com.hnac.hzims.operational.duty.vo.ImsSchedulingVo">
         SELECT
         DM.ID AS id,
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index 12e283d..382b1c7 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -54,755 +54,765 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, ImsDutyMainEntity> implements IImsDutyMainService {
-	@Resource
-	private ImsDutyGroupPMapper imsDutyGroupPMapper;
-	@Autowired
-	private IImsDutyMainTemplateService iImsDutyMainTemplateService;
-	@Resource
-	private ImsDutyGroupMapper dutyGroupMapper;
-	@Resource
-	private OperPhenomenonMapper operPhenomenonMapper;
-	@Resource
-	private ImsDutyMainPersonMapper imsDutyMainPersonMapper;
-	@Autowired
-	private IImsDutyMainPersonService iImsDutyMainPersonService;
-	@Resource
-	private ImsDutyRecMapper imsDutyRecMapper;
-	@Autowired
-	private IImsDutyGroupPService imsDutyGroupPService;
-	@Autowired
-	private IImsDutyClassService iImsDutyClassService;
-	@Resource
-	private DutyGroupGeneratingCapacityMapper groupGeneratingCapacityMapper;
-	@Autowired
-	private IUserClient userClient;
-
-
-	@Override
-	public R saveOrUpdateImsDutyMain(ImsDutyMainEntity imsDutyMain) {
-		if (StringUtils.isEmpty(imsDutyMain.getDutyPersonIds())) {
-			return R.fail("班次人员不能为空");
-		}
-		if (null == imsDutyMain.getClassId()) {
-			return R.fail("班次ID不能为空");
-		}
+    @Resource
+    private ImsDutyGroupPMapper imsDutyGroupPMapper;
+    @Autowired
+    private IImsDutyMainTemplateService iImsDutyMainTemplateService;
+    @Resource
+    private ImsDutyGroupMapper dutyGroupMapper;
+    @Resource
+    private OperPhenomenonMapper operPhenomenonMapper;
+    @Resource
+    private ImsDutyMainPersonMapper imsDutyMainPersonMapper;
+    @Autowired
+    private IImsDutyMainPersonService iImsDutyMainPersonService;
+    @Resource
+    private ImsDutyRecMapper imsDutyRecMapper;
+    @Autowired
+    private IImsDutyGroupPService imsDutyGroupPService;
+    @Autowired
+    private IImsDutyClassService iImsDutyClassService;
+    @Resource
+    private DutyGroupGeneratingCapacityMapper groupGeneratingCapacityMapper;
+    @Autowired
+    private IUserClient userClient;
+
+
+    @Override
+    public R saveOrUpdateImsDutyMain(ImsDutyMainEntity imsDutyMain) {
+        if (StringUtils.isEmpty(imsDutyMain.getDutyPersonIds())) {
+            return R.fail("班次人员不能为空");
+        }
+        if (null == imsDutyMain.getClassId()) {
+            return R.fail("班次ID不能为空");
+        }
 		/*if (StringUtils.isEmpty(imsDutyMain.getClassName())) {
 			return R.fail("班次名称为空");
 		}*/
-		//判断值班人员同一天同一班次是否排过班
-		Map<String, Object> params = new HashMap<>();
-		if (null != imsDutyMain.getId()) {
-			params.put("id", imsDutyMain.getId());
-		}
-		params.put("dutyDate", imsDutyMain.getDutyDate());
-		params.put("classId", imsDutyMain.getClassId());
-		String[] dutyPersonIds = imsDutyMain.getDutyPersonIds().split("\\^");
-		for (String dutyPersonId : dutyPersonIds) {
-			params.put("dutyPersonIds", dutyPersonId);
-			List<ImsDutyMainEntity> list = this.baseMapper.selectByPersonId(params);
-			if (list.size() > 0) {
-				return R.fail("ID为" + dutyPersonId + "的用户在该天该班次已排过班，请重新选择");
-			}
-		}
-		imsDutyMain.setStatus(JoinStatus.DUTY_WAIT.getStatus());
-		return R.status(this.saveOrUpdate(imsDutyMain));
-	}
-
-	@Override
-	public R delete(List<Long> ids) {
-		if (ids.size() == 0) {
-			return R.fail("ids不能为空");
-		}
-		//状态为待值班的才可以删除
-		for (int i = 0; i < ids.size(); i++) {
-			ImsDutyMainEntity imsDutyMainEntity = this.getById(ids.get(i));
-			if (imsDutyMainEntity.getStatus() != JoinStatus.DUTY_WAIT.getStatus()) {
-				return R.fail("状态为待值班的才可以删除");
-			}
-		}
-		return R.status(this.deleteLogic(ids));
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public R deleteV2(List<Long> ids) {
-		if (ids.size() == 0) {
-			return R.fail("ids不能为空");
-		}
-		//状态为待值班的才可以删除
-		for (int i = 0; i < ids.size(); i++) {
-			ImsDutyMainEntity imsDutyMainEntity = this.getById(ids.get(i));
-			if (imsDutyMainEntity.getStatus() != JoinStatus.DUTY_WAIT.getStatus()) {
-				return R.fail("状态为待值班的才可以删除");
-			}
-		}
-		List<ImsDutyMainPersonEntity> personEntityList = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-			in(ImsDutyMainPersonEntity::getDutyMainId, ids);
-		}});
-		List<Long> collect = personEntityList.stream().map(s -> s.getId()).collect(Collectors.toList());
-		return R.status(this.deleteLogic(ids) && iImsDutyMainPersonService.deleteLogic(collect));
-	}
-
-	@Override
-	public R getByDateListAll(String dutyDate, Long personId) {
-		return R.data(this.baseMapper.selectByDateListAll(dutyDate, personId));
-	}
-
-
-	@Override
-	public ImsSchedulingVo getByIdOne(Long id) {
-		return this.baseMapper.selectByIdOne(id, null);
-	}
-
-	@Override
-	public ImsSchedulingVo getByIdOneV2(Long id) {
-		ImsSchedulingVo imsSchedulingVo = this.baseMapper.selectByIdOneV2(id, null);
-		if (null == imsSchedulingVo.getGroupId()) {
-			imsSchedulingVo.setGroupName("临时班组");
-			ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-				eq(ImsDutyMainPersonEntity::getDutyMainId, id);
-				last(" limit 1");
-			}});
-			imsSchedulingVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson());
-		} else {
-			ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsSchedulingVo.getGroupId());
-			imsSchedulingVo.setGroupName(imsDutyGroupEntity.getGroupName());
-			imsSchedulingVo.setGroupId(imsDutyGroupEntity.getId());
-			imsSchedulingVo.setManagerId(imsDutyGroupEntity.getManagerId());
-		}
-		return imsSchedulingVo;
-	}
-
-	@Override
-	public ImsSchedulingVo getByIdOneV2(Long id, Long preDutyId) {
-		ImsSchedulingVo imsSchedulingVo = this.baseMapper.selectByIdOneV2(id, preDutyId);
-		if (null == imsSchedulingVo.getGroupId()) {
-			imsSchedulingVo.setGroupName("临时班组");
-			ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-				eq(ImsDutyMainPersonEntity::getDutyMainId, imsSchedulingVo.getId());
-				last("limit 1");
-			}});
-			imsSchedulingVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson());
-		} else {
-			ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsSchedulingVo.getGroupId());
-			imsSchedulingVo.setGroupName(imsDutyGroupEntity.getGroupName());
-			imsSchedulingVo.setGroupId(imsDutyGroupEntity.getId());
-			imsSchedulingVo.setManagerId(imsDutyGroupEntity.getManagerId());
-		}
-		return imsSchedulingVo;
-	}
-
-	@Override
-	public ImsDutyMainEntity getMainEntity(Long id) {
-		return this.baseMapper.selectMainByIdOne(id);
-	}
-
-	/**
-	 * 排班
-	 *
-	 * @param imsSchedulingVo
-	 * @return
-	 */
-	@Override
-	public R getScheduling(ImsSchedulingVo imsSchedulingVo) {
-
-
-		if (null == imsSchedulingVo.getSchedulingType()) {
-			imsSchedulingVo.setSchedulingType(1);
-		}
-		if (1 == imsSchedulingVo.getSchedulingType()) {
-			return pollScheduling(imsSchedulingVo);
-		}
-
-		return cycleSchedulingTow(imsSchedulingVo);
-
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public R getSchedulingV2(ImsSchedulingVo imsSchedulingVo) {
-		//判断是否符合排班规则。
-		String[] start = imsSchedulingVo.getStartDate().split("-");
-		String[] end = imsSchedulingVo.getEndDate().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 (!imsSchedulingVo.getStartDate().equals(date2)) {
-			String minusOnedDay = DateUtils.dayStringDate(imsSchedulingVo.getStartDate(), 1, false);
-			log.info("--------------Auth:" + AuthUtil.getDeptId() + "--------createDept:" + imsSchedulingVo.getCreateDept());
-			List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, imsSchedulingVo.getCreateDept());
-			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, imsSchedulingVo.getStartDate());
-			le(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getEndDate());
-			eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-		}});
-		List<ImsDutyMainPersonEntity> imsDutyMainPersonEntities = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-			ge(ImsDutyMainPersonEntity::getDutyDate, imsSchedulingVo.getStartDate());
-			le(ImsDutyMainPersonEntity::getDutyDate, imsSchedulingVo.getEndDate());
-			eq(ImsDutyMainPersonEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-		}});
-		if (CollectionUtil.isNotEmpty(imsDutyMainPersonEntities) || CollectionUtil.isNotEmpty(imsDutyMainEntities2)) {
-			if (imsSchedulingVo.isCompose() == false) {
-				//如果有排班记录且无需排序，则返回
-				return R.data(1);
-			} else {
-				if (CollectionUtil.isNotEmpty(dates)) {
-					//重新修改已有的排版，先删除，在添加
-					this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-						eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-						in(ImsDutyMainEntity::getDutyDate, dates);
-					}});
-					imsDutyMainPersonMapper.delete(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-						in(ImsDutyMainPersonEntity::getDutyDate, dates);
-						eq(ImsDutyMainPersonEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-					}});
-				}
-			}
-		}
-		String subDayDate = DateUtils.dayDate(DateUtil.parse(imsSchedulingVo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE);
-		ImsDutyMainEntity imsDutyMainEntity1 = this.baseMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-			eq(ImsDutyMainEntity::getDutyDate, subDayDate);
-			eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-			ne(ImsDutyMainEntity::getStatus, "-1");
-			orderByDesc(ImsDutyMainEntity::getId).last("LIMIT 1");
-		}});
-		if (null == imsSchedulingVo.getSchedulingType()) {
-			imsSchedulingVo.setSchedulingType(1);
-		}
-		//符合条件后根据周期、轮询排班方式保存
-		if (1 == imsSchedulingVo.getSchedulingType()) {
-			return pollSchedulingV2(imsSchedulingVo, dates, imsDutyMainEntity1);
-		}
-		return cycleSchedulingTowV2(imsSchedulingVo, dates, imsDutyMainEntity1);
-	}
-
-	/**
-	 * 轮询排班
-	 *
-	 * @param imsSchedulingVo
-	 * @param dates
-	 * @param imsDutyMainEntity1
-	 * @return
-	 */
-	private R pollSchedulingV2(ImsSchedulingVo imsSchedulingVo, List<String> dates, ImsDutyMainEntity imsDutyMainEntity1) {
-		String[] groupIdsSplit;
-		int dutyNum;
-		//轮询排班分为：班组还是灵活；如果是2.灵活人员排班，则不需要查数据库，直接存对应信息
-		if (2 == imsSchedulingVo.getPersonType()) {
-			Map<String, List<String>> rosters = imsSchedulingVo.getRosters();
-			groupIdsSplit = rosters.keySet().toArray(new String[0]);
-			dutyNum = groupIdsSplit.length;
-		} else {
-			groupIdsSplit = imsSchedulingVo.getGroupIds().split("\\^");
-			String[] groupNamesSplit = imsSchedulingVo.getGroupNames().split("\\^");
-			dutyNum = groupNamesSplit.length;
-		}
-		String[] classIdsSplit = imsSchedulingVo.getClassIds().split("\\^");
-		String[] classNamesSplit = imsSchedulingVo.getClassNames().split("\\^");
-		int classNum = classNamesSplit.length;
-		int allClass = 0;
-		List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
-		List<ImsDutyMainPersonEntity> imsDutyMainPersonEntityList = new ArrayList<>();
-		String proDutyMainId = null;
-		for (int i = 1; i <= dates.size(); i++) {
-			String date = dates.get(i - 1);
-			for (int j = 1; j <= classNum; j++) {
-				//总排班数加1
-				allClass++;
-				int temp, tempSub = 0;
-				temp = allClass % dutyNum;
-				//班组下标,确定取哪个班组
-				tempSub = temp - 1;
-				//如果整除，取最后一个班组
-				if (temp == 0) {
-					tempSub = dutyNum - 1;
-				}
-				ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
-				imsDutyMainEntity.setClassId(Long.valueOf(classIdsSplit[j - 1]));
-				imsDutyMainEntity.setClassName(classNamesSplit[j - 1]);
-				imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
-				imsDutyMainEntity.setStatus(0);
-				imsDutyMainEntity.setCreateTime(new Date());
-				if (Func.isBlank(proDutyMainId)) {
-					if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
-						proDutyMainId = imsDutyMainEntity1.getId().toString();
-					}
-				}
-				if (StringUtil.isNotBlank(proDutyMainId)) {
-					imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
-				}
-				imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
-				List<Long> collect;
-				Long managerId;
-				String groupName ="";
-				if (2 == imsSchedulingVo.getPersonType()) {
-					List<String> idList = imsSchedulingVo.getRosters().get(groupIdsSplit[tempSub]);
-					collect = idList.stream().map(s -> Long.valueOf(s)).collect(Collectors.toList());
-					managerId = Long.valueOf(groupIdsSplit[tempSub]);
-				} else {
-					String groupId = groupIdsSplit[tempSub];
-					imsDutyMainEntity.setDutyGroupId(Long.valueOf(groupIdsSplit[tempSub]));
-					//查询预备排班的班组人员，为空，则失败
-					List<Long> longList = Arrays.asList(imsSchedulingVo.getGroupIds().split("\\^"))
-						.parallelStream()
-						.map(a -> Long.parseLong(a.trim()))
-						.collect(Collectors.toList());
-					List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(longList);
-					collect = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter ->
-						iter.getPersonId()).collect(Collectors.toList());
-					ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(groupId);
-					groupName = imsDutyGroupEntity.getGroupName();
-					if (ObjectUtil.isNotEmpty(imsDutyGroupEntity) && ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())) {
-						managerId = imsDutyGroupEntity.getManagerId();
-					} else {
-						return R.fail("该班组没有值班组组长");
-					}
-				}
-				String ids = StringUtils.join(collect, "^");
-				imsDutyMainEntity.setDutyPersonIds(ids);
-				Long id = IdWorker.getId();
-				imsDutyMainEntity.setId(id);
-				imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
-				imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
-				imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
-				if (Func.isBlank(proDutyMainId)) {
-					if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
-						proDutyMainId = imsDutyMainEntity1.getId().toString();
-					}
-				}
-				if (StringUtil.isNotBlank(proDutyMainId)) {
-					imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
-				}
-				imsDutyMainEntityList.add(imsDutyMainEntity);
-				proDutyMainId = id == null ? "" : imsDutyMainEntity.getId() + "";
-				//值班人员表同步保存一份
-				copyPersonByDutyMain(imsSchedulingVo, managerId, groupName, imsDutyMainPersonEntityList, imsDutyMainEntity, collect);
-			}
-		}
-		ThreadTask.dutyTask(imsDutyMainEntityList, imsDutyMainPersonEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
-		return R.success("操作成功,系统正在排班中,请稍后查看");
-	}
-
-	private static void copyPersonByDutyMain(ImsSchedulingVo imsSchedulingVo, Long managerId, String groupName, List<ImsDutyMainPersonEntity> imsDutyMainPersonEntityList, ImsDutyMainEntity imsDutyMainEntity, List<Long> collect) {
-		//每个人员对应一条排班-人员计划
-		for (Long personId : collect) {
-			ImsDutyMainPersonEntity imsDutyMainPersonEntity = new ImsDutyMainPersonEntity();
-			imsDutyMainPersonEntity.setClassId(imsDutyMainEntity.getClassId());
-			imsDutyMainPersonEntity.setCreateDept(imsDutyMainEntity.getCreateDept());
-			imsDutyMainPersonEntity.setDutyGroupName(groupName);
-			imsDutyMainPersonEntity.setDutyGroupId(imsSchedulingVo.getGroupId());
-			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(managerId);
-			imsDutyMainPersonEntityList.add(imsDutyMainPersonEntity);
-		}
-	}
-
-	/**
-	 * 周期排班
-	 *
-	 * @param imsSchedulingVo
-	 * @param dates
-	 * @param imsDutyMainEntity1
-	 * @return
-	 */
-	private R cycleSchedulingTowV2(ImsSchedulingVo imsSchedulingVo, List<String> dates, ImsDutyMainEntity imsDutyMainEntity1) {
-		if (imsSchedulingVo.getTemplate()) {
-			if (!doSaveTemplate(imsSchedulingVo)) {
-				return R.fail("模版名称已存在");
-			}
-		}
-		List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
-		List<ImsDutyMainPersonEntity> personEntityList = new ArrayList<>();
-		String proDutyMainId = "";
-		String[] dutyArrIds = imsSchedulingVo.getDutyArrIds();
-		for (int i = 1; i <= dates.size(); i++) {
-			String date = dates.get(i - 1);
-			for (int j = 1; j <= dutyArrIds.length; j++) {
-				String classId = dutyArrIds[j - 1];
-				//按值班周期的天数取模
-				int temp = i % imsSchedulingVo.getDutyNum();
-				//值班下标
-				int tempSub = temp - 1;
-				//如果整除，取最后一个值班
-				if (temp == 0) {
-					tempSub = imsSchedulingVo.getDutyNum() - 1;
-				}
-				String groupId;
-				String[] split;
-				if (imsSchedulingVo.getPersonType() == 1) {
-					//获取对应班组的值班班次
-					groupId = imsSchedulingVo.getDutyOrderIds().get(classId)[tempSub];
-				} else {
-					//灵活排班，无实际作用，只是为了groupId能够初始化
-					groupId = "";
-				}
-				//人员IDS
-				String personIds = "";
-				if ("0".equals(classId)) {
-					//班组排班比灵活排班，多保存一部分没有排到班的信息
-					if (imsSchedulingVo.getPersonType() == 1) {
-						split = groupId.split(",");
-						if (ObjectUtil.isNotEmpty(split)) {
-							for (String dutyGroupId : split) {
-								//查询班组信息
-								Long num = Long.valueOf(StringUtils.isNotEmpty(dutyGroupId) ? dutyGroupId : "0");
-								List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
-								List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
-								if (CollectionUtil.isNotEmpty(collectPerson)) {
-									personIds = StringUtils.join(collectPerson, "^");
-								}
-								if (StringUtil.isNotBlank(dutyGroupId)) {
-									ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
-									setMainEntity(imsDutyMainEntity, classId, Long.valueOf(dutyGroupId), date);
-									imsDutyMainEntity.setStatus(-1);
-									imsDutyMainEntity.setDutyPersonIds(personIds);
-									imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
-									Long id = IdWorker.getId();
-									imsDutyMainEntity.setId(id);
-									imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
-									imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
-									imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
-									imsDutyMainEntityList.add(imsDutyMainEntity);
-								}
-							}
-						}
-					}
-				} else {
-					ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
-					//人员ID
-					List<Long> collectPerson;
-					//负责人ID
-					Long managerId = 0L;
-					String groupName = null;
-					if (imsSchedulingVo.getPersonType() == 1) {
-						//查询班组信息
-						Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
-						List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
-						collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
-						if (CollectionUtil.isNotEmpty(collectPerson)) {
-							personIds = StringUtils.join(collectPerson, "^");
-						}
-						imsDutyMainEntity.setDutyGroupId(Long.valueOf(groupId));
-						ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(groupId);
-						groupName = imsDutyGroupEntity.getGroupName();
-						if (ObjectUtil.isNotEmpty(imsDutyGroupEntity) && ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())) {
-							managerId = imsDutyGroupEntity.getManagerId();
-						}
-					} else {
-						//灵活排版没有班组信息
-						FlexibleSchedulingVo flexibleSchedulingVo = imsSchedulingVo.getFlexible().get(classId).get(tempSub);
-						collectPerson = flexibleSchedulingVo.getPersonIds().stream().map(s -> Long.valueOf(s)).collect(Collectors.toList());
-						personIds = StringUtils.join(collectPerson, "^");
-						managerId = Long.valueOf(flexibleSchedulingVo.getChargeId());
-					}
-					setMainEntity(imsDutyMainEntity, classId, date);
-					if (Func.isBlank(proDutyMainId)) {
-						if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
-							proDutyMainId = imsDutyMainEntity1.getId().toString();
-						}
-					}
-					if (StringUtil.isNotBlank(proDutyMainId)) {
-						imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
-					}
-					if (StringUtil.isNotBlank(personIds)) {
-						imsDutyMainEntity.setDutyPersonIds(personIds);
-					}
-					imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
-					Long id = IdWorker.getId(imsDutyMainEntity);
-					imsDutyMainEntity.setId(id);
-					imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
-					imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
-					imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
-					imsDutyMainEntityList.add(imsDutyMainEntity);
-					proDutyMainId = id == null ? "" : imsDutyMainEntity.getId().toString();
-					imsDutyMainEntity1=imsDutyMainEntity;
-					//同步保存到排班计划-人员表
-					copyPersonByDutyMain(imsSchedulingVo, managerId, groupName, personEntityList, imsDutyMainEntity, collectPerson);
-				}
-			}
-		}
-		ThreadTask.dutyTask(imsDutyMainEntityList, personEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
-		return R.success("操作成功,系统正在排班中,请稍后查看");
-	}
-
-
-	private R pollScheduling(ImsSchedulingVo imsSchedulingVo) {
-		String[] start = imsSchedulingVo.getStartDate().split("-");
-		String[] end = imsSchedulingVo.getEndDate().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 (!imsSchedulingVo.getStartDate().equals(date2)) {
-			String minusOnedDay = DateUtils.dayStringDate(imsSchedulingVo.getStartDate(), 1, false);
-			log.info("--------------Auth:" + AuthUtil.getDeptId() + "--------createDept:" + imsSchedulingVo.getCreateDept());
-			List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, imsSchedulingVo.getCreateDept());
-			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 (imsSchedulingVo.isCompose() == false) {
-			List<ImsDutyMainEntity> imsDutyMainEntities2 = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-				ge(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getStartDate());
-				le(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getEndDate());
-				eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-			}});
-			if (CollectionUtil.isNotEmpty(imsDutyMainEntities2)) {
-				return R.data(1);
-			}
-		}
-		String[] groupIdsSplit = imsSchedulingVo.getGroupIds().split("\\^");
-		String[] groupNamesSplit = imsSchedulingVo.getGroupNames().split("\\^");
-		int dutyNum = groupNamesSplit.length;
-		String[] classIdsSplit = imsSchedulingVo.getClassIds().split("\\^");
-		String[] classNamesSplit = imsSchedulingVo.getClassNames().split("\\^");
-		int classNum = classNamesSplit.length;
-		int allClass = 0;
-
-		if (Integer.valueOf(start[0]) < year) {
-			return R.fail("年份必须大于或等于当前年份！");
-		}
-		if (Integer.valueOf(start[0]) == year && Integer.valueOf(start[0]) < month) {
-			return R.fail("月份必须大于或等于当前年份！");
-		}
-		if (CollectionUtil.isNotEmpty(dates)) {
-			this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-				eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-				in(ImsDutyMainEntity::getDutyDate, dates);
-			}});
-		}
-		//查询所有班组人员
-		List<ImsDutyGroupPEntity> list = imsDutyGroupPService.list();
-
-		String subDayDate = DateUtils.dayDate(DateUtil.parse(imsSchedulingVo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE);
-
-		ImsDutyMainEntity imsDutyMainEntity1 = this.baseMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-			eq(ImsDutyMainEntity::getDutyDate, subDayDate);
-			eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-			ne(ImsDutyMainEntity::getStatus, "-1");
-			orderByDesc(ImsDutyMainEntity::getId).last("LIMIT 1");
-		}});
-
-		List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
-
-		String proDutyMainId = "";
-		for (int i = 1; i <= dates.size(); i++) {
-			String date = dates.get(i - 1);
-			for (int j = 1; j <= classNum; j++) {
-
-				//总排班数加1
-				//allClass++;
-				int temp, tempSub = 0;
-				allClass++;
-				temp = allClass % dutyNum;
-				//班组下标,确定取哪个班组
-				tempSub = temp - 1;
-				//如果整除，取最后一个班组
-				if (temp == 0) {
-					tempSub = dutyNum - 1;
-				}
-
-				ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
-				imsDutyMainEntity.setClassId(Long.valueOf(classIdsSplit[j - 1]));
-				imsDutyMainEntity.setDutyGroupId(Long.valueOf(groupIdsSplit[tempSub]));
-				imsDutyMainEntity.setClassName(classNamesSplit[j - 1]);
-				imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
-				imsDutyMainEntity.setStatus(0);
-				imsDutyMainEntity.setCreateTime(new Date());
-				if (Func.isBlank(proDutyMainId)) {
-					if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
-						proDutyMainId = imsDutyMainEntity1.getId().toString();
-					}
-				}
-				if (StringUtil.isNotBlank(proDutyMainId)) {
-					imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
-				}
-				imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
-				String groupId = groupIdsSplit[tempSub];
-				List<Long> collect = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter ->
-					iter.getPersonId()).collect(Collectors.toList());
-				if (CollectionUtil.isNotEmpty(collect)) {
-					String ids = StringUtils.join(collect, "^");
-					imsDutyMainEntity.setDutyPersonIds(ids);
-				} else {
-					return R.fail("班组存在人员为空，禁止排班!");
-				}
-				Long id = IdWorker.getId();
-				imsDutyMainEntity.setId(id);
-				imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
-				imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
-				imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
-				imsDutyMainEntityList.add(imsDutyMainEntity);
-				proDutyMainId = id == null ? "" : imsDutyMainEntity.getId() + "";
-			}
-
-		}
-		ThreadTask.dutyTask(imsDutyMainEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
-		return R.success("操作成功,系统正在排班中,请稍后查看");
-	}
-
-	/**
-	 * 获取两个日期之间的所有日期
-	 *
-	 * @param startYear
-	 * @param startMonth
-	 * @param startDay
-	 * @param endYear
-	 * @param endMonth
-	 * @param endDay
-	 * @return
-	 */
-	public static List<String> getTwoPeriodsAll(int startYear, int startMonth, int startDay, int endYear, int endMonth, int endDay) {
-		List<String> list = new ArrayList<>();
-		Calendar start = Calendar.getInstance();
-		start.set(startYear, startMonth - 1, startDay);
-		Long startTIme = start.getTimeInMillis();
-		Calendar end = Calendar.getInstance();
-		end.set(endYear, endMonth - 1, endDay);
-		Long endTime = end.getTimeInMillis();
-
-		Long oneDay = 1000 * 60 * 60 * 24L;
-
-		Long time = startTIme;
-		while (time <= endTime) {
-			Date d = new Date(time);
-			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-			list.add(df.format(d));
-			time += oneDay;
-		}
-		return list;
-
-	}
-
-
-	public String getDate(int year, int month, int day) {
-		String date = "";
-		if (month < 10) {
-			if (day < 10) {
-				date = year + "-" + 0 + month + "-" + 0 + day;
-			} else {
-				date = year + "-" + 0 + month + "-" + day;
-			}
-		} else {
-			if (day < 10) {
-				date = year + "-" + month + "-" + 0 + day;
-			} else {
-				date = year + "-" + month + "-" + day;
-			}
-		}
-		return date;
-	}
-
-
-	/**
-	 * 查询已排班记录
-	 *
-	 * @param month
-	 * @return
-	 */
-	@Override
-	public R getSchedulingList(int year, int month, Long deptId) {
-		String yearAndMonth = "";
-
-		if (month < 10) {
-			yearAndMonth = year + "-0" + month;
-		} else {
-			yearAndMonth = year + "-" + month;
-		}
-		List<ImsSchedulingVo> imsSchedulingVos = this.baseMapper.selectByDateList(yearAndMonth, deptId);
-		if (CollectionUtil.isEmpty(imsSchedulingVos)) {
-			return R.success("该月未排班");
-		}
-		int days = getDaysByYearMonth(year, month);
-		Map<String, List<ImsSchedulingVo>> map = new HashMap();
-		for (int i = 1; i <= days; i++) {
-			String date = getDate(year, month, i);
-			List<ImsSchedulingVo> collect = imsSchedulingVos.stream().filter(o -> DateUtil.format(o.getDutyDate(), DateUtil.PATTERN_DATE).equals(date)).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
-			map.put(date, collect);
-		}
-		return R.data(new TreeMap<>(map));
-	}
-
-	/**
-	 * 查询已排班记录
-	 *
-	 * @param year
-	 * @param month
-	 * @param deptId
-	 * @return
-	 */
-	@Override
-	public R getSchedulingListV2(int year, int month, Long deptId) {
-		String yearAndMonth = "";
-
-		if (month < 10) {
-			yearAndMonth = year + "-0" + month;
-		} else {
-			yearAndMonth = year + "-" + month;
-		}
-		List<ImsSchedulingVo> imsSchedulingVos = this.baseMapper.selectByDateListV2(yearAndMonth, deptId);
-		if (CollectionUtil.isEmpty(imsSchedulingVos)) {
-			return R.success("该月未排班");
-		}
-		int days = getDaysByYearMonth(year, month);
-		Map<String, List<ImsSchedulingVo>> map = new HashMap();
-		for (int i = 1; i <= days; i++) {
-			String date = getDate(year, month, i);
-			List<ImsSchedulingVo> collect = imsSchedulingVos.stream().filter(o -> DateUtil.format(o.getDutyDate(), DateUtil.PATTERN_DATE).equals(date)).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
-			collect = collect.stream().map(s -> {
-				//灵活排班把班组名称拼接成人员名称
-				if (s.getGroupId() == null) {
-					String[] split = s.getDutyPersonIds().split("\\^");
-					if (null != split && split.length > 0) {
-						for (int j = 0; j < split.length; j++) {
-							User user = UserCache.getUser(Long.valueOf(split[j]));
-							if (ObjectUtil.isNotEmpty(user)) {
-								if (j == split.length - 1) {
-									s.setName(s.getName() + user.getName());
-								} else {
-									s.setName(s.getName() + user.getName() + "、");
-								}
-							}
-						}
-					}
-				} else {
-					ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getGroupId());
-					s.setName(s.getName() + imsDutyGroupEntity.getGroupName());
-				}
-				return s;
-			}).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
-			map.put(date, collect);
-		}
-		return R.data(new TreeMap<>(map));
-	}
+        //判断值班人员同一天同一班次是否排过班
+        Map<String, Object> params = new HashMap<>();
+        if (null != imsDutyMain.getId()) {
+            params.put("id", imsDutyMain.getId());
+        }
+        params.put("dutyDate", imsDutyMain.getDutyDate());
+        params.put("classId", imsDutyMain.getClassId());
+        String[] dutyPersonIds = imsDutyMain.getDutyPersonIds().split("\\^");
+        for (String dutyPersonId : dutyPersonIds) {
+            params.put("dutyPersonIds", dutyPersonId);
+            List<ImsDutyMainEntity> list = this.baseMapper.selectByPersonId(params);
+            if (list.size() > 0) {
+                return R.fail("ID为" + dutyPersonId + "的用户在该天该班次已排过班，请重新选择");
+            }
+        }
+        imsDutyMain.setStatus(JoinStatus.DUTY_WAIT.getStatus());
+        return R.status(this.saveOrUpdate(imsDutyMain));
+    }
+
+    @Override
+    public R delete(List<Long> ids) {
+        if (ids.size() == 0) {
+            return R.fail("ids不能为空");
+        }
+        //状态为待值班的才可以删除
+        for (int i = 0; i < ids.size(); i++) {
+            ImsDutyMainEntity imsDutyMainEntity = this.getById(ids.get(i));
+            if (imsDutyMainEntity.getStatus() != JoinStatus.DUTY_WAIT.getStatus()) {
+                return R.fail("状态为待值班的才可以删除");
+            }
+        }
+        return R.status(this.deleteLogic(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R deleteV2(List<Long> ids) {
+        if (ids.size() == 0) {
+            return R.fail("ids不能为空");
+        }
+        //状态为待值班的才可以删除
+        for (int i = 0; i < ids.size(); i++) {
+            ImsDutyMainEntity imsDutyMainEntity = this.getById(ids.get(i));
+            if (imsDutyMainEntity.getStatus() != JoinStatus.DUTY_WAIT.getStatus()) {
+                return R.fail("状态为待值班的才可以删除");
+            }
+        }
+        List<ImsDutyMainPersonEntity> personEntityList = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+            in(ImsDutyMainPersonEntity::getDutyMainId, ids);
+        }});
+        List<Long> collect = personEntityList.stream().map(s -> s.getId()).collect(Collectors.toList());
+        return R.status(this.deleteLogic(ids) && iImsDutyMainPersonService.deleteLogic(collect));
+    }
+
+    @Override
+    public R getByDateListAll(String dutyDate, Long personId) {
+        return R.data(this.baseMapper.selectByDateListAll(dutyDate, personId));
+    }
+
+
+    @Override
+    public ImsSchedulingVo getByIdOne(Long id) {
+        return this.baseMapper.selectByIdOne(id, null);
+    }
+
+    @Override
+    public ImsSchedulingVo getByIdOneV2(Long id) {
+        ImsSchedulingVo imsSchedulingVo = this.baseMapper.selectByIdOneV2(id, null);
+        if (null == imsSchedulingVo.getGroupId()) {
+            imsSchedulingVo.setGroupName("临时班组");
+            ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                eq(ImsDutyMainPersonEntity::getDutyMainId, id);
+                last(" limit 1");
+            }});
+            imsSchedulingVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson());
+        } else {
+            ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsSchedulingVo.getGroupId());
+            imsSchedulingVo.setGroupName(imsDutyGroupEntity.getGroupName());
+            imsSchedulingVo.setGroupId(imsDutyGroupEntity.getId());
+            imsSchedulingVo.setManagerId(imsDutyGroupEntity.getManagerId());
+        }
+        return imsSchedulingVo;
+    }
+
+    @Override
+    public ImsSchedulingVo getByIdOneV2(Long id, Long preDutyId) {
+        ImsSchedulingVo imsSchedulingVo = this.baseMapper.selectByIdOneV2(id, preDutyId);
+        if (null == imsSchedulingVo.getGroupId()) {
+            imsSchedulingVo.setGroupName("临时班组");
+            ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                eq(ImsDutyMainPersonEntity::getDutyMainId, imsSchedulingVo.getId());
+                last("limit 1");
+            }});
+            imsSchedulingVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson());
+        } else {
+            ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsSchedulingVo.getGroupId());
+            imsSchedulingVo.setGroupName(imsDutyGroupEntity.getGroupName());
+            imsSchedulingVo.setGroupId(imsDutyGroupEntity.getId());
+            imsSchedulingVo.setManagerId(imsDutyGroupEntity.getManagerId());
+        }
+        return imsSchedulingVo;
+    }
+
+    @Override
+    public ImsDutyMainEntity getMainEntity(Long id) {
+        return this.baseMapper.selectMainByIdOne(id);
+    }
+
+    /**
+     * 排班
+     *
+     * @param imsSchedulingVo
+     * @return
+     */
+    @Override
+    public R getScheduling(ImsSchedulingVo imsSchedulingVo) {
+
+
+        if (null == imsSchedulingVo.getSchedulingType()) {
+            imsSchedulingVo.setSchedulingType(1);
+        }
+        if (1 == imsSchedulingVo.getSchedulingType()) {
+            return pollScheduling(imsSchedulingVo);
+        }
+
+        return cycleSchedulingTow(imsSchedulingVo);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R getSchedulingV2(ImsSchedulingVo imsSchedulingVo) {
+        //判断是否符合排班规则。
+        String[] start = imsSchedulingVo.getStartDate().split("-");
+        String[] end = imsSchedulingVo.getEndDate().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 (!imsSchedulingVo.getStartDate().equals(date2)) {
+            String minusOnedDay = DateUtils.dayStringDate(imsSchedulingVo.getStartDate(), 1, false);
+            log.info("--------------Auth:" + AuthUtil.getDeptId() + "--------createDept:" + imsSchedulingVo.getCreateDept());
+            List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, imsSchedulingVo.getCreateDept());
+            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, imsSchedulingVo.getStartDate());
+            le(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getEndDate());
+            eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+        }});
+        List<ImsDutyMainPersonEntity> imsDutyMainPersonEntities = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+            ge(ImsDutyMainPersonEntity::getDutyDate, imsSchedulingVo.getStartDate());
+            le(ImsDutyMainPersonEntity::getDutyDate, imsSchedulingVo.getEndDate());
+            eq(ImsDutyMainPersonEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+        }});
+        if (CollectionUtil.isNotEmpty(imsDutyMainPersonEntities) || CollectionUtil.isNotEmpty(imsDutyMainEntities2)) {
+            if (imsSchedulingVo.isCompose() == false) {
+                //如果有排班记录且无需排序，则返回
+                return R.data(1);
+            } else {
+                if (CollectionUtil.isNotEmpty(dates)) {
+                    //重新修改已有的排版，先删除，在添加
+                    this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+                        eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+                        in(ImsDutyMainEntity::getDutyDate, dates);
+                    }});
+                    imsDutyMainPersonMapper.delete(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                        in(ImsDutyMainPersonEntity::getDutyDate, dates);
+                        eq(ImsDutyMainPersonEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+                    }});
+                }
+            }
+        }
+        String subDayDate = DateUtils.dayDate(DateUtil.parse(imsSchedulingVo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE);
+        ImsDutyMainEntity imsDutyMainEntity1 = this.baseMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+            eq(ImsDutyMainEntity::getDutyDate, subDayDate);
+            eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+            ne(ImsDutyMainEntity::getStatus, "-1");
+            orderByDesc(ImsDutyMainEntity::getId).last("LIMIT 1");
+        }});
+        if (null == imsSchedulingVo.getSchedulingType()) {
+            imsSchedulingVo.setSchedulingType(1);
+        }
+        //符合条件后根据周期、轮询排班方式保存
+        if (1 == imsSchedulingVo.getSchedulingType()) {
+            return pollSchedulingV2(imsSchedulingVo, dates, imsDutyMainEntity1);
+        }
+        return cycleSchedulingTowV2(imsSchedulingVo, dates, imsDutyMainEntity1);
+    }
+
+    /**
+     * 轮询排班
+     *
+     * @param imsSchedulingVo
+     * @param dates
+     * @param imsDutyMainEntity1
+     * @return
+     */
+    private R pollSchedulingV2(ImsSchedulingVo imsSchedulingVo, List<String> dates, ImsDutyMainEntity imsDutyMainEntity1) {
+        String[] groupIdsSplit;
+        int dutyNum;
+        //轮询排班分为：班组还是灵活；如果是2.灵活人员排班，则不需要查数据库，直接存对应信息
+        if (2 == imsSchedulingVo.getPersonType()) {
+            Map<String, List<String>> rosters = imsSchedulingVo.getRosters();
+            groupIdsSplit = rosters.keySet().toArray(new String[0]);
+            dutyNum = groupIdsSplit.length;
+        } else {
+            groupIdsSplit = imsSchedulingVo.getGroupIds().split("\\^");
+            String[] groupNamesSplit = imsSchedulingVo.getGroupNames().split("\\^");
+            dutyNum = groupNamesSplit.length;
+        }
+        String[] classIdsSplit = imsSchedulingVo.getClassIds().split("\\^");
+        String[] classNamesSplit = imsSchedulingVo.getClassNames().split("\\^");
+        int classNum = classNamesSplit.length;
+        int allClass = 0;
+        List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
+        List<ImsDutyMainPersonEntity> imsDutyMainPersonEntityList = new ArrayList<>();
+        String proDutyMainId = null;
+        for (int i = 1; i <= dates.size(); i++) {
+            String date = dates.get(i - 1);
+            for (int j = 1; j <= classNum; j++) {
+                //总排班数加1
+                allClass++;
+                int temp, tempSub = 0;
+                temp = allClass % dutyNum;
+                //班组下标,确定取哪个班组
+                tempSub = temp - 1;
+                //如果整除，取最后一个班组
+                if (temp == 0) {
+                    tempSub = dutyNum - 1;
+                }
+                ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
+                imsDutyMainEntity.setClassId(Long.valueOf(classIdsSplit[j - 1]));
+                imsDutyMainEntity.setClassName(classNamesSplit[j - 1]);
+                imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
+                imsDutyMainEntity.setStatus(0);
+                imsDutyMainEntity.setCreateTime(new Date());
+                if (Func.isBlank(proDutyMainId)) {
+                    if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
+                        proDutyMainId = imsDutyMainEntity1.getId().toString();
+                    }
+                }
+                if (StringUtil.isNotBlank(proDutyMainId)) {
+                    imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
+                }
+                imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
+                List<Long> collect;
+                Long managerId;
+                String groupName = "";
+                if (2 == imsSchedulingVo.getPersonType()) {
+                    List<String> idList = imsSchedulingVo.getRosters().get(groupIdsSplit[tempSub]);
+                    collect = idList.stream().map(s -> Long.valueOf(s)).collect(Collectors.toList());
+                    managerId = Long.valueOf(groupIdsSplit[tempSub]);
+                } else {
+                    String groupId = groupIdsSplit[tempSub];
+                    imsDutyMainEntity.setDutyGroupId(Long.valueOf(groupIdsSplit[tempSub]));
+                    //查询预备排班的班组人员，为空，则失败
+                    List<Long> longList = Arrays.asList(imsSchedulingVo.getGroupIds().split("\\^"))
+                            .parallelStream()
+                            .map(a -> Long.parseLong(a.trim()))
+                            .collect(Collectors.toList());
+                    List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(longList);
+                    collect = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter ->
+                            iter.getPersonId()).collect(Collectors.toList());
+                    ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(groupId);
+                    groupName = imsDutyGroupEntity.getGroupName();
+                    if (ObjectUtil.isNotEmpty(imsDutyGroupEntity) && ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())) {
+                        managerId = imsDutyGroupEntity.getManagerId();
+                    } else {
+                        return R.fail("该班组没有值班组组长");
+                    }
+                }
+                String ids = StringUtils.join(collect, "^");
+                imsDutyMainEntity.setDutyPersonIds(ids);
+                Long id = IdWorker.getId();
+                imsDutyMainEntity.setId(id);
+                imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
+                imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
+                imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
+                if (Func.isBlank(proDutyMainId)) {
+                    if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
+                        proDutyMainId = imsDutyMainEntity1.getId().toString();
+                    }
+                }
+                if (StringUtil.isNotBlank(proDutyMainId)) {
+                    imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
+                }
+                imsDutyMainEntityList.add(imsDutyMainEntity);
+                proDutyMainId = id == null ? "" : imsDutyMainEntity.getId() + "";
+                //值班人员表同步保存一份
+                copyPersonByDutyMain(imsSchedulingVo, managerId, groupName, imsDutyMainPersonEntityList, imsDutyMainEntity, collect);
+            }
+        }
+        ThreadTask.dutyTask(imsDutyMainEntityList, imsDutyMainPersonEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
+        return R.success("操作成功,系统正在排班中,请稍后查看");
+    }
+
+    private static void copyPersonByDutyMain(ImsSchedulingVo imsSchedulingVo, Long managerId, String groupName, List<ImsDutyMainPersonEntity> imsDutyMainPersonEntityList, ImsDutyMainEntity imsDutyMainEntity, List<Long> collect) {
+        //每个人员对应一条排班-人员计划
+        for (Long personId : collect) {
+            ImsDutyMainPersonEntity imsDutyMainPersonEntity = new ImsDutyMainPersonEntity();
+            imsDutyMainPersonEntity.setClassId(imsDutyMainEntity.getClassId());
+            imsDutyMainPersonEntity.setCreateDept(imsDutyMainEntity.getCreateDept());
+            imsDutyMainPersonEntity.setDutyGroupName(groupName);
+            imsDutyMainPersonEntity.setDutyGroupId(imsSchedulingVo.getGroupId());
+            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(managerId);
+            imsDutyMainPersonEntityList.add(imsDutyMainPersonEntity);
+        }
+    }
+
+    /**
+     * 周期排班
+     *
+     * @param imsSchedulingVo
+     * @param dates
+     * @param imsDutyMainEntity1
+     * @return
+     */
+    private R cycleSchedulingTowV2(ImsSchedulingVo imsSchedulingVo, List<String> dates, ImsDutyMainEntity imsDutyMainEntity1) {
+        if (imsSchedulingVo.getTemplate()) {
+            if (!doSaveTemplate(imsSchedulingVo)) {
+                return R.fail("模版名称已存在");
+            }
+        }
+        List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
+        List<ImsDutyMainPersonEntity> personEntityList = new ArrayList<>();
+        String proDutyMainId = "";
+        String[] dutyArrIds = imsSchedulingVo.getDutyArrIds();
+        for (int i = 1; i <= dates.size(); i++) {
+            String date = dates.get(i - 1);
+            for (int j = 1; j <= dutyArrIds.length; j++) {
+                String classId = dutyArrIds[j - 1];
+                //按值班周期的天数取模
+                int temp = i % imsSchedulingVo.getDutyNum();
+                //值班下标
+                int tempSub = temp - 1;
+                //如果整除，取最后一个值班
+                if (temp == 0) {
+                    tempSub = imsSchedulingVo.getDutyNum() - 1;
+                }
+                String groupId;
+                String[] split;
+                if (imsSchedulingVo.getPersonType() == 1) {
+                    //获取对应班组的值班班次
+                    groupId = imsSchedulingVo.getDutyOrderIds().get(classId)[tempSub];
+                } else {
+                    //灵活排班，无实际作用，只是为了groupId能够初始化
+                    groupId = "";
+                }
+                //人员IDS
+                String personIds = "";
+                if ("0".equals(classId)) {
+                    //班组排班比灵活排班，多保存一部分没有排到班的信息
+                    if (imsSchedulingVo.getPersonType() == 1) {
+                        split = groupId.split(",");
+                        if (ObjectUtil.isNotEmpty(split)) {
+                            for (String dutyGroupId : split) {
+                                //查询班组信息
+                                Long num = Long.valueOf(StringUtils.isNotEmpty(dutyGroupId) ? dutyGroupId : "0");
+                                List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
+                                List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
+                                if (CollectionUtil.isNotEmpty(collectPerson)) {
+                                    personIds = StringUtils.join(collectPerson, "^");
+                                }
+                                if (StringUtil.isNotBlank(dutyGroupId)) {
+                                    ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
+                                    setMainEntity(imsDutyMainEntity, classId, Long.valueOf(dutyGroupId), date);
+                                    imsDutyMainEntity.setStatus(-1);
+                                    imsDutyMainEntity.setDutyPersonIds(personIds);
+                                    imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
+                                    Long id = IdWorker.getId();
+                                    imsDutyMainEntity.setId(id);
+                                    imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
+                                    imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
+                                    imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
+                                    imsDutyMainEntityList.add(imsDutyMainEntity);
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
+                    //人员ID
+                    List<Long> collectPerson;
+                    //负责人ID
+                    Long managerId = 0L;
+                    String groupName = null;
+                    if (imsSchedulingVo.getPersonType() == 1) {
+                        //查询班组信息
+                        Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
+                        List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
+                        collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(collectPerson)) {
+                            personIds = StringUtils.join(collectPerson, "^");
+                        }
+                        imsDutyMainEntity.setDutyGroupId(Long.valueOf(groupId));
+                        ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(groupId);
+                        groupName = imsDutyGroupEntity.getGroupName();
+                        if (ObjectUtil.isNotEmpty(imsDutyGroupEntity) && ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())) {
+                            managerId = imsDutyGroupEntity.getManagerId();
+                        }
+                    } else {
+                        //灵活排版没有班组信息
+                        FlexibleSchedulingVo flexibleSchedulingVo = imsSchedulingVo.getFlexible().get(classId).get(tempSub);
+                        collectPerson = flexibleSchedulingVo.getPersonIds().stream().map(s -> Long.valueOf(s)).collect(Collectors.toList());
+                        personIds = StringUtils.join(collectPerson, "^");
+                        managerId = Long.valueOf(flexibleSchedulingVo.getChargeId());
+                    }
+                    setMainEntity(imsDutyMainEntity, classId, date);
+                    if (Func.isBlank(proDutyMainId)) {
+                        if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
+                            proDutyMainId = imsDutyMainEntity1.getId().toString();
+                        }
+                    }
+                    if (StringUtil.isNotBlank(proDutyMainId)) {
+                        imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
+                    }
+                    if (StringUtil.isNotBlank(personIds)) {
+                        imsDutyMainEntity.setDutyPersonIds(personIds);
+                    }
+                    imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
+                    Long id = IdWorker.getId(imsDutyMainEntity);
+                    imsDutyMainEntity.setId(id);
+                    imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
+                    imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
+                    imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
+                    imsDutyMainEntityList.add(imsDutyMainEntity);
+                    proDutyMainId = id == null ? "" : imsDutyMainEntity.getId().toString();
+                    imsDutyMainEntity1 = imsDutyMainEntity;
+                    //同步保存到排班计划-人员表
+                    copyPersonByDutyMain(imsSchedulingVo, managerId, groupName, personEntityList, imsDutyMainEntity, collectPerson);
+                }
+            }
+        }
+        ThreadTask.dutyTask(imsDutyMainEntityList, personEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
+        return R.success("操作成功,系统正在排班中,请稍后查看");
+    }
+
+
+    private R pollScheduling(ImsSchedulingVo imsSchedulingVo) {
+        String[] start = imsSchedulingVo.getStartDate().split("-");
+        String[] end = imsSchedulingVo.getEndDate().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 (!imsSchedulingVo.getStartDate().equals(date2)) {
+            String minusOnedDay = DateUtils.dayStringDate(imsSchedulingVo.getStartDate(), 1, false);
+            log.info("--------------Auth:" + AuthUtil.getDeptId() + "--------createDept:" + imsSchedulingVo.getCreateDept());
+            List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, imsSchedulingVo.getCreateDept());
+            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 (imsSchedulingVo.isCompose() == false) {
+            List<ImsDutyMainEntity> imsDutyMainEntities2 = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+                ge(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getStartDate());
+                le(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getEndDate());
+                eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+            }});
+            if (CollectionUtil.isNotEmpty(imsDutyMainEntities2)) {
+                return R.data(1);
+            }
+        }
+        String[] groupIdsSplit = imsSchedulingVo.getGroupIds().split("\\^");
+        String[] groupNamesSplit = imsSchedulingVo.getGroupNames().split("\\^");
+        int dutyNum = groupNamesSplit.length;
+        String[] classIdsSplit = imsSchedulingVo.getClassIds().split("\\^");
+        String[] classNamesSplit = imsSchedulingVo.getClassNames().split("\\^");
+        int classNum = classNamesSplit.length;
+        int allClass = 0;
+
+        if (Integer.valueOf(start[0]) < year) {
+            return R.fail("年份必须大于或等于当前年份！");
+        }
+        if (Integer.valueOf(start[0]) == year && Integer.valueOf(start[0]) < month) {
+            return R.fail("月份必须大于或等于当前年份！");
+        }
+        if (CollectionUtil.isNotEmpty(dates)) {
+            this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+                eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+                in(ImsDutyMainEntity::getDutyDate, dates);
+            }});
+        }
+        //查询所有班组人员
+        List<ImsDutyGroupPEntity> list = imsDutyGroupPService.list();
+
+        String subDayDate = DateUtils.dayDate(DateUtil.parse(imsSchedulingVo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE);
+
+        ImsDutyMainEntity imsDutyMainEntity1 = this.baseMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+            eq(ImsDutyMainEntity::getDutyDate, subDayDate);
+            eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+            ne(ImsDutyMainEntity::getStatus, "-1");
+            orderByDesc(ImsDutyMainEntity::getId).last("LIMIT 1");
+        }});
+
+        List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
+
+        String proDutyMainId = "";
+        for (int i = 1; i <= dates.size(); i++) {
+            String date = dates.get(i - 1);
+            for (int j = 1; j <= classNum; j++) {
+
+                //总排班数加1
+                //allClass++;
+                int temp, tempSub = 0;
+                allClass++;
+                temp = allClass % dutyNum;
+                //班组下标,确定取哪个班组
+                tempSub = temp - 1;
+                //如果整除，取最后一个班组
+                if (temp == 0) {
+                    tempSub = dutyNum - 1;
+                }
+
+                ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
+                imsDutyMainEntity.setClassId(Long.valueOf(classIdsSplit[j - 1]));
+                imsDutyMainEntity.setDutyGroupId(Long.valueOf(groupIdsSplit[tempSub]));
+                imsDutyMainEntity.setClassName(classNamesSplit[j - 1]);
+                imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
+                imsDutyMainEntity.setStatus(0);
+                imsDutyMainEntity.setCreateTime(new Date());
+                if (Func.isBlank(proDutyMainId)) {
+                    if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
+                        proDutyMainId = imsDutyMainEntity1.getId().toString();
+                    }
+                }
+                if (StringUtil.isNotBlank(proDutyMainId)) {
+                    imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
+                }
+                imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
+                String groupId = groupIdsSplit[tempSub];
+                List<Long> collect = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter ->
+                        iter.getPersonId()).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(collect)) {
+                    String ids = StringUtils.join(collect, "^");
+                    imsDutyMainEntity.setDutyPersonIds(ids);
+                } else {
+                    return R.fail("班组存在人员为空，禁止排班!");
+                }
+                Long id = IdWorker.getId();
+                imsDutyMainEntity.setId(id);
+                imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
+                imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
+                imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
+                imsDutyMainEntityList.add(imsDutyMainEntity);
+                proDutyMainId = id == null ? "" : imsDutyMainEntity.getId() + "";
+            }
+
+        }
+        ThreadTask.dutyTask(imsDutyMainEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
+        return R.success("操作成功,系统正在排班中,请稍后查看");
+    }
+
+    /**
+     * 获取两个日期之间的所有日期
+     *
+     * @param startYear
+     * @param startMonth
+     * @param startDay
+     * @param endYear
+     * @param endMonth
+     * @param endDay
+     * @return
+     */
+    public static List<String> getTwoPeriodsAll(int startYear, int startMonth, int startDay, int endYear, int endMonth, int endDay) {
+        List<String> list = new ArrayList<>();
+        Calendar start = Calendar.getInstance();
+        start.set(startYear, startMonth - 1, startDay);
+        Long startTIme = start.getTimeInMillis();
+        Calendar end = Calendar.getInstance();
+        end.set(endYear, endMonth - 1, endDay);
+        Long endTime = end.getTimeInMillis();
+
+        Long oneDay = 1000 * 60 * 60 * 24L;
+
+        Long time = startTIme;
+        while (time <= endTime) {
+            Date d = new Date(time);
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            list.add(df.format(d));
+            time += oneDay;
+        }
+        return list;
+
+    }
+
+
+    public String getDate(int year, int month, int day) {
+        String date = "";
+        if (month < 10) {
+            if (day < 10) {
+                date = year + "-" + 0 + month + "-" + 0 + day;
+            } else {
+                date = year + "-" + 0 + month + "-" + day;
+            }
+        } else {
+            if (day < 10) {
+                date = year + "-" + month + "-" + 0 + day;
+            } else {
+                date = year + "-" + month + "-" + day;
+            }
+        }
+        return date;
+    }
+
+
+    /**
+     * 查询已排班记录
+     *
+     * @param month
+     * @return
+     */
+    @Override
+    public R getSchedulingList(int year, int month, Long deptId) {
+        String yearAndMonth = "";
+
+        if (month < 10) {
+            yearAndMonth = year + "-0" + month;
+        } else {
+            yearAndMonth = year + "-" + month;
+        }
+        List<ImsSchedulingVo> imsSchedulingVos = this.baseMapper.selectByDateList(yearAndMonth, deptId);
+        if (CollectionUtil.isEmpty(imsSchedulingVos)) {
+            return R.success("该月未排班");
+        }
+        int days = getDaysByYearMonth(year, month);
+        Map<String, List<ImsSchedulingVo>> map = new HashMap();
+        for (int i = 1; i <= days; i++) {
+            String date = getDate(year, month, i);
+            List<ImsSchedulingVo> collect = imsSchedulingVos.stream().filter(o -> DateUtil.format(o.getDutyDate(), DateUtil.PATTERN_DATE).equals(date)).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
+            map.put(date, collect);
+        }
+        return R.data(new TreeMap<>(map));
+    }
+
+    /**
+     * 查询已排班记录
+     *
+     * @param year
+     * @param month
+     * @param deptId
+     * @return
+     */
+    @Override
+    public R getSchedulingListV2(int year, int month, Long deptId) {
+        String yearAndMonth = "";
+
+        if (month < 10) {
+            yearAndMonth = year + "-0" + month;
+        } else {
+            yearAndMonth = year + "-" + month;
+        }
+        List<ImsSchedulingVo> imsSchedulingVos = this.baseMapper.selectByDateListV2(yearAndMonth, deptId);
+        if (CollectionUtil.isEmpty(imsSchedulingVos)) {
+            return R.success("该月未排班");
+        }
+        int days = getDaysByYearMonth(year, month);
+        Map<String, List<ImsSchedulingVo>> map = new HashMap();
+        for (int i = 1; i <= days; i++) {
+            String date = getDate(year, month, i);
+            List<ImsSchedulingVo> collect = imsSchedulingVos.stream().filter(o -> DateUtil.format(o.getDutyDate(), DateUtil.PATTERN_DATE).equals(date)).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
+            collect = collect.stream().map(s -> {
+                //灵活排班把班组名称拼接成人员名称
+                if (s.getGroupId() == null) {
+                    ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                        eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId());
+                        last(" limit 1");
+                    }});
+                    //如果person的表中有班组名称，则直接取
+                    if (ObjectUtil.isNotEmpty(imsDutyMainPersonEntity) && imsDutyMainPersonEntity.getDutyGroupName() != null) {
+                        s.setName(imsDutyMainPersonEntity.getDutyGroupName());
+                    } else {
+                        //否则，拼接对应人员
+                        String[] split = s.getDutyPersonIds().split("\\^");
+                        if (null != split && split.length > 0) {
+                            for (int j = 0; j < split.length; j++) {
+                                User user = UserCache.getUser(Long.valueOf(split[j]));
+                                if (ObjectUtil.isNotEmpty(user)) {
+                                    if (j == split.length - 1) {
+                                        s.setName(s.getName() + user.getName());
+                                    } else {
+                                        s.setName(s.getName() + user.getName() + "、");
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getGroupId());
+                    s.setName(s.getName() + imsDutyGroupEntity.getGroupName());
+                }
+                return s;
+            }).sorted(Comparator.comparing(ImsSchedulingVo::getId)).collect(Collectors.toList());
+            map.put(date, collect);
+        }
+        return R.data(new TreeMap<>(map));
+    }
 
 
 /*	@Override
@@ -828,76 +838,76 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		return R.data(new TreeMap<>(map));
 	}*/
 
-	@Override
-	public R getMainIdByPerson(Long id) {
-		List<ImsDutyMainVO> list = new ArrayList<>();
-		ImsDutyMainEntity imsDutyMainEntity = this.baseMapper.selectById(id);
-		String ids = imsDutyMainEntity.getDutyPersonIds();
-		if (StringUtil.isBlank(ids)) {
-			return R.data("");
-		}
-		String[] split = ids.split("\\^");
-		if (null != split && split.length > 0) {
-			for (String s : split) {
-				ImsDutyMainVO vo = new ImsDutyMainVO();
-				User user = UserCache.getUser(Long.valueOf(s));
-				if (ObjectUtil.isNotEmpty(user)) {
-					vo.setUserId(s);
-					if (ObjectUtil.isNotEmpty(user)) {
-						vo.setUserName(user.getName());
-					}
-					vo.setId(id);
-					list.add(vo);
-				}
-			}
-		}
-
-		return R.data(list);
-	}
-
-	@Override
-	public R getMainIdByPersonV2(Long id) {
-		List<ImsDutyMainVO> list = new ArrayList<>();
-		ImsDutyMainEntity imsDutyMainEntity = this.baseMapper.selectById(id);
-		if (ObjectUtils.isEmpty(imsDutyMainEntity) || StringUtil.isBlank(imsDutyMainEntity.getDutyPersonIds())) {
-			return R.data("");
-		}
-		String ids = imsDutyMainEntity.getDutyPersonIds();
-		String[] split = ids.split("\\^");
-		if (null != split && split.length > 0) {
-			for (String s : split) {
-				ImsDutyMainVO vo = new ImsDutyMainVO();
-				User user = UserCache.getUser(Long.valueOf(s));
-				if (ObjectUtil.isNotEmpty(user)) {
-					vo.setUserId(s);
-					if (ObjectUtil.isNotEmpty(user)) {
-						vo.setUserName(user.getName());
-					}
-					vo.setId(id);
-					list.add(vo);
-				}
-			}
-		}
-		Long managerId;
-		if (null != (imsDutyMainEntity.getDutyGroupId())) {
-			ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsDutyMainEntity.getDutyGroupId());
-			managerId = imsDutyGroupEntity.getManagerId();
-
-		} else {
-			ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-				eq(ImsDutyMainPersonEntity::getDutyMainId, imsDutyMainEntity.getId());
-				last("limit 1;");
-			}});
-			managerId = imsDutyMainPersonEntity.getDutyChargePerson();
-		}
-		list = list.stream().map(s -> {
-			if (s.getUserId().equals(managerId.toString())) {
-				s.setUserName(s.getUserName() + "(值班组组长)");
-			}
-			return s;
-		}).collect(Collectors.toList());
-		return R.data(list);
-	}
+    @Override
+    public R getMainIdByPerson(Long id) {
+        List<ImsDutyMainVO> list = new ArrayList<>();
+        ImsDutyMainEntity imsDutyMainEntity = this.baseMapper.selectById(id);
+        String ids = imsDutyMainEntity.getDutyPersonIds();
+        if (StringUtil.isBlank(ids)) {
+            return R.data("");
+        }
+        String[] split = ids.split("\\^");
+        if (null != split && split.length > 0) {
+            for (String s : split) {
+                ImsDutyMainVO vo = new ImsDutyMainVO();
+                User user = UserCache.getUser(Long.valueOf(s));
+                if (ObjectUtil.isNotEmpty(user)) {
+                    vo.setUserId(s);
+                    if (ObjectUtil.isNotEmpty(user)) {
+                        vo.setUserName(user.getName());
+                    }
+                    vo.setId(id);
+                    list.add(vo);
+                }
+            }
+        }
+
+        return R.data(list);
+    }
+
+    @Override
+    public R getMainIdByPersonV2(Long id) {
+        List<ImsDutyMainVO> list = new ArrayList<>();
+        ImsDutyMainEntity imsDutyMainEntity = this.baseMapper.selectById(id);
+        if (ObjectUtils.isEmpty(imsDutyMainEntity) || StringUtil.isBlank(imsDutyMainEntity.getDutyPersonIds())) {
+            return R.data("");
+        }
+        String ids = imsDutyMainEntity.getDutyPersonIds();
+        String[] split = ids.split("\\^");
+        if (null != split && split.length > 0) {
+            for (String s : split) {
+                ImsDutyMainVO vo = new ImsDutyMainVO();
+                R<User> user = userClient.userInfoById(Long.valueOf(s));
+                if (user.isSuccess() && ObjectUtil.isNotEmpty(user.getData())) {
+                    vo.setUserId(s);
+                    if (ObjectUtil.isNotEmpty(user.getData().getName())) {
+                        vo.setUserName(user.getData().getName());
+                    }
+                    vo.setId(id);
+                    list.add(vo);
+                }
+            }
+        }
+        Long managerId;
+        if (null != (imsDutyMainEntity.getDutyGroupId())) {
+            ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsDutyMainEntity.getDutyGroupId());
+            managerId = imsDutyGroupEntity.getManagerId();
+
+        } else {
+            ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                eq(ImsDutyMainPersonEntity::getDutyMainId, imsDutyMainEntity.getId());
+                last("limit 1;");
+            }});
+            managerId = imsDutyMainPersonEntity.getDutyChargePerson();
+        }
+        list = list.stream().map(s -> {
+            if (managerId.toString().equals(s.getUserId())) {
+                s.setUserName(s.getUserName() + "(值班组组长)");
+            }
+            return s;
+        }).collect(Collectors.toList());
+        return R.data(list);
+    }
 
 	/**
 	 * 获取当前值班班组   主页任务统计
@@ -1244,256 +1254,268 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		return R.data(imsSchedulingVo);
 	}
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public R updateDutyMainInfoVoById(ChangeDutyMainVo changeDutyMainVo) {
-		List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-			ge(ImsDutyMainEntity::getDutyDate, changeDutyMainVo.getChangeStartDate());
-			le(ImsDutyMainEntity::getDutyDate, changeDutyMainVo.getChangeEndtDate());
-			eq(ImsDutyMainEntity::getCreateDept, changeDutyMainVo.getCreateDept());
-			eq(ImsDutyMainEntity::getClassId, changeDutyMainVo.getClassId());
-		}});
-		if (CollectionUtil.isEmpty(imsDutyMainEntities)) {
-			return R.fail("暂无对应排班计划");
-		}
-		List<Long> mainIds = imsDutyMainEntities.stream().map(ImsDutyMainEntity::getId).collect(Collectors.toList());
-		List<ImsDutyMainPersonEntity> personEntityList = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-			in(ImsDutyMainPersonEntity::getDutyMainId, mainIds);
-		}});
-		if (CollectionUtil.isEmpty(personEntityList)) {
-			//如果人员计划表中，无值，需要填充对应信息(只有排班-班组，人员计划表才有可能无值)
-			//对上一个版本做兼容
-			for (ImsDutyMainEntity imsDutyMainEntity : imsDutyMainEntities) {
-				String[] dutyPersonIds = imsDutyMainEntity.getDutyPersonIds().split("\\^");
-				List<String> personIdlist = Arrays.asList(dutyPersonIds);
-				List<Long> collect = personIdlist.stream().map(s -> Long.valueOf(s)).collect(Collectors.toList());
-				ImsSchedulingVo imsSchedulingVo = new ImsSchedulingVo();
-				imsSchedulingVo.setGroupId(imsDutyMainEntity.getDutyGroupId());
-				imsSchedulingVo.setPersonType(1);
-				ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsDutyMainEntity.getDutyGroupId());
-				copyPersonByDutyMain(imsSchedulingVo, imsDutyGroupEntity.getManagerId(), imsDutyGroupEntity.getGroupName(), personEntityList, imsDutyMainEntity, collect);
-			}
-		}
-		//调出时,做是否是班组组长的判断
-		List<String> personId = changeDutyMainVo.getPersonId();
-		HashSet<String> manageIds=new HashSet<>();
-		HashSet<String> personHashSet=new HashSet<>();
-		for (ImsDutyMainEntity imsDutyMainEntity : imsDutyMainEntities) {
-			if (imsDutyMainEntity.getDutyGroupId()!=null){
-				ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsDutyMainEntity.getDutyGroupId());
-				manageIds.add(imsDutyGroupEntity.getManagerId().toString());
-			}
-			String[] dutyMainPersonIds = imsDutyMainEntity.getDutyPersonIds().split("\\^");
-			List<String> personIdlist = new ArrayList<>(Arrays.asList(dutyMainPersonIds));
-			personHashSet.addAll(personIdlist);
-		}
-		//调入调出，对人员做重复判断
-		for (String s : personId) {
-			if (1==changeDutyMainVo.getType()) {
-				if (personHashSet.contains(s)) {
-					return R.fail("不可重复值班");
-				}
-			}else {
-				if (!personHashSet.contains(s)) {
-					return R.fail("该人员暂无排班计划");
-				}
-			}
-		}
-		//值班组长无法调走
-		List<String> dutyChargePersonIds = personEntityList.stream().filter(s -> s.getDutyChargePerson()!=null)
-			.map(s -> s.getDutyChargePerson().toString()).collect(Collectors.toList());
-		manageIds.addAll(dutyChargePersonIds);
-		personId.stream().map(s -> {
-			for (String manageId : manageIds) {
-				if (s.equals(manageId)){
-					return R.fail("值班组组长无法修改排班");
-				}
-			}
-			return s;
-		});
-		List<ImsDutyMainPersonEntity> addPersonEntityList = new ArrayList<>();
-		List<ImsDutyMainEntity> updateDutyMainEntities = imsDutyMainEntities.stream().map(s -> {
-				String[] dutyMainPersonIds = s.getDutyPersonIds().split("\\^");
-				List<String> personIdlist = new ArrayList<>(Arrays.asList(dutyMainPersonIds));
-				if (1 == changeDutyMainVo.getType()) {
-					personIdlist.addAll(personId);
-				} else {
-					personIdlist.removeAll(personId);
-				}
-				String resIds = StringUtils.join(personIdlist, "^");
-				s.setDutyPersonIds(resIds);
-				//如果是班组排班，调班之后，则需要转换为灵活排班，加上排班名字
-				if (s.getDutyGroupId() != null) {
-					s.setDutyGroupId(null);
-				}
-				return s;
-			}).collect(Collectors.toList());
-		//之前原有的排版-人员表，需要修改的部分
-		List<ImsDutyMainPersonEntity> updatePersonEntityList= personEntityList.stream().map(sig -> {
-			if (sig.getDutyGroupId() != null) {
-				ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(sig.getDutyGroupId());
-				sig.setDutyGroupName(imsDutyGroupEntity.getGroupName());
-				sig.setDutyGroupId(null);
-			}
-			long id = IdWorker.getId(sig);
-			sig.setId(id);
-			return sig;
-		}).collect(Collectors.toList());
-		//如果是添加，填充对应人员的排版人员表
-		if(1 == changeDutyMainVo.getType()) {
-			for (String addId : personId) {
-				for (Long mainId : mainIds) {
-					//copy修改后的数据，
-					List<ImsDutyMainPersonEntity> collect = updatePersonEntityList.stream().filter(s -> mainId.equals(s.getDutyMainId())).collect(Collectors.toList());
-					ImsDutyMainPersonEntity imsDutyMainPersonEntity=collect.get(0);
-					ImsDutyMainPersonEntity addEntity = new ImsDutyMainPersonEntity();
-					BeanUtil.copy(imsDutyMainPersonEntity, addEntity);
-					addEntity.setDutyPerson(Long.valueOf(addId));
-					long id1 = IdWorker.getId(imsDutyMainPersonEntity);
-					addEntity.setId(id1);
-					addPersonEntityList.add(addEntity);
-				}
-			}
-			updatePersonEntityList.addAll(addPersonEntityList);
-		}
-		if (2 == changeDutyMainVo.getType()) {
-			for (String s : personId) {
-				updatePersonEntityList=updatePersonEntityList.stream().filter(
-						sig -> !sig.getDutyPerson().equals(s))
-					.collect(Collectors.toList());
-			}
-		}
-		//更新排班-班组表，删除排班人员表，再添加排班班组人员表
-		this.updateBatchById(updateDutyMainEntities);
-		List<Long> list = personEntityList.stream().map(s -> Long.valueOf(s.getId())).collect(Collectors.toList());
-		iImsDutyMainPersonService.deleteLogic(list);
-		iImsDutyMainPersonService.saveBatch(updatePersonEntityList);
-		return R.success("修改成功");
-		}
-
-	@Override
-	public List<ImsDutyMainReportExcel> getExcelDutyData(Integer year, Integer month, Long deptId) {
-		List<ImsDutyMainReportExcel> dutyMainReportExcelList = new ArrayList<>();
-		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-
-		String yearAndMonth = "";
-
-		if (month < 10) {
-			yearAndMonth = year + "-0" + month;
-		} else {
-			yearAndMonth = year + "-" + month;
-		}
-
-		// 获取部门所有班次
-		LambdaQueryWrapper<ImsDutyClassEntity> classWrapper = new LambdaQueryWrapper();
-		classWrapper.eq(ImsDutyClassEntity::getCreateDept, deptId);
-		List<ImsDutyClassEntity> deptDutyClassList = iImsDutyClassService.list(classWrapper);
-		Map<Long, ImsDutyClassEntity> deptDutyClassMap = deptDutyClassList.stream().collect(Collectors.toMap(ImsDutyClassEntity::getId, Function.identity()));
-
-		// 获取部门的所有组员
-		List<User> allUserList = userClient.userList("200000",deptId).getData();
-		Map<Long, String> deptUserMap = allUserList.stream().collect(Collectors.toMap(User::getId, User::getName));
-
-		LambdaQueryWrapper<ImsDutyMainEntity> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(ImsDutyMainEntity::getCreateDept, deptId);
-		wrapper.like(ImsDutyMainEntity::getDutyDate, yearAndMonth);
-		// 获取部门一个月的排班
-		List<ImsDutyMainEntity> dutyMainList = this.baseMapper.selectList(wrapper);
-
-		// 获取部门所有分组
-		LambdaQueryWrapper<ImsDutyGroupEntity> groupWrapper = new LambdaQueryWrapper();
-		groupWrapper.eq(ImsDutyGroupEntity::getCreateDept, deptId);
-		List<ImsDutyGroupEntity> deptDutyGroupList = dutyGroupMapper.selectList(groupWrapper);
-		Map<Long, ImsDutyGroupEntity> deptDutyGroupMap = deptDutyGroupList.stream().collect(Collectors.toMap(ImsDutyGroupEntity::getId, Function.identity()));
-
-		// 获取部门所有没有分组的组员
-		LambdaQueryWrapper<ImsDutyMainPersonEntity> personWrapper = new LambdaQueryWrapper();
-		personWrapper.eq(ImsDutyMainPersonEntity::getCreateDept, deptId);
-		personWrapper.like(ImsDutyMainPersonEntity::getDutyDate, yearAndMonth);
-		List<ImsDutyMainPersonEntity> deptPersonList = imsDutyMainPersonMapper.selectList(personWrapper);
-
-		// 获取本月天数
-		int days = getDaysByYearMonth(year, month);
-		for (int i = 1; i <= days; i++) {
-			String dateStr = getDate(year, month, i);
-
-			List<User> restUserList = userClient.userList("200000",deptId).getData();
-
-			// 获取一天的排班
-			List<ImsDutyMainEntity> dutyMainDayList = dutyMainList.stream().filter(var -> dateFormat.format(var.getDutyDate()).equals(dateStr)).collect(Collectors.toList());
-
-			// 循环获取当前日期每个班次组员id
-			for (ImsDutyMainEntity imsDutyMainEntity : dutyMainDayList) {
-				ImsDutyMainReportExcel reportExcel = new ImsDutyMainReportExcel();
-
-				ImsDutyClassEntity imsDutyClass = deptDutyClassMap.get(imsDutyMainEntity.getClassId());
-				if (Func.isEmpty(imsDutyClass)) {
-					continue;
-				}
-				reportExcel.setDutyDate(dateStr);
-				reportExcel.setClassName(imsDutyClass.getClassName() + "(" + imsDutyClass.getStartTime() + " - " + imsDutyClass.getEndTime() + ")");
-
-				List<Long> personIds;
-				String managerName;
-				if (Func.isNotEmpty(imsDutyMainEntity.getDutyGroupId())) {
-					// 存在分组id需要从分组中获取组长和组员
-					LambdaQueryWrapper<ImsDutyGroupPEntity> groupPWrapper = new LambdaQueryWrapper();
-					groupPWrapper.eq(ImsDutyGroupPEntity::getGroupId, imsDutyMainEntity.getDutyGroupId());
-					List<ImsDutyGroupPEntity> list = imsDutyGroupPService.list(groupPWrapper);
-
-					managerName = deptUserMap.get(deptDutyGroupMap.get(imsDutyMainEntity.getDutyGroupId()).getManagerId());
-					personIds = list.stream()
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R updateDutyMainInfoVoById(ChangeDutyMainVo changeDutyMainVo) {
+        List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+            ge(ImsDutyMainEntity::getDutyDate, changeDutyMainVo.getChangeStartDate());
+            le(ImsDutyMainEntity::getDutyDate, changeDutyMainVo.getChangeEndtDate());
+            eq(ImsDutyMainEntity::getCreateDept, changeDutyMainVo.getCreateDept());
+            eq(ImsDutyMainEntity::getClassId, changeDutyMainVo.getClassId());
+        }});
+        if (CollectionUtil.isEmpty(imsDutyMainEntities)) {
+            return R.fail("暂无对应排班计划");
+        }
+        List<Long> mainIds = imsDutyMainEntities.stream().map(ImsDutyMainEntity::getId).collect(Collectors.toList());
+        List<ImsDutyMainPersonEntity> personEntityList = imsDutyMainPersonMapper.selectList(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+            in(ImsDutyMainPersonEntity::getDutyMainId, mainIds);
+        }});
+        List<Long> list = personEntityList.stream().map(s -> Long.valueOf(s.getId())).collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(personEntityList)) {
+            //如果人员计划表中，无值，需要填充对应信息(只有排班-班组，人员计划表才有可能无值)
+            //对上一个版本做兼容
+            for (ImsDutyMainEntity imsDutyMainEntity : imsDutyMainEntities) {
+                String[] dutyPersonIds = imsDutyMainEntity.getDutyPersonIds().split("\\^");
+                List<String> personIdlist = Arrays.asList(dutyPersonIds);
+                List<Long> collect = personIdlist.stream().map(s -> Long.valueOf(s)).collect(Collectors.toList());
+                ImsSchedulingVo imsSchedulingVo = new ImsSchedulingVo();
+                imsSchedulingVo.setGroupId(imsDutyMainEntity.getDutyGroupId());
+                imsSchedulingVo.setPersonType(1);
+                ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsDutyMainEntity.getDutyGroupId());
+                copyPersonByDutyMain(imsSchedulingVo, imsDutyGroupEntity.getManagerId(), imsDutyGroupEntity.getGroupName(), personEntityList, imsDutyMainEntity, collect);
+            }
+        }
+        //调出时,做是否是班组组长的判断
+        List<String> personId = changeDutyMainVo.getPersonId();
+        HashSet<String> manageIds = new HashSet<>();
+        HashSet<String> personHashSet = new HashSet<>();
+        for (ImsDutyMainEntity imsDutyMainEntity : imsDutyMainEntities) {
+            if (imsDutyMainEntity.getDutyGroupId() != null) {
+                ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(imsDutyMainEntity.getDutyGroupId());
+                manageIds.add(imsDutyGroupEntity.getManagerId().toString());
+            }
+            String[] dutyMainPersonIds = imsDutyMainEntity.getDutyPersonIds().split("\\^");
+            List<String> personIdlist = new ArrayList<>(Arrays.asList(dutyMainPersonIds));
+            personHashSet.addAll(personIdlist);
+        }
+        //调入调出，对人员做重复判断
+        for (String s : personId) {
+            if (1 == changeDutyMainVo.getType()) {
+                if (personHashSet.contains(s)) {
+                    return R.fail("不可重复值班");
+                }
+            } else {
+                if (!personHashSet.contains(s)) {
+                    return R.fail("该人员暂无排班计划");
+                }
+            }
+        }
+        //值班组长无法调走
+        List<String> dutyChargePersonIds = personEntityList.stream().filter(s -> s.getDutyChargePerson() != null)
+                .map(s -> s.getDutyChargePerson().toString()).collect(Collectors.toList());
+        manageIds.addAll(dutyChargePersonIds);
+        for (String s : personId) {
+            if (manageIds.contains(s)) {
+                return R.fail("值班组组长无法修改排班");
+            }
+        }
+//		personId.stream().map(s -> {
+//			for (String manageId : manageIds) {
+//				if (s.equals(manageId)){
+//					return R.fail("值班组组长无法修改排班");
+//				}
+//			}
+//			return s;
+//		});
+
+        //之前原有的排版-人员表，需要修改的部分
+        List<ImsDutyMainPersonEntity> updatePersonEntityList = personEntityList.stream().map(sig -> {
+            //如果是班组排班，灵活调动后，对应的班组名称保留，但是不再有groupId
+            List<Long> collect = imsDutyMainEntities.stream().filter(s -> s.getId().equals(sig.getDutyMainId())).map(s -> s.getDutyGroupId()).collect(Collectors.toList());
+            if (Func.isNotEmpty(collect)) {
+                ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(collect.get(0));
+                if (ObjectUtil.isNotEmpty(imsDutyGroupEntity)) {
+                    sig.setDutyGroupName(imsDutyGroupEntity.getGroupName());
+                    sig.setDutyGroupId(null);
+                }
+            }
+            long id = IdWorker.getId(sig);
+            sig.setId(id);
+            return sig;
+        }).collect(Collectors.toList());
+        List<ImsDutyMainPersonEntity> addPersonEntityList = new ArrayList<>();
+        List<ImsDutyMainEntity> updateDutyMainEntities = imsDutyMainEntities.stream().map(s -> {
+            String[] dutyMainPersonIds = s.getDutyPersonIds().split("\\^");
+            List<String> personIdlist = new ArrayList<>(Arrays.asList(dutyMainPersonIds));
+            if (1 == changeDutyMainVo.getType()) {
+                personIdlist.addAll(personId);
+            } else {
+                personIdlist.removeAll(personId);
+            }
+            String resIds = StringUtils.join(personIdlist, "^");
+            s.setDutyPersonIds(resIds);
+            //如果是班组排班，调班之后，则需要转换为灵活排班，加上排班名字
+            if (s.getDutyGroupId() != null) {
+                s.setDutyGroupId(null);
+            }
+            return s;
+        }).collect(Collectors.toList());
+        //如果是添加，填充对应人员排版表
+        if (1 == changeDutyMainVo.getType()) {
+            for (String addId : personId) {
+                for (Long mainId : mainIds) {
+                    //copy修改后的数据，
+                    List<ImsDutyMainPersonEntity> collect = updatePersonEntityList.stream().filter(s -> mainId.equals(s.getDutyMainId())).collect(Collectors.toList());
+                    ImsDutyMainPersonEntity imsDutyMainPersonEntity = collect.get(0);
+                    ImsDutyMainPersonEntity addEntity = new ImsDutyMainPersonEntity();
+                    BeanUtil.copy(imsDutyMainPersonEntity, addEntity);
+                    addEntity.setDutyPerson(Long.valueOf(addId));
+                    long id1 = IdWorker.getId(imsDutyMainPersonEntity);
+                    addEntity.setId(id1);
+                    addPersonEntityList.add(addEntity);
+                }
+            }
+            updatePersonEntityList.addAll(addPersonEntityList);
+        }
+        if (2 == changeDutyMainVo.getType()) {
+            for (String s : personId) {
+                updatePersonEntityList = updatePersonEntityList.stream().filter(
+                                sig -> !sig.getDutyPerson().equals(s))
+                        .collect(Collectors.toList());
+            }
+        }
+        //更新排班-班组表，删除排班人员表，再添加排班班组人员表
+        List<Long> updateDutyMainIds = updateDutyMainEntities.stream().map(s -> Long.valueOf(s.getId())).collect(Collectors.toList());
+        this.baseMapper.deleteByUserId(updateDutyMainIds);
+        this.saveBatch(updateDutyMainEntities);
+        iImsDutyMainPersonService.deleteLogic(list);
+        iImsDutyMainPersonService.saveBatch(updatePersonEntityList);
+        return R.success("修改成功");
+    }
+
+    @Override
+    public List<ImsDutyMainReportExcel> getExcelDutyData(Integer year, Integer month, Long deptId) {
+        List<ImsDutyMainReportExcel> dutyMainReportExcelList = new ArrayList<>();
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+        String yearAndMonth = "";
+
+        if (month < 10) {
+            yearAndMonth = year + "-0" + month;
+        } else {
+            yearAndMonth = year + "-" + month;
+        }
+
+        // 获取部门所有班次
+        LambdaQueryWrapper<ImsDutyClassEntity> classWrapper = new LambdaQueryWrapper();
+        classWrapper.eq(ImsDutyClassEntity::getCreateDept, deptId);
+        List<ImsDutyClassEntity> deptDutyClassList = iImsDutyClassService.list(classWrapper);
+        Map<Long, ImsDutyClassEntity> deptDutyClassMap = deptDutyClassList.stream().collect(Collectors.toMap(ImsDutyClassEntity::getId, Function.identity()));
+
+        // 获取部门的所有组员
+        List<User> allUserList = userClient.userList("200000", deptId).getData();
+        Map<Long, String> deptUserMap = allUserList.stream().collect(Collectors.toMap(User::getId, User::getName));
+
+        LambdaQueryWrapper<ImsDutyMainEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ImsDutyMainEntity::getCreateDept, deptId);
+        wrapper.like(ImsDutyMainEntity::getDutyDate, yearAndMonth);
+        // 获取部门一个月的排班
+        List<ImsDutyMainEntity> dutyMainList = this.baseMapper.selectList(wrapper);
+
+        // 获取部门所有分组
+        LambdaQueryWrapper<ImsDutyGroupEntity> groupWrapper = new LambdaQueryWrapper();
+        groupWrapper.eq(ImsDutyGroupEntity::getCreateDept, deptId);
+        List<ImsDutyGroupEntity> deptDutyGroupList = dutyGroupMapper.selectList(groupWrapper);
+        Map<Long, ImsDutyGroupEntity> deptDutyGroupMap = deptDutyGroupList.stream().collect(Collectors.toMap(ImsDutyGroupEntity::getId, Function.identity()));
+
+        // 获取部门所有没有分组的组员
+        LambdaQueryWrapper<ImsDutyMainPersonEntity> personWrapper = new LambdaQueryWrapper();
+        personWrapper.eq(ImsDutyMainPersonEntity::getCreateDept, deptId);
+        personWrapper.like(ImsDutyMainPersonEntity::getDutyDate, yearAndMonth);
+        List<ImsDutyMainPersonEntity> deptPersonList = imsDutyMainPersonMapper.selectList(personWrapper);
+
+        // 获取本月天数
+        int days = getDaysByYearMonth(year, month);
+        for (int i = 1; i <= days; i++) {
+            String dateStr = getDate(year, month, i);
+
+            List<User> restUserList = userClient.userList("200000", deptId).getData();
+
+            // 获取一天的排班
+            List<ImsDutyMainEntity> dutyMainDayList = dutyMainList.stream().filter(var -> dateFormat.format(var.getDutyDate()).equals(dateStr)).collect(Collectors.toList());
+
+            // 循环获取当前日期每个班次组员id
+            for (ImsDutyMainEntity imsDutyMainEntity : dutyMainDayList) {
+                ImsDutyMainReportExcel reportExcel = new ImsDutyMainReportExcel();
+
+                ImsDutyClassEntity imsDutyClass = deptDutyClassMap.get(imsDutyMainEntity.getClassId());
+                if (Func.isEmpty(imsDutyClass)) {
+                    continue;
+                }
+                reportExcel.setDutyDate(dateStr);
+                reportExcel.setClassName(imsDutyClass.getClassName() + "(" + imsDutyClass.getStartTime() + " - " + imsDutyClass.getEndTime() + ")");
+
+                List<Long> personIds;
+                String managerName;
+                if (Func.isNotEmpty(imsDutyMainEntity.getDutyGroupId())) {
+                    // 存在分组id需要从分组中获取组长和组员
+                    LambdaQueryWrapper<ImsDutyGroupPEntity> groupPWrapper = new LambdaQueryWrapper();
+                    groupPWrapper.eq(ImsDutyGroupPEntity::getGroupId, imsDutyMainEntity.getDutyGroupId());
+                    List<ImsDutyGroupPEntity> list = imsDutyGroupPService.list(groupPWrapper);
+
+                    managerName = deptUserMap.get(deptDutyGroupMap.get(imsDutyMainEntity.getDutyGroupId()).getManagerId());
+                    personIds = list.stream()
 //							过滤出组长
-							.filter(s->!s.getPersonId().equals(deptDutyGroupMap.get(imsDutyMainEntity.getDutyGroupId()).getManagerId()))
-							.map(ImsDutyGroupPEntity::getPersonId).collect(Collectors.toList());
-				} else {
-					// 不存在分组id从排班人员中获取组长和组员
-					List<ImsDutyMainPersonEntity> personList = deptPersonList.stream().filter(var -> var.getDutyMainId().equals(imsDutyMainEntity.getId())).collect(Collectors.toList());
-					managerName = deptUserMap.get(personList.get(0).getDutyChargePerson());
-					personIds = personList.stream().filter(s->!s.getDutyPerson().equals(personList.get(0).getDutyChargePerson())).map(ImsDutyMainPersonEntity::getDutyPerson).collect(Collectors.toList());
-				}
-
-				String personNames = "";
-				// 获取排班组员名称
-				for (int j = 0; j < personIds.size(); j++) {
-					Long userId = personIds.get(j);
-					String userName = deptUserMap.get(userId);
-					// 把排班的组员从休息名单中移除
-					restUserList.removeIf(user -> user.getId().equals(userId));
-					if (ObjectUtil.isNotEmpty(userName)) {
-						if (j == personIds.size() - 1) {
-							personNames += userName;
-						} else {
-							personNames += userName + "、";
-						}
-					}
-				}
-				reportExcel.setManagerName(managerName);
-				reportExcel.setPersonNames(personNames);
-				dutyMainReportExcelList.add(reportExcel);
-			}
-			// 剩下组员都休息，添加休息排班
-			ImsDutyMainReportExcel restReportExcel = new ImsDutyMainReportExcel();
-			restReportExcel.setDutyDate(dateStr);
-			restReportExcel.setClassName("休息");
-			restReportExcel.setManagerName("无班组长");
-			String personNames = "";
-			// 获取休息组员的名称
-			for (int j = 0; j < restUserList.size(); j++) {
-				User user = restUserList.get(j);
-				if (ObjectUtil.isNotEmpty(user)) {
-					if (j == restUserList.size() - 1) {
-						personNames += user.getName();
-					} else {
-						personNames += user.getName() + "、";
-					}
-				}
-			}
-			restReportExcel.setPersonNames(personNames);
-			dutyMainReportExcelList.add(restReportExcel);
-		}
-		return dutyMainReportExcelList;
-	}
+                            .filter(s -> !s.getPersonId().equals(deptDutyGroupMap.get(imsDutyMainEntity.getDutyGroupId()).getManagerId()))
+                            .map(ImsDutyGroupPEntity::getPersonId).collect(Collectors.toList());
+                } else {
+                    // 不存在分组id从排班人员中获取组长和组员
+                    List<ImsDutyMainPersonEntity> personList = deptPersonList.stream().filter(var -> var.getDutyMainId().equals(imsDutyMainEntity.getId())).collect(Collectors.toList());
+                    managerName = deptUserMap.get(personList.get(0).getDutyChargePerson());
+                    personIds = personList.stream().filter(s -> !s.getDutyPerson().equals(personList.get(0).getDutyChargePerson())).map(ImsDutyMainPersonEntity::getDutyPerson).collect(Collectors.toList());
+                }
+
+                String personNames = "";
+                // 获取排班组员名称
+                for (int j = 0; j < personIds.size(); j++) {
+                    Long userId = personIds.get(j);
+                    String userName = deptUserMap.get(userId);
+                    // 把排班的组员从休息名单中移除
+                    restUserList.removeIf(user -> user.getId().equals(userId));
+                    if (ObjectUtil.isNotEmpty(userName)) {
+                        if (j == personIds.size() - 1) {
+                            personNames += userName;
+                        } else {
+                            personNames += userName + "、";
+                        }
+                    }
+                }
+                reportExcel.setManagerName(managerName);
+                reportExcel.setPersonNames(personNames);
+                dutyMainReportExcelList.add(reportExcel);
+            }
+            // 剩下组员都休息，添加休息排班
+            ImsDutyMainReportExcel restReportExcel = new ImsDutyMainReportExcel();
+            restReportExcel.setDutyDate(dateStr);
+            restReportExcel.setClassName("休息");
+            restReportExcel.setManagerName("无班组长");
+            String personNames = "";
+            // 获取休息组员的名称
+            for (int j = 0; j < restUserList.size(); j++) {
+                User user = restUserList.get(j);
+                if (ObjectUtil.isNotEmpty(user)) {
+                    if (j == restUserList.size() - 1) {
+                        personNames += user.getName();
+                    } else {
+                        personNames += user.getName() + "、";
+                    }
+                }
+            }
+            restReportExcel.setPersonNames(personNames);
+            dutyMainReportExcelList.add(restReportExcel);
+        }
+        return dutyMainReportExcelList;
+    }
 
 
 	/**
@@ -1566,254 +1588,254 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 	}
 
 
-	private AuditVo getUser(Long personId) {
-		User user = UserCache.getUser(personId);
-		if (ObjectUtil.isNotEmpty(user)) {
-			AuditVo auditVo = new AuditVo();
-			auditVo.setPersonId(personId);
-			auditVo.setPersonName(user.getName());
-			auditVo.setPhone(user.getPhone());
-			return auditVo;
-		}
-		return null;
-	}
-
-
-	private R cycleSchedulingTow(ImsSchedulingVo imsSchedulingVo) {
-		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 (!imsSchedulingVo.getStartDate().equals(date2)) {
-			String deptId = AuthUtil.getDeptId();
-			if (null != imsSchedulingVo.getCreateDept()) {
-				deptId = imsSchedulingVo.getCreateDept().toString();
-			}
-			String minusOnedDay = DateUtils.dayStringDate(imsSchedulingVo.getStartDate(), 1, false);
-			List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, Long.valueOf(deptId));
-			if (CollectionUtil.isEmpty(imsDutyMainEntities)) {
-				return R.fail("所选日期之前存在未排班情况，请重新选择日期区间!");
-			}
-		}
-
-		String[] start = imsSchedulingVo.getStartDate().split("-");
-		String[] end = imsSchedulingVo.getEndDate().split("-");
-		//日期
-		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 (imsSchedulingVo.isCompose() == false) {
-			List<ImsDutyMainEntity> imsDutyMainEntities2 = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-				le(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getEndDate());
-				eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-				ge(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getStartDate());
-			}});
-			if (CollectionUtil.isNotEmpty(imsDutyMainEntities2)) {
-				return R.data(1);
-			}
-		}
-
-		if (imsSchedulingVo.getTemplate()) {
-			if (!doSaveTemplate(imsSchedulingVo)) {
-				return R.fail("模版名称已存在");
-			}
-		}
-
-		String[] dutyArrIds = imsSchedulingVo.getDutyArrIds();
-		if (CollectionUtil.isNotEmpty(dates)) {
-			this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-				eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-				in(ImsDutyMainEntity::getDutyDate, dates);
-			}});
-		}
-		String subDayDate = DateUtils.dayDate(DateUtil.parse(imsSchedulingVo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE);
-
-		ImsDutyMainEntity imsDutyMainEntity1 = this.getOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
-			eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
-			eq(ImsDutyMainEntity::getDutyDate, subDayDate);
-			ne(ImsDutyMainEntity::getStatus, "-1");
-			orderByDesc(ImsDutyMainEntity::getId).last(" LIMIT 1");
-		}});
-
-		//查询所有班组人员
-		List<ImsDutyGroupPEntity> list = imsDutyGroupPService.list();
-
-
-		List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
-		String proDutyMainId = "";
-		//排班
-		for (int i = 1; i <= dates.size(); i++) {
-			String date = dates.get(i - 1);
-			for (int j = 1; j <= dutyArrIds.length; j++) {
-				String classId = dutyArrIds[j - 1];
-				//按值班周期的天数取模
-				int temp = i % imsSchedulingVo.getDutyNum();
-				//值班下标
-				int tempSub = temp - 1;
-				//如果整除，取最后一个值班
-				if (temp == 0) {
-					tempSub = imsSchedulingVo.getDutyNum() - 1;
-				}
-				//获取对应班组的值班班次
-				String groupId = imsSchedulingVo.getDutyOrderIds().get(classId)[tempSub];
-				//人员IDS
-				String personIds = "";
-				if ("0".equals(classId)) {
-					String[] split = groupId.split(",");
-					if (ObjectUtil.isNotEmpty(split)) {
-						for (String dutyGroupId : split) {
-							List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
-							if (CollectionUtil.isNotEmpty(collectPerson)) {
-								personIds = StringUtils.join(collectPerson, "^");
-							}
-							if (StringUtil.isNotBlank(dutyGroupId)) {
-								ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
-								setMainEntity(imsDutyMainEntity, classId, Long.valueOf(dutyGroupId), date);
-								imsDutyMainEntity.setStatus(-1);
-								imsDutyMainEntity.setDutyPersonIds(personIds);
-								imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
-								Long id = IdWorker.getId();
-								imsDutyMainEntity.setId(id);
-								imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
-								imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
-								imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
-								imsDutyMainEntityList.add(imsDutyMainEntity);
-							}
-						}
-					}
-				} else {
-					List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
-					if (CollectionUtil.isNotEmpty(collectPerson)) {
-						personIds = StringUtils.join(collectPerson, "^");
-					}
-					if (Func.isBlank(personIds)) {
-						return R.fail("班组存在人员为空，禁止排班!");
-					}
-
-					ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
-					setMainEntity(imsDutyMainEntity, classId, Long.valueOf(groupId), date);
-					if (Func.isBlank(proDutyMainId)) {
-						if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
-							proDutyMainId = imsDutyMainEntity1.getId().toString();
-						}
-
-					}
-					if (StringUtil.isNotBlank(proDutyMainId)) {
-						imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
-					}
-
-					if (StringUtil.isNotBlank(personIds)) {
-						imsDutyMainEntity.setDutyPersonIds(personIds);
-					}
-					imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
-					Long id = IdWorker.getId(imsDutyMainEntity);
-					imsDutyMainEntity.setId(id);
-					imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
-					imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
-					imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
-					imsDutyMainEntityList.add(imsDutyMainEntity);
-					proDutyMainId = id == null ? "" : imsDutyMainEntity.getId().toString();
-					BeanUtils.copyProperties(imsDutyMainEntity,imsDutyMainEntity1);
-				}
-			}
-		}
-
-		ThreadTask.dutyTask(imsDutyMainEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
-		return R.success("操作成功,系统正在排班中,请稍后查看");
-	}
-
-
-	public void setMainEntity(ImsDutyMainEntity imsDutyMainEntity, String classId, Long groupId, String date) {
-		imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
-		imsDutyMainEntity.setClassId(Long.valueOf(classId));
-		imsDutyMainEntity.setDutyGroupId(groupId);
-		imsDutyMainEntity.setStatus(0);
-		imsDutyMainEntity.setCreateTime(new Date());
-	}
-
-	public void setMainEntity(ImsDutyMainEntity imsDutyMainEntity, String classId, String date) {
-		imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
-		imsDutyMainEntity.setClassId(Long.valueOf(classId));
-		imsDutyMainEntity.setStatus(0);
-		imsDutyMainEntity.setCreateTime(new Date());
-	}
-
-	/**
-	 * 根据 年、月 获取对应的月份 的 天数
-	 */
-	public static int getDaysByYearMonth(int year, int month) {
-		Calendar a = Calendar.getInstance();
-		a.set(Calendar.YEAR, year);
-		a.set(Calendar.MONTH, month - 1);
-		a.set(Calendar.DATE, 1);
-		a.roll(Calendar.DATE, -1);
-		int maxDate = a.get(Calendar.DATE);
-		return maxDate;
-	}
-
-	/**
-	 * 获取当班
-	 *
-	 * @return
-	 */
-	@Override
-	public List<DutyMainInfoVo> getDutyData(Long deptId) {
-		return getDutyDataV2(deptId);
-	}
-
-	@Override
-	public List<DutyMainInfoVo> getDutyDataV2(Long deptId) {
-		List<DutyMainInfoVo> dutyMainInfoVos = this.baseMapper.selectDutyMainInfoVoV2(deptId);
-		dutyMainInfoVos = dutyMainInfoVos.stream().map(s -> {
-			if (null == s.getDutyGroupId()) {
-				ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-					eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId());
-					last("limit 1");
-				}});
-				if(ObjectUtil.isNotEmpty(imsDutyMainPersonEntity.getDutyChargePerson())){
-					s.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
-				}
-			} else {
-				ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getDutyGroupId());
-				s.setGroupName(imsDutyGroupEntity.getGroupName());
-				s.setDutyGroupId(imsDutyGroupEntity.getId());
-				if(ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())){
-					s.setManagerId(imsDutyGroupEntity.getManagerId().toString());
-				}
-			}
-			return s;
-		}).collect(Collectors.toList());
-		return dutyMainInfoVos;
-	}
-
-	@Override
-	public DutyMainInfoVo getNextDutyData(Long parentId) {
-		return this.baseMapper.selectDutyMainInfoSign(parentId);
-	}
-
-	@Override
-	public DutyMainInfoVo getNextDutyDataV2(Long parentId) {
-		DutyMainInfoVo dutyMainInfoVo = this.baseMapper.selectDutyMainInfoSignV2(parentId);
-		if(ObjectUtil.isEmpty(dutyMainInfoVo)){
-			return new DutyMainInfoVo();
-		}
-		if (null == dutyMainInfoVo.getDutyGroupId()) {
-			ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
-				eq(ImsDutyMainPersonEntity::getDutyMainId, dutyMainInfoVo.getId());
-				last("limit 1");
-			}});
-			if(ObjectUtil.isNotEmpty(imsDutyMainPersonEntity) && ObjectUtil.isNotEmpty(imsDutyMainPersonEntity.getDutyChargePerson())){
-				dutyMainInfoVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
-			}
-		} else {
-			ImsDutyGroupEntity  imsDutyGroupEntity = dutyGroupMapper.selectById(dutyMainInfoVo.getDutyGroupId());
-			dutyMainInfoVo.setGroupName(imsDutyGroupEntity.getGroupName());
-			dutyMainInfoVo.setDutyGroupId(imsDutyGroupEntity.getId());
-			if(ObjectUtil.isNotEmpty(imsDutyGroupEntity) && ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())){
-				dutyMainInfoVo.setManagerId(imsDutyGroupEntity.getManagerId().toString());
-			}
-		}
-		return dutyMainInfoVo;
-	}
+    private AuditVo getUser(Long personId) {
+        User user = UserCache.getUser(personId);
+        if (ObjectUtil.isNotEmpty(user)) {
+            AuditVo auditVo = new AuditVo();
+            auditVo.setPersonId(personId);
+            auditVo.setPersonName(user.getName());
+            auditVo.setPhone(user.getPhone());
+            return auditVo;
+        }
+        return null;
+    }
+
+
+    private R cycleSchedulingTow(ImsSchedulingVo imsSchedulingVo) {
+        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 (!imsSchedulingVo.getStartDate().equals(date2)) {
+            String deptId = AuthUtil.getDeptId();
+            if (null != imsSchedulingVo.getCreateDept()) {
+                deptId = imsSchedulingVo.getCreateDept().toString();
+            }
+            String minusOnedDay = DateUtils.dayStringDate(imsSchedulingVo.getStartDate(), 1, false);
+            List<ImsDutyMainEntity> imsDutyMainEntities = this.baseMapper.selectByDateAndDept(minusOnedDay, Long.valueOf(deptId));
+            if (CollectionUtil.isEmpty(imsDutyMainEntities)) {
+                return R.fail("所选日期之前存在未排班情况，请重新选择日期区间!");
+            }
+        }
+
+        String[] start = imsSchedulingVo.getStartDate().split("-");
+        String[] end = imsSchedulingVo.getEndDate().split("-");
+        //日期
+        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 (imsSchedulingVo.isCompose() == false) {
+            List<ImsDutyMainEntity> imsDutyMainEntities2 = this.baseMapper.selectList(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+                le(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getEndDate());
+                eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+                ge(ImsDutyMainEntity::getDutyDate, imsSchedulingVo.getStartDate());
+            }});
+            if (CollectionUtil.isNotEmpty(imsDutyMainEntities2)) {
+                return R.data(1);
+            }
+        }
+
+        if (imsSchedulingVo.getTemplate()) {
+            if (!doSaveTemplate(imsSchedulingVo)) {
+                return R.fail("模版名称已存在");
+            }
+        }
+
+        String[] dutyArrIds = imsSchedulingVo.getDutyArrIds();
+        if (CollectionUtil.isNotEmpty(dates)) {
+            this.baseMapper.delete(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+                eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+                in(ImsDutyMainEntity::getDutyDate, dates);
+            }});
+        }
+        String subDayDate = DateUtils.dayDate(DateUtil.parse(imsSchedulingVo.getStartDate(), DateUtil.PATTERN_DATE), -1, DateUtil.PATTERN_DATE);
+
+        ImsDutyMainEntity imsDutyMainEntity1 = this.getOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+            eq(ImsDutyMainEntity::getCreateDept, imsSchedulingVo.getCreateDept());
+            eq(ImsDutyMainEntity::getDutyDate, subDayDate);
+            ne(ImsDutyMainEntity::getStatus, "-1");
+            orderByDesc(ImsDutyMainEntity::getId).last(" LIMIT 1");
+        }});
+
+        //查询所有班组人员
+        List<ImsDutyGroupPEntity> list = imsDutyGroupPService.list();
+
+
+        List<ImsDutyMainEntity> imsDutyMainEntityList = new ArrayList<>();
+        String proDutyMainId = "";
+        //排班
+        for (int i = 1; i <= dates.size(); i++) {
+            String date = dates.get(i - 1);
+            for (int j = 1; j <= dutyArrIds.length; j++) {
+                String classId = dutyArrIds[j - 1];
+                //按值班周期的天数取模
+                int temp = i % imsSchedulingVo.getDutyNum();
+                //值班下标
+                int tempSub = temp - 1;
+                //如果整除，取最后一个值班
+                if (temp == 0) {
+                    tempSub = imsSchedulingVo.getDutyNum() - 1;
+                }
+                //获取对应班组的值班班次
+                String groupId = imsSchedulingVo.getDutyOrderIds().get(classId)[tempSub];
+                //人员IDS
+                String personIds = "";
+                if ("0".equals(classId)) {
+                    String[] split = groupId.split(",");
+                    if (ObjectUtil.isNotEmpty(split)) {
+                        for (String dutyGroupId : split) {
+                            List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
+                            if (CollectionUtil.isNotEmpty(collectPerson)) {
+                                personIds = StringUtils.join(collectPerson, "^");
+                            }
+                            if (StringUtil.isNotBlank(dutyGroupId)) {
+                                ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
+                                setMainEntity(imsDutyMainEntity, classId, Long.valueOf(dutyGroupId), date);
+                                imsDutyMainEntity.setStatus(-1);
+                                imsDutyMainEntity.setDutyPersonIds(personIds);
+                                imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
+                                Long id = IdWorker.getId();
+                                imsDutyMainEntity.setId(id);
+                                imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
+                                imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
+                                imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
+                                imsDutyMainEntityList.add(imsDutyMainEntity);
+                            }
+                        }
+                    }
+                } else {
+                    List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(collectPerson)) {
+                        personIds = StringUtils.join(collectPerson, "^");
+                    }
+                    if (Func.isBlank(personIds)) {
+                        return R.fail("班组存在人员为空，禁止排班!");
+                    }
+
+                    ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity();
+                    setMainEntity(imsDutyMainEntity, classId, Long.valueOf(groupId), date);
+                    if (Func.isBlank(proDutyMainId)) {
+                        if (ObjectUtil.isNotEmpty(imsDutyMainEntity1)) {
+                            proDutyMainId = imsDutyMainEntity1.getId().toString();
+                        }
+
+                    }
+                    if (StringUtil.isNotBlank(proDutyMainId)) {
+                        imsDutyMainEntity.setPreDutyId(Long.valueOf(proDutyMainId));
+                    }
+
+                    if (StringUtil.isNotBlank(personIds)) {
+                        imsDutyMainEntity.setDutyPersonIds(personIds);
+                    }
+                    imsDutyMainEntity.setCreateDept(imsSchedulingVo.getCreateDept());
+                    Long id = IdWorker.getId(imsDutyMainEntity);
+                    imsDutyMainEntity.setId(id);
+                    imsDutyMainEntity.setCreateUser(AuthUtil.getUserId());
+                    imsDutyMainEntity.setUpdateUser(AuthUtil.getUserId());
+                    imsDutyMainEntity.setTenantId(AuthUtil.getTenantId());
+                    imsDutyMainEntityList.add(imsDutyMainEntity);
+                    proDutyMainId = id == null ? "" : imsDutyMainEntity.getId().toString();
+                    BeanUtils.copyProperties(imsDutyMainEntity, imsDutyMainEntity1);
+                }
+            }
+        }
+
+        ThreadTask.dutyTask(imsDutyMainEntityList, imsSchedulingVo.getEndDate(), proDutyMainId, imsSchedulingVo.getCreateDept(), imsSchedulingVo.getDutyClassTypeId());
+        return R.success("操作成功,系统正在排班中,请稍后查看");
+    }
+
+
+    public void setMainEntity(ImsDutyMainEntity imsDutyMainEntity, String classId, Long groupId, String date) {
+        imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
+        imsDutyMainEntity.setClassId(Long.valueOf(classId));
+        imsDutyMainEntity.setDutyGroupId(groupId);
+        imsDutyMainEntity.setStatus(0);
+        imsDutyMainEntity.setCreateTime(new Date());
+    }
+
+    public void setMainEntity(ImsDutyMainEntity imsDutyMainEntity, String classId, String date) {
+        imsDutyMainEntity.setDutyDate(DateUtil.parse(date, DateUtil.PATTERN_DATE));
+        imsDutyMainEntity.setClassId(Long.valueOf(classId));
+        imsDutyMainEntity.setStatus(0);
+        imsDutyMainEntity.setCreateTime(new Date());
+    }
+
+    /**
+     * 根据 年、月 获取对应的月份 的 天数
+     */
+    public static int getDaysByYearMonth(int year, int month) {
+        Calendar a = Calendar.getInstance();
+        a.set(Calendar.YEAR, year);
+        a.set(Calendar.MONTH, month - 1);
+        a.set(Calendar.DATE, 1);
+        a.roll(Calendar.DATE, -1);
+        int maxDate = a.get(Calendar.DATE);
+        return maxDate;
+    }
+
+    /**
+     * 获取当班
+     *
+     * @return
+     */
+    @Override
+    public List<DutyMainInfoVo> getDutyData(Long deptId) {
+        return getDutyDataV2(deptId);
+    }
+
+    @Override
+    public List<DutyMainInfoVo> getDutyDataV2(Long deptId) {
+        List<DutyMainInfoVo> dutyMainInfoVos = this.baseMapper.selectDutyMainInfoVoV2(deptId);
+        dutyMainInfoVos = dutyMainInfoVos.stream().map(s -> {
+            if (null == s.getDutyGroupId()) {
+                ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                    eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId());
+                    last("limit 1");
+                }});
+                if (ObjectUtil.isNotEmpty(imsDutyMainPersonEntity.getDutyChargePerson())) {
+                    s.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
+                }
+            } else {
+                ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(s.getDutyGroupId());
+                s.setGroupName(imsDutyGroupEntity.getGroupName());
+                s.setDutyGroupId(imsDutyGroupEntity.getId());
+                if (ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())) {
+                    s.setManagerId(imsDutyGroupEntity.getManagerId().toString());
+                }
+            }
+            return s;
+        }).collect(Collectors.toList());
+        return dutyMainInfoVos;
+    }
+
+    @Override
+    public DutyMainInfoVo getNextDutyData(Long parentId) {
+        return this.baseMapper.selectDutyMainInfoSign(parentId);
+    }
+
+    @Override
+    public DutyMainInfoVo getNextDutyDataV2(Long parentId) {
+        DutyMainInfoVo dutyMainInfoVo = this.baseMapper.selectDutyMainInfoSignV2(parentId);
+        if (ObjectUtil.isEmpty(dutyMainInfoVo)) {
+            return new DutyMainInfoVo();
+        }
+        if (null == dutyMainInfoVo.getDutyGroupId()) {
+            ImsDutyMainPersonEntity imsDutyMainPersonEntity = imsDutyMainPersonMapper.selectOne(new LambdaQueryWrapper<ImsDutyMainPersonEntity>() {{
+                eq(ImsDutyMainPersonEntity::getDutyMainId, dutyMainInfoVo.getId());
+                last("limit 1");
+            }});
+            if (ObjectUtil.isNotEmpty(imsDutyMainPersonEntity) && ObjectUtil.isNotEmpty(imsDutyMainPersonEntity.getDutyChargePerson())) {
+                dutyMainInfoVo.setManagerId(imsDutyMainPersonEntity.getDutyChargePerson().toString());
+            }
+        } else {
+            ImsDutyGroupEntity imsDutyGroupEntity = dutyGroupMapper.selectById(dutyMainInfoVo.getDutyGroupId());
+            dutyMainInfoVo.setGroupName(imsDutyGroupEntity.getGroupName());
+            dutyMainInfoVo.setDutyGroupId(imsDutyGroupEntity.getId());
+            if (ObjectUtil.isNotEmpty(imsDutyGroupEntity) && ObjectUtil.isNotEmpty(imsDutyGroupEntity.getManagerId())) {
+                dutyMainInfoVo.setManagerId(imsDutyGroupEntity.getManagerId().toString());
+            }
+        }
+        return dutyMainInfoVo;
+    }
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
index 595a19d..774fc57 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
@@ -71,6 +71,7 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
     public boolean invoicing(WorkTicketInfoDto dto) {
         WorkTicketInfoEntity ticketInfoEntity = BeanUtil.copy(dto,WorkTicketInfoEntity.class);
         ticketInfoEntity.setCode(this.getTicketCode(ticketInfoEntity.getType(),ticketInfoEntity.getSignageCode()));
+        ticketInfoEntity.setStatus(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus());
         ticketInfoEntity.setFlowStatus(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus());
         ticketInfoEntity.setFlowTaskName(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getDescription());
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
@@ -105,6 +106,8 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
         LambdaUpdateWrapper<WorkTicketInfoEntity> updateWrapper = Wrappers.<WorkTicketInfoEntity>lambdaUpdate()
                 .set(WorkTicketInfoEntity::getStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_LICENSE.getStatus())
+                .set(WorkTicketInfoEntity::getFlowStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_LICENSE.getStatus())
+                .set(WorkTicketInfoEntity::getFlowTaskName, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_LICENSE.getDescription())
                 .set(WorkTicketInfoEntity::getLicensor, AuthUtil.getUserId())
                 .set(WorkTicketInfoEntity::getLicenseTime, LocalDateTime.now())
                 .set(WorkTicketInfoEntity::getLicenseEndTime, dto.getLicenseEndTime())
@@ -134,6 +137,8 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
         LambdaUpdateWrapper<WorkTicketInfoEntity> updateWrapper = Wrappers.<WorkTicketInfoEntity>lambdaUpdate()
                 .set(WorkTicketInfoEntity::getStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_END.getStatus())
+                .set(WorkTicketInfoEntity::getFlowStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_END.getStatus())
+                .set(WorkTicketInfoEntity::getFlowTaskName, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_END.getDescription())
                 .set(WorkTicketInfoEntity::getStepOperator, userName)
                 .set(WorkTicketInfoEntity::getNextStepOperator, null)
                 .eq(WorkTicketInfoEntity::getId, dto.getId());
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
index a8ce5bf..5a34661 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
@@ -983,6 +983,8 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
             User user = UserCache.getUser(workTicketInfo.getLicensor());
             workTicketInfo.setLicensorName(user == null ? null : user.getName());
         }
+        // 工作负责人名称
+        workTicketInfo.setPrincipalName(Optional.ofNullable(workTicketInfo.getPrincipalManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getPrincipalName()));
 
         // 负责值班负责人
         if (workTicketInfo.getWatchPrincipal() != null) {
@@ -1019,14 +1021,11 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
             if (workTicketInfo.getTotalPerson() == null) {
                 workTicketInfo.setTotalPerson(sb.toString().trim().split(",").length);
             }
-
-            //成员信息
-            if (workTicketInfo.getClassGroupMembersName() == null) {
-                workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ? sb.toString().substring(0, sb.length() - 1) : sb.toString());
-            }
         }
-
-
+        workTicketInfo.setClassGroupMembersName(Optional.ofNullable(workTicketInfo.getClassGroupMembersManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getClassGroupMembersName()));
+        if(Func.isNotEmpty(workTicketInfo.getClassGroupMembersManual())) {
+            workTicketInfo.setTotalPerson(workTicketInfo.getClassGroupMembersManual().split(",").length);
+        }
         //负责人名称
         if (workTicketInfo.getPrincipalName() == null && workTicketInfo.getPrincipal() != null) {
             User user = UserCache.getUser(workTicketInfo.getPrincipal());
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java
index ec27c85..9d5452a 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java
@@ -25,20 +25,16 @@ public class WorkTicketInfoWrapper extends BaseEntityWrapper<WorkTicketInfoEntit
 	@Override
 	public WorkTicketInfoVO entityVO(WorkTicketInfoEntity entity) {
 		WorkTicketInfoVO workTicketInfoVO = BeanUtil.copy(entity,WorkTicketInfoVO.class);
-		User creator = UserCache.getUser(workTicketInfoVO.getCreateUser());
-		User updater = UserCache.getUser(workTicketInfoVO.getUpdateUser());
-		workTicketInfoVO.setCreateUserName(Optional.ofNullable(creator).map(User::getName).orElse(null));
-		workTicketInfoVO.setUpdateUserName(Optional.ofNullable(updater).map(User::getName).orElse(null));
+		workTicketInfoVO.setCreateUserName(Optional.ofNullable(workTicketInfoVO.getCreateUser()).map(UserCache::getUser).map(User::getName).orElse(null));
+		workTicketInfoVO.setUpdateUserName(Optional.ofNullable(workTicketInfoVO.getUpdateUser()).map(UserCache::getUser).map(User::getName).orElse(null));
 		/*完善负责人、许可人名称*/
 		if(Func.isEmpty(workTicketInfoVO.getPrincipal())){
 			workTicketInfoVO.setPrincipalName(workTicketInfoVO.getPrincipalManual());
 		}
 		else{
-			User principal = UserCache.getUser(workTicketInfoVO.getPrincipal());
-			workTicketInfoVO.setPrincipalName(Optional.ofNullable(principal).map(User::getName).orElse(null));
+			workTicketInfoVO.setPrincipalName(Optional.ofNullable(workTicketInfoVO.getPrincipal()).map(UserCache::getUser).map(User::getName).orElse(null));
 		}
-		User licensor = UserCache.getUser(workTicketInfoVO.getLicensor());
-		workTicketInfoVO.setLicensorName(Optional.ofNullable(licensor).map(User::getName).orElse(null));
+		workTicketInfoVO.setLicensorName(Optional.ofNullable(workTicketInfoVO.getLicensor()).map(UserCache::getUser).map(User::getName).orElse(null));
 		if(Func.isNotEmpty(workTicketInfoVO.getClassGroupMembersManual())){
 			workTicketInfoVO.setClassGroupMembersName(workTicketInfoVO.getClassGroupMembersManual());
 		}