Skip to content

Y
yifu-mvp
Commit 39b6b771 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 673dee69 aaa0d1d2
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 25 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeXProjectVO.java 0 → 100644
View file @ 39b6b771
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 项目档案表excel对应的实体
*
* @author huyc
* @date 2022-06-20 17:54:40
*/
@Data
@ColumnWidth(30)
public class EmployeeXProjectVO extends RowIndex implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 员工姓名
*/
@NotNull(message = "员工姓名不能为空")
@ExcelAttribute(name = "员工姓名",isNotEmpty = true, errorInfo = "员工姓名不能为空",maxLength = 20)
@ExcelProperty(value ="员工姓名")
private String empName;
/**
* 身份证号码
*/
@NotNull(message = "身份证号不能为空")
@ExcelAttribute(name = "身份证号",isNotEmpty = true, errorInfo = "身份证号不能为空",maxLength = 20)
@ExcelProperty(value ="身份证号")
private String empIdcard;
/**
* 项目编码
*/
@NotNull(message = "项目编码不能为空")
@ExcelProperty(value ="项目编码")
@ExcelAttribute(name = "项目编码",isNotEmpty = true, errorInfo = "项目编码不能为空",maxLength = 20)
private String deptNo;
/**
* 减项原因
*/
@ExcelProperty(value ="减项原因")
@NotNull(message = "减项原因不能为空")
@ExcelAttribute(name = "减项原因",isNotEmpty = true, errorInfo = "减项原因不能为空",maxLength = 100)
private String leaveReason;
/**
* 减项备注
*/
@ExcelProperty(value ="减项备注")
private String leaveRemark;
/**
* 是否同步减档（0否；1是）
*/
@ExcelProperty(value ="是否同步减档")
@NotNull(message = "是否同步减档不能为空")
@ExcelAttribute(name = "是否同步减档",isNotEmpty = true, errorInfo = "是否同步减档不能为空",maxLength = 1)
private Integer isLeaveEmployee;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpBadRecordController.java
View file @ 39b6b771
...@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -140,8 +141,8 @@ public class TEmpBadRecordController { ...@@ -140,8 +141,8 @@ public class TEmpBadRecordController {
@SysLog("通过ids删除员工不良记录" ) @SysLog("通过ids删除员工不良记录" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('demo_tempbadrecord_del_batch')" ) @PreAuthorize("@pms.hasPermission('demo_tempbadrecord_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(tEmpBadRecordService.removeByIds(idList)); return R.ok(tEmpBadRecordService.removeByIds(idList));
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java
View file @ 39b6b771
...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -138,8 +139,8 @@ public class TEmpDisabilityInfoController { ...@@ -138,8 +139,8 @@ public class TEmpDisabilityInfoController {
@SysLog("通过ids删除员工伤残信息表" ) @SysLog("通过ids删除员工伤残信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(tEmpDisabilityInfoService.removeByIds(idList)); return R.ok(tEmpDisabilityInfoService.removeByIds(idList));
} }
/** /**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpEducationController.java
View file @ 39b6b771
...@@ -22,8 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -22,8 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpEducation; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpEducation;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpEducationService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpEducationService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EducationSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EducationSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
...@@ -36,6 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -36,6 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -136,11 +135,8 @@ public class TEmpEducationController { ...@@ -136,11 +135,8 @@ public class TEmpEducationController {
@SysLog("通过id删除员工学历信息表" ) @SysLog("通过id删除员工学历信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_education_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_education_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = null; List<String> idList = Arrays.asList(ids);
if (Common.isNotNull(ids)){
idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
}
return R.ok(tEmpEducationService.removeByIds(idList)); return R.ok(tEmpEducationService.removeByIds(idList));
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java
View file @ 39b6b771
...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -146,8 +147,8 @@ public class TEmpFamilyController { ...@@ -146,8 +147,8 @@ public class TEmpFamilyController {
@SysLog("通过id删除员工家庭信息表" ) @SysLog("通过id删除员工家庭信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives-family-batch-delete')" ) @PreAuthorize("@pms.hasPermission('archives-family-batch-delete')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return tEmpFamilyService.removeByIdsDiy(idList); return tEmpFamilyService.removeByIdsDiy(idList);
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpProfessionalQualificationController.java
View file @ 39b6b771
...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -135,8 +136,8 @@ public class TEmpProfessionalQualificationController { ...@@ -135,8 +136,8 @@ public class TEmpProfessionalQualificationController {
@SysLog("通过ids删除员工职业资格信息表" ) @SysLog("通过ids删除员工职业资格信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_del_batch')" )
public R removeByIds(@RequestBody(required = true) String ids) { public R removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(qualificationService.removeByIds(idList)); return R.ok(qualificationService.removeByIds(idList));
} }
/** /**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpWorkRecordingController.java
View file @ 39b6b771
...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -136,8 +137,8 @@ public class TEmpWorkRecordingController { ...@@ -136,8 +137,8 @@ public class TEmpWorkRecordingController {
@SysLog("通过id删除员工家工作息表" ) @SysLog("通过id删除员工家工作息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(tEmpWorkRecordingService.removeByIds(idList)); return R.ok(tEmpWorkRecordingService.removeByIds(idList));
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @ 39b6b771
...@@ -24,7 +24,7 @@ import com.pig4cloud.plugin.excel.annotation.RequestExcel; ...@@ -24,7 +24,7 @@ import com.pig4cloud.plugin.excel.annotation.RequestExcel;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...@@ -190,7 +190,7 @@ public class TEmployeeProjectController { ...@@ -190,7 +190,7 @@ public class TEmployeeProjectController {
@SysLog("批量减项" ) @SysLog("批量减项" )
@PostMapping("/batchDeleteEmpPro") @PostMapping("/batchDeleteEmpPro")
@PreAuthorize("@pms.hasPermission('archives_temployeeproject_batchdelempproinfo')" ) @PreAuthorize("@pms.hasPermission('archives_temployeeproject_batchdelempproinfo')" )
public R<List<ErrorMessage>> batchDeleteEmpPro(@RequestExcel List<EmployeeProjectVO> excelVOList, BindingResult bindingResult) { public R<List<ErrorMessage>> batchDeleteEmpPro(@RequestExcel List<EmployeeXProjectVO> excelVOList, BindingResult bindingResult) {
return tEmployeeProjectService.batchDeleteEmpPro(excelVOList,bindingResult); return tEmployeeProjectService.batchDeleteEmpPro(excelVOList,bindingResult);
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @ 39b6b771
...@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
...@@ -66,7 +66,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -66,7 +66,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
* @Date: 2022/6/21 10:30 * @Date: 2022/6/21 10:30
* @return: R * @return: R
**/ **/
R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeProjectVO> list, BindingResult bindingResult); R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeXProjectVO> list, BindingResult bindingResult);
/** /**
* @param inputStream * @param inputStream
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ 39b6b771
...@@ -40,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService; ...@@ -40,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService; import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes; import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
...@@ -238,13 +239,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -238,13 +239,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} }
@Override @Override
public R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeProjectVO> excelVOList, BindingResult bindingResult) { public R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeXProjectVO> excelVOList, BindingResult bindingResult) {
// 通用校验获取失败的数据 // 通用校验获取失败的数据
List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget(); List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
// 执行数据插入操作 组装 PostDto // 执行数据插入操作 组装 PostDto
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
EmployeeProjectVO excel = excelVOList.get(i); EmployeeXProjectVO excel = excelVOList.get(i);
//根据身份证和项目编码获取项目档案 //根据身份证和项目编码获取项目档案
TEmployeeProject tEmployeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda() TEmployeeProject tEmployeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()) .eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard())
...@@ -255,7 +256,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -255,7 +256,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId()); TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
if (Common.isNotNull(tEmployeeProject)) { if (Common.isNotNull(tEmployeeProject)) {
TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId()); TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
if (tEmployeeProject.getIsLeaveEmployee() == CommonConstants.dingleDigitIntArray[1]) { if (excel.getIsLeaveEmployee() == CommonConstants.dingleDigitIntArray[1]) {
Long count = this.count(Wrappers.<TEmployeeProject>query().lambda() Long count = this.count(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpId, tEmployeeProject.getEmpId()) .eq(TEmployeeProject::getEmpId, tEmployeeProject.getEmpId())
.eq(TEmployeeProject::getProjectStatus, CommonConstants.dingleDigitIntArray[0])); .eq(TEmployeeProject::getProjectStatus, CommonConstants.dingleDigitIntArray[0]));
...@@ -263,11 +264,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -263,11 +264,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_NOT_EXIST))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_NOT_EXIST)));
} }
tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]); tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
tEmployeeInfo.setLeaveReason(excel.getLeaveReason());
tEmployeeInfo.setLeaveRemark(excel.getLeaveRemark());
tEmployeeInfoMapper.updateById(tEmployeeInfo); tEmployeeInfoMapper.updateById(tEmployeeInfo);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeProjectOld, tEmployeeInfo);
} }
tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]); tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
tEmployeeProject.setLeaveReason(excel.getLeaveReason());
tEmployeeProject.setLeaveRemark(excel.getLeaveRemark());
this.updateById(tEmployeeProject); this.updateById(tEmployeeProject);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeProjectOld, tEmployeeInfo);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeInfoOld, tEmployeeProject); tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeInfoOld, tEmployeeProject);
} }
} }
......
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