Commit f6e26323 authored by huyuchen's avatar huyuchen

huyc 项目档案代码提交

parent 659e43fc
...@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -121,7 +120,7 @@ public class TEmployeeProjectController { ...@@ -121,7 +120,7 @@ public class TEmployeeProjectController {
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('archives_temployeeproject_edit')" ) @PreAuthorize("@pms.hasPermission('archives_temployeeproject_edit')" )
public R updateById(@RequestBody TEmployeeProject tEmployeeProject) { public R updateById(@RequestBody TEmployeeProject tEmployeeProject) {
return R.ok(tEmployeeProjectService.updateById(tEmployeeProject)); return R.ok(tEmployeeProjectService.updateProject(tEmployeeProject));
} }
/** /**
......
...@@ -48,6 +48,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -48,6 +48,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
R saveEmp(TEmployeeProject tEmployeeProject); R saveEmp(TEmployeeProject tEmployeeProject);
R updateProject(TEmployeeProject tEmployeeProject);
/** /**
* @param tEmployeeProject * @param tEmployeeProject
* @Description: 减项 * @Description: 减项
...@@ -97,8 +99,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -97,8 +99,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo); List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo);
/** /**
* @param excelVOList * @param inputStream
* @param bindingResult
* @Description: 批量更新项目档案 * @Description: 批量更新项目档案
* @Author: huyc * @Author: huyc
* @Date: 2022/6/21 10:30 * @Date: 2022/6/21 10:30
......
...@@ -167,6 +167,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -167,6 +167,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return R.failed("未在人员档案中查到身份信息"); return R.failed("未在人员档案中查到身份信息");
} }
@Override
public R updateProject(TEmployeeProject tEmployeeProject) {
TEmployeeProject compareProject = this.getById(tEmployeeProject.getId());
boolean flag = this.updateById(tEmployeeProject);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],"",tEmployeeProject.getId(),compareProject,tEmployeeProject);
return R.ok(flag);
}
@Override @Override
public R reEmpInfo(JSONObject jsonObject) { public R reEmpInfo(JSONObject jsonObject) {
if (Common.isNotNull(jsonObject)) { if (Common.isNotNull(jsonObject)) {
......
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