值班排班问题修复

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.common.biz.enums.ActionStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -75,7 +76,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 		// 修改操作动态表单的方法，修改人陈浩 -------------start 2021-09-28
 		Long instanceId = excuteDynamicFormInstance(dutyCarDto.getUserId(), map, this.getGroupCode());
 		saveDutyPersonShiftDetail(instanceId, dutyCarDto.getDutyShift(), dutyCarDto.getStartTime());
-		insertPersonShift(instanceId, dutyCarDto.getDutyShift());
+		insertPersonShift(instanceId, dutyCarDto.getDutyShift(), ActionStatus.METHOD_ADD.getCode());
 		// 修改操作动态表单的方法，修改人陈浩 -------------end 2021-09-28
 		// 3.返回保存后的数据
 		return dutyCarDto;
@@ -89,7 +90,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 		updateDynamicFormInstance(this.getGroupCode(), instanceId, Bean.BeantoMap(dutyCarDto));
 		// 修改操作动态表单修改的逻辑方法，陈浩 end ----2021-09-28
 		// 5.更新值班信息人日期数据
-		insertPersonShift(instanceId, dutyCarDto.getDutyShift());
+		insertPersonShift(instanceId, dutyCarDto.getDutyShift(), ActionStatus.METHOD_UPDATE.getCode());
 		return dutyCarDto;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFireFightingServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.module.common.biz.enums.ActionStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,14 +46,14 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 		Map<String, Object> map = Bean.BeantoMap(dto);
 		Long instanceId = excuteDynamicFormInstance(dto.getUserId(), map, this.getGroupCode());
 		saveDutyPersonShiftDetail(instanceId, dto.getDutyShift(), dto.getStartTime());
-		insertPersonShift(instanceId, dto.getDutyShift());
+		insertPersonShift(instanceId, dto.getDutyShift(), ActionStatus.METHOD_ADD.getCode());
 		return dto;
 	}
 
 	@Override
 	public DutyFireFightingDto update(Long instanceId, DutyFireFightingDto dto) {
 		updateDynamicFormInstance(this.getGroupCode(), instanceId, Bean.BeantoMap(dto));
-		insertPersonShift(instanceId, dto.getDutyShift());
+		insertPersonShift(instanceId, dto.getDutyShift(),ActionStatus.METHOD_UPDATE.getCode());
 		return dto;
 	}
 	public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType, String fieldCode) {