zkr/shz-dataDashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend into main

Browse Source
This commit is contained in:
chenyanchang
2026-06-17 18:07:10 +08:00
parent 68a6d653b4 06553100e6
commit 3413da2637
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@RestController @RestController
@@ -38,6 +39,9 @@ public class AppFileController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(File file) public TableDataInfo list(File file)
{ {
if(file.getBussinessid()==null){
return getDataTable(new ArrayList<>());
}
List<File> results = fileService.selectFileList(file); List<File> results = fileService.selectFileList(file);
return getDataTable(results); return getDataTable(results);
} }

8
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java
View File

@@ -34,7 +34,7 @@ public class EmployeeConfirmController extends BaseController {
* 列表 * 列表
*/ */
@ApiOperation("新入职员工确认信息列表") @ApiOperation("新入职员工确认信息列表")
// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:list')") @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:list')")
@RequestMapping("/list") @RequestMapping("/list")
public TableDataInfo list(EmployeeConfirm employeeConfirm){ public TableDataInfo list(EmployeeConfirm employeeConfirm){
List<EmployeeConfirm> list=employeeConfirmService.getEmployeeConfirmList(employeeConfirm); List<EmployeeConfirm> list=employeeConfirmService.getEmployeeConfirmList(employeeConfirm);
@@ -45,7 +45,7 @@ public class EmployeeConfirmController extends BaseController {
* 保存 * 保存
*/ */
@ApiOperation("新增新入职员工确认信息") @ApiOperation("新增新入职员工确认信息")
// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:add')") @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:add')")
@Log(title = "职员工确认信息", businessType = BusinessType.INSERT) @Log(title = "职员工确认信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody EmployeeConfirm employeeConfirm){ public AjaxResult add(@RequestBody EmployeeConfirm employeeConfirm){
@@ -53,7 +53,7 @@ public class EmployeeConfirmController extends BaseController {
} }
@ApiOperation("修改新入职员工确认信息") @ApiOperation("修改新入职员工确认信息")
// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:edit')") @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:edit')")
@Log(title = "职员工确认信息", businessType = BusinessType.UPDATE) @Log(title = "职员工确认信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody EmployeeConfirm employeeConfirm){ public AjaxResult edit(@RequestBody EmployeeConfirm employeeConfirm){
@@ -61,7 +61,7 @@ public class EmployeeConfirmController extends BaseController {
} }
@ApiOperation("删除新入职员工确认信息") @ApiOperation("删除新入职员工确认信息")
// @PreAuthorize("@ss.hasPermi('app:employeeConfirm:remove')") @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:remove')")
@Log(title = "公司", businessType = BusinessType.DELETE) @Log(title = "公司", businessType = BusinessType.DELETE)
@DeleteMapping("/{employeeConfirmIds}") @DeleteMapping("/{employeeConfirmIds}")
public AjaxResult remove(@PathVariable Long[] employeeConfirmIds) public AjaxResult remove(@PathVariable Long[] employeeConfirmIds)

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java
View File

@@ -40,7 +40,7 @@ public class UserWorkExperiencesController extends BaseController {
* 列表 * 列表
*/ */
@ApiOperation("工作经历列表信息") @ApiOperation("工作经历列表信息")
@PreAuthorize("@ss.hasPermi('management:match:details')") @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(UserWorkExperiences userWorkExperiences){ public TableDataInfo list(UserWorkExperiences userWorkExperiences){
startPage(); startPage();

3
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java
View File

@@ -47,6 +47,9 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService {
} }
Job job=jobMapper.getJobInfo(employeeConfirm.getJobId()); Job job=jobMapper.getJobInfo(employeeConfirm.getJobId());
//添加消息 //添加消息
//获取申请消息
JobApply jobApply=jobApplyMapper.selectById(employeeConfirm.getApplyId());
employeeConfirm.setUserId(jobApply!=null?jobApply.getUserId():null);
Notice notice=NoticeUtils.createLytzNotice(employeeConfirm,job); Notice notice=NoticeUtils.createLytzNotice(employeeConfirm,job);
noticeMapper.insert(notice); noticeMapper.insert(notice);
return t; return t;