diff --git a/src/main/java/com/newyetai/recruit/company/controller/HrCompanyFileController.java b/src/main/java/com/newyetai/recruit/company/controller/HrCompanyFileController.java index 857415c..3f50342 100644 --- a/src/main/java/com/newyetai/recruit/company/controller/HrCompanyFileController.java +++ b/src/main/java/com/newyetai/recruit/company/controller/HrCompanyFileController.java @@ -21,48 +21,41 @@ import java.util.Objects; */ @Api(tags = "企业文件表") @RestController +@RequestMapping("/hr/company_file") public class HrCompanyFileController { @Autowired private HrCompanyFileService hrCompanyFileService; - @GetMapping("anon/hr/company_file/page") - @ApiOperation("分页查询企业文件") - public AlitaResult> userFilePage(HrCompanyFilePageQueryDTO queryDTO) { - Assert.notNull(queryDTO.getCompanyId(),"companyId不能为空"); - hrCompanyFileService.filePage(queryDTO); - return AlitaResult.success(queryDTO.getPageResult()); - } - - @GetMapping("/hr/company_file/page") + @GetMapping("/page") @ApiOperation("分页查询企业文件") public AlitaResult> filePage(HrCompanyFilePageQueryDTO queryDTO) { hrCompanyFileService.filePage(queryDTO); return AlitaResult.success(queryDTO.getPageResult()); } - @PostMapping("/hr/company_file/create") + @PostMapping("/create") @ApiOperation("创建企业文件信息") public AlitaResult create(@RequestBody HrCompanyFileDTO queryDTO) { return AlitaResult.success(hrCompanyFileService.create(queryDTO)); } - @PostMapping("/hr/company_file/update") + @PostMapping("/update") @ApiOperation("修改企业文件信息") public AlitaResult update(@RequestBody HrCompanyFileDTO queryDTO) { hrCompanyFileService.update(queryDTO); return AlitaResult.success(); } - @DeleteMapping("/hr/company_file/delete/{id}") + @DeleteMapping("/delete/{id}") @ApiOperation("根据文件Id删除企业文件信息") public AlitaResult delete(@PathVariable("id") Long id) { hrCompanyFileService.delete(id); return AlitaResult.success(); } - @PutMapping("/hr/company_file/setDefault/{id}") + @PutMapping("/setDefault/{id}") @ApiOperation("设置为默认") public AlitaResult setDefault(@PathVariable("id") Long id) { hrCompanyFileService.setDefault(id); diff --git a/src/main/java/com/newyetai/recruit/company/controller/UserCompanyController.java b/src/main/java/com/newyetai/recruit/company/controller/UserCompanyController.java new file mode 100644 index 0000000..e155ee7 --- /dev/null +++ b/src/main/java/com/newyetai/recruit/company/controller/UserCompanyController.java @@ -0,0 +1,48 @@ +package com.newyetai.recruit.company.controller; + +import cn.hutool.json.JSON; +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.newyetai.common.AlitaResult; +import com.newyetai.common.exception.util.Assert; +import com.newyetai.common.util.JsonUtils; +import com.newyetai.recruit.company.dao.HrCompanyMapper; +import com.newyetai.recruit.company.dto.HrCompanyDTO; +import com.newyetai.recruit.company.dto.HrCompanyFileDTO; +import com.newyetai.recruit.company.dto.HrCompanyFilePageQueryDTO; +import com.newyetai.recruit.company.entity.HrCompany; +import com.newyetai.recruit.company.mapstruct.HrCompanyMapMapper; +import com.newyetai.recruit.company.service.HrCompanyFileService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Optional; + +@RestController +public class UserCompanyController { + + @Autowired + private HrCompanyMapper hrCompanyMapper; + + @Autowired + private HrCompanyFileService hrCompanyFileService; + + @GetMapping("/anon/user/company/find/{id}") + @ApiOperation("用户端查询企业信息") + public AlitaResult findById(@PathVariable("id") Long id) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(HrCompany::getId, id) + .eq(HrCompany::getDeleted, false); + HrCompany hrCompany = Optional.ofNullable(hrCompanyMapper.selectOne(queryWrapper)).orElse(new HrCompany()); + HrCompanyDTO hrCompanyDTO = HrCompanyMapMapper.INSTANCE.exchange(hrCompany); + hrCompanyDTO.setOrgId(null); + List companyFileDTOS = hrCompanyFileService.filePage(HrCompanyFilePageQueryDTO.builder().companyId(id).build()); + hrCompanyDTO.setFileJson(JSONUtil.toJsonStr(companyFileDTOS)); + return AlitaResult.success(hrCompanyDTO); + } +}