Преглед изворни кода

[bug-4357]手动申请调班,审核通过后,会自动生成一条由审核人申请的排班记录

gaozl пре 11 месеци
родитељ
комит
b6eedec181

+ 3 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/domain/StaffSchedule.java

@@ -136,7 +136,9 @@ public class StaffSchedule extends AbstractDomain<String, StaffSchedulePo>{
 						EmployeeInfoPo employeeInfoPo = employeeInfoRepository.get(staffScheduleDetailPo.getUserId());
 						EmployeeInfoPo employeeInfoPo = employeeInfoRepository.get(staffScheduleDetailPo.getUserId());
 
 
 						// 添加修改记录 即 调班申请记录
 						// 添加修改记录 即 调班申请记录
-						addAdjustRecord(newDate,oldDate,staffScheduleDetailPo.getId(),getData().getId());
+						if (BeanUtils.isNotEmpty(getData().getUpdateType()) && getData().getUpdateType().equals("排班修改")){
+							addAdjustRecord(newDate,oldDate,staffScheduleDetailPo.getId(),getData().getId());
+						}
 
 
 						for (Map<String, String> entry : newDate) {
 						for (Map<String, String> entry : newDate) {
 							String dateStr = entry.get("date");
 							String dateStr = entry.get("date");

+ 9 - 0
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/StaffSchedulePo.java

@@ -20,6 +20,7 @@ import java.util.List;
 @ApiModel(value = "排班记录表对象")
 @ApiModel(value = "排班记录表对象")
 public class StaffSchedulePo extends StaffScheduleTbl{
 public class StaffSchedulePo extends StaffScheduleTbl{
 	private boolean delBeforeSave = true;
 	private boolean delBeforeSave = true;
+	private String updateType;
 	public boolean isDelBeforeSave() {
 	public boolean isDelBeforeSave() {
 		return delBeforeSave;
 		return delBeforeSave;
 	}
 	}
@@ -35,6 +36,14 @@ public class StaffSchedulePo extends StaffScheduleTbl{
 		this.staffScheduleDetailPoList = staffScheduleDetailPoList;
 		this.staffScheduleDetailPoList = staffScheduleDetailPoList;
 	}
 	}
 
 
+	public String getUpdateType() {
+		return updateType;
+	}
+
+	public void setUpdateType(String updateType) {
+		this.updateType = updateType;
+	}
+
 	public static StaffSchedulePo fromJsonString(String data){
 	public static StaffSchedulePo fromJsonString(String data){
 		if(JacksonUtil.isNotJsonObject(data)){
 		if(JacksonUtil.isNotJsonObject(data)){
 			return null;
 			return null;