wkyy 3 vuotta sitten
vanhempi
commit
e9f927e402

+ 11 - 7
common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/SupplementWorkServiceImpl.java

@@ -148,22 +148,26 @@ public class SupplementWorkServiceImpl implements SupplementWorkService {
 		supplementWork.setReason(reason);
 		supplementWork.setImageUrl(imageUrl);
 		supplementWork.setCreateTime(new Date());
-		if(StringUtils.isNotEmpty(ids)){
-			update(supplementWork);
-		}else {
-			insert(supplementWork);
-		}
+
 
 		//新增个人记录
 		supplementWorkPerson.setPersonPopedomId(personPopedom.getId());
 		supplementWorkPerson.setSupplementWorkId(supplementWork.getId());
 		supplementWorkPerson.setScheduleAttendanceId(id);
 		supplementWorkPerson.setCreateTime(new Date());
-		supplementWorkPersonService.insert(supplementWorkPerson);
+
 
 		//考勤记录中记录补卡记录id
 		workScheduleAttendance.setSupplementWorkPersonId(supplementWorkPerson.getId());
-		workScheduleAttendanceService.update(workScheduleAttendance);
+
+		if(StringUtils.isNotEmpty(ids)){
+			update(supplementWork);
+			supplementWorkPersonService.update(supplementWorkPerson);
+			workScheduleAttendanceService.update(workScheduleAttendance);
+		}else {
+			insert(supplementWork);
+			supplementWorkPersonService.insert(supplementWorkPerson);
+		}
 
 		if ("1".equals(draft)) {
 			//创建审核流程id