Commit 11f5eb1c authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_导出优化

parent 84f07841
...@@ -48,6 +48,7 @@ import org.apache.commons.compress.utils.Lists; ...@@ -48,6 +48,7 @@ import org.apache.commons.compress.utils.Lists;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -807,6 +808,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -807,6 +808,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
* @Date: 2024/6/17 17:44 * @Date: 2024/6/17 17:44
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
@Transactional
private R<String> saveBase(PreEmpMainDetailVo vo, String status) { private R<String> saveBase(PreEmpMainDetailVo vo, String status) {
YifuUser user = getNewYifuUser(); YifuUser user = getNewYifuUser();
TPreEmpMain main = vo.getMain(); TPreEmpMain main = vo.getMain();
...@@ -1280,7 +1282,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1280,7 +1282,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList(); List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList();
// 先删除其他信息 // 先删除其他信息
tEmpProfessionalService.deleteProfessionalByEmpId(empId); tEmpProfessionalService.deleteProfessionalByEmpId(empId);
if (tPreEmpProfessionalQualificationList != null) { if (tPreEmpProfessionalQualificationList != null
&& (Common.isEmpty(emp.getHaveQualification()) || CommonConstants.ZERO_STRING.equals(emp.getHaveQualification()))) {
TEmpProfessionalQualification info; TEmpProfessionalQualification info;
for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) { for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) {
info = new TEmpProfessionalQualification(); info = new TEmpProfessionalQualification();
...@@ -1326,7 +1329,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1326,7 +1329,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTpreEmpWorkRecordingList(); List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTpreEmpWorkRecordingList();
// 先删除其他信息 // 先删除其他信息
tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId); tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId);
if (tPreEmpWorkRecordingList != null) { if (tPreEmpWorkRecordingList != null && (Common.isEmpty(emp.getFirstWorkFlag()) || CommonConstants.ONE_STRING.equals(emp.getFirstWorkFlag()))) {
TEmpWorkRecording info; TEmpWorkRecording info;
for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) { for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) {
info = new TEmpWorkRecording(); info = new TEmpWorkRecording();
...@@ -1766,6 +1769,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1766,6 +1769,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
@Override @Override
@Transactional
public R<String> doAudit(String id, String status, String auditRemark) { public R<String> doAudit(String id, String status, String auditRemark) {
if (Common.isEmpty(id) && Common.isEmpty(status)) { if (Common.isEmpty(id) && Common.isEmpty(status)) {
return R.failed("id、status不可为空!"); return R.failed("id、status不可为空!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment