Skip to content

Y
yifu-mvp
Commit ab7e655a authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

模板权限调整

parent 3c6f407f
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 52 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpWorkRecording.java
View file @ ab7e655a
......@@ -16,10 +16,7 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -97,6 +94,7 @@ public class TEmpWorkRecording extends BaseEntity {
/**
* 结束工作日期
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
@Schema(description ="结束工作日期")
private LocalDateTime endDate;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FileUploadController.java
View file @ ab7e655a
......@@ -43,7 +43,12 @@ public class FileUploadController {
* @Param
* @return
**/
@Operation(description = "OSS文件上传接口")
@Operation(description = "OSS文件上传接口" +
"@ApiImplicitParam(name = \"file\", value = \"Form文件上传\", required = true, dataType = \"__file\", paramType = \"form\"),\n" +
"\t\t\t@ApiImplicitParam(name = \"filePath\", value = \"文件上传路径\", required = false, dataType = \"String\", paramType = \"form\"),\n" +
"\t\t\t@ApiImplicitParam(name = \"type\", value = \"关系类型(0客户附件1联系人附件2跟进记录附件3合同附件4合同归档附件5报价单6招标信息7业务评估)\", required = true, dataType = \"int\", paramType = \"form\"),\n" +
"\t\t\t@ApiImplicitParam(name = \"domain\", value = \"实体id（传入就插入对应关系,用于编辑）\", required = false, paramType = \"form\")\n" +
"\t")
/*@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "Form文件上传", required = true, dataType = "__file", paramType = "form"),
@ApiImplicitParam(name = "filePath", value = "文件上传路径", required = false, dataType = "String", paramType = "form"),
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java
View file @ ab7e655a
......@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pig4cloud.plugin.excel.annotation.RequestExcel;
......@@ -60,18 +61,28 @@ public class TEmpDisabilityInfoController {
*/
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_get')" )
public R getTEmpDisabilityInfoPage(Page page, TEmpDisabilityInfo tEmpDisabilityInfo) {
public R<IPage<TEmpDisabilityInfo>> getTEmpDisabilityInfoPage(Page page, TEmpDisabilityInfo tEmpDisabilityInfo) {
return R.ok(tEmpDisabilityInfoService.page(page, Wrappers.query(tEmpDisabilityInfo)));
}
/**
* 不分页查询
* @param tEmpDisabilityInfo 员工伤残信息表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@GetMapping("/noPage" )
public R<List<TEmpDisabilityInfo>> getTEmpDisabilityInfoNoPage(TEmpDisabilityInfo tEmpDisabilityInfo) {
return R.ok(tEmpDisabilityInfoService.list(Wrappers.query(tEmpDisabilityInfo)));
}
/**
* 通过id查询员工伤残信息表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@Operation(summary = "通过id查询", description = "通过id查询hasPermission('archives_tempdisabilityinfo_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_get')" )
public R<TEmpDisabilityInfo> getById(@PathVariable("id" ) String id) {
......@@ -83,7 +94,7 @@ public class TEmpDisabilityInfoController {
* @param tEmpDisabilityInfo 员工伤残信息表
* @return R
*/
@Operation(summary = "新增员工伤残信息表", description = "新增员工伤残信息表")
@Operation(summary = "新增员工伤残信息表", description = "新增员工伤残信息表hasPermission('archives_tempdisabilityinfo_add')")
@SysLog("新增员工伤残信息表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_add')" )
......@@ -96,7 +107,7 @@ public class TEmpDisabilityInfoController {
* @param tEmpDisabilityInfo 员工伤残信息表
* @return R
*/
@Operation(summary = "修改员工伤残信息表", description = "修改员工伤残信息表")
@Operation(summary = "修改员工伤残信息表", description = "修改员工伤残信息表hasPermission('archives_tempdisabilityinfo_edit')")
@SysLog("修改员工伤残信息表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_edit')" )
......@@ -109,7 +120,7 @@ public class TEmpDisabilityInfoController {
* @param id id
* @return R
*/
@Operation(summary = "通过id删除员工伤残信息表", description = "通过id删除员工伤残信息表")
@Operation(summary = "通过id删除员工伤残信息表", description = "通过id删除员工伤残信息表hasPermission('archives_tempdisabilityinfo_del')")
@SysLog("通过id删除员工伤残信息表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_del')" )
......@@ -125,10 +136,10 @@ public class TEmpDisabilityInfoController {
* @Author fxj
* @Date 2019-08-16
**/
@Operation(description = "批量新增员工伤残信息 hasPermission('wxhr:tempdisabilityinfo_importListAdd')")
@Operation(description = "批量新增员工伤残信息 hasPermission('archives_tempdisabilityinfo_importListAdd')")
@SysLog("批量新增员工伤残信息")
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('wxhr:tempdisabilityinfo_importListAdd')")
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_importListAdd')")
public R<List<ErrorMessage>> importListAdd(@RequestExcel List<EmpDisabilityExcelVO> excelVOList, BindingResult bindingResult) {
return tEmpDisabilityInfoService.importTmpDisability(excelVOList, bindingResult);
}
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpEducationController.java
View file @ ab7e655a
......@@ -60,20 +60,28 @@ public class TEmpEducationController {
* @param tEmpEducation 员工学历信息表
* @return
*/
@Operation(summary = "分页查询", description = "分页查询")
@Operation(description = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('archives_tempeducation_get')" )
public R<IPage<TEmpEducation>> getTEmpEducationPage(Page page, TEmpEducation tEmpEducation) {
return R.ok(tEmpEducationService.page(page, Wrappers.query(tEmpEducation)));
}
/**
* 不分页查询
* @param tEmpEducation 员工学历信息表
* @return
*/
@Operation(description = "不分页查询")
@GetMapping("/noPage" )
public R<List<TEmpEducation>> getTEmpEducationNoPage(TEmpEducation tEmpEducation) {
return R.ok(tEmpEducationService.list( Wrappers.query(tEmpEducation)));
}
/**
* 通过id查询员工学历信息表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@Operation(description = "通过id查询hasPermission('archives_tempeducation_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempeducation_get')" )
public R<TEmpEducation> getById(@PathVariable("id" ) String id) {
......@@ -85,7 +93,7 @@ public class TEmpEducationController {
* @param tEmpEducation 员工学历信息表
* @return R
*/
@Operation(summary = "新增员工学历信息表", description = "新增员工学历信息表")
@Operation( description = "新增员工学历信息表")
@SysLog("新增员工学历信息表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('archives_tempeducation_add')" )
......@@ -98,7 +106,7 @@ public class TEmpEducationController {
* @param tEmpEducation 员工学历信息表
* @return R
*/
@Operation(summary = "修改员工学历信息表", description = "修改员工学历信息表")
@Operation(description = "修改员工学历信息表hasPermission('archives_tempeducation_edit')")
@SysLog("修改员工学历信息表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('archives_tempeducation_edit')" )
......@@ -111,7 +119,7 @@ public class TEmpEducationController {
* @param id id
* @return R
*/
@Operation(summary = "通过id删除员工学历信息表", description = "通过id删除员工学历信息表")
@Operation(description = "通过id删除员工学历信息表hasPermission('archives_tempeducation_del')")
@SysLog("通过id删除员工学历信息表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempeducation_del')" )
......@@ -124,7 +132,7 @@ public class TEmpEducationController {
* @param ids
* @return R
*/
@Operation(summary = "通过id删除员工学历信息表", description = "通过id删除员工学历息表 @pms.hasPermission('archives_education_del_batch')")
@Operation(description = "通过id删除员工学历息表hasPermission('archives_education_del_batch')")
@SysLog("通过id删除员工学历信息表" )
@DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_education_del_batch')" )
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java
View file @ ab7e655a
......@@ -59,22 +59,30 @@ public class TEmpFamilyController {
* @param tEmpFamily 员工家庭信息表
* @return
*/
@Operation(summary = "分页查询", description = "分页查询")
@Operation(description = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('archives_tempfamily_get')" )
public R<IPage<TEmpFamily>> getTEmpFamilyPage(Page page, TEmpFamily tEmpFamily) {
return R.ok(tEmpFamilyService.page(page, Wrappers.query(tEmpFamily)));
}
/**
* 不分页查询
* @param tEmpFamily 员工家庭信息表
* @return
*/
@Operation(description = "不分页查询")
@GetMapping("/noPage" )
public R<List<TEmpFamily>> getTEmpFamilyNoPage(TEmpFamily tEmpFamily) {
return R.ok(tEmpFamilyService.list( Wrappers.query(tEmpFamily)));
}
/**
* 通过id查询员工家庭信息表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@Operation(description = "通过id查询hasPermission('archives-family-detail')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempfamily_get')" )
@PreAuthorize("@pms.hasPermission('archives-family-detail')" )
public R<TEmpFamily> getById(@PathVariable("id" ) Long id) {
return R.ok(tEmpFamilyService.getById(id));
}
......@@ -84,10 +92,10 @@ public class TEmpFamilyController {
* @param tEmpFamily 员工家庭信息表
* @return R
*/
@Operation(summary = "新增员工家庭信息表", description = "新增员工家庭信息表")
@Operation(description = "新增员工家庭信息表hasPermission('archives-family-add')")
@SysLog("新增员工家庭信息表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('archives_tempfamily_add')" )
@PreAuthorize("@pms.hasPermission('archives-family-add')" )
public R<Boolean> save(@RequestBody TEmpFamily tEmpFamily) {
String checkRes = tEmpFamilyService.checkRepeat(tEmpFamily.getEmpIdcard(),tEmpFamily.getFamilyName(),null);
if (Common.isNotNull(checkRes)){
......@@ -102,10 +110,10 @@ public class TEmpFamilyController {
* @param tEmpFamily 员工家庭信息表
* @return R
*/
@Operation(summary = "修改员工家庭信息表", description = "修改员工家庭信息表")
@Operation(description = "修改员工家庭信息表hasPermission('archives-family-edit')")
@SysLog("修改员工家庭信息表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('archives_tempfamily_edit')" )
@PreAuthorize("@pms.hasPermission('archives-family-edit')" )
public R<Boolean> updateById(@RequestBody TEmpFamily tEmpFamily) {
String checkRes = tEmpFamilyService.checkRepeat(tEmpFamily.getEmpIdcard(),tEmpFamily.getFamilyName(),tEmpFamily.getId());
if (Common.isNotNull(checkRes)){
......@@ -119,10 +127,10 @@ public class TEmpFamilyController {
* @param id id
* @return R
*/
@Operation(summary = "通过id删除员工家庭信息表", description = "通过id删除员工家庭信息表")
@Operation(description = "通过id删除员工家庭信息表hasPermission('archives-family-delete')")
@SysLog("通过id删除员工家庭信息表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempfamily_del')" )
@PreAuthorize("@pms.hasPermission('archives-family-delete')" )
public R<Boolean> removeById(@PathVariable String id) {
return R.ok(tEmpFamilyService.removeById(id));
}
......@@ -133,10 +141,10 @@ public class TEmpFamilyController {
* @param ids
* @return R
*/
@Operation(summary = "通过id删除员工家庭信息表", description = "通过id删除员工家庭信息表")
@Operation(description = "通过id删除员工家庭信息表hasPermission('archives-family-batch-delete')")
@SysLog("通过id删除员工家庭信息表" )
@DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempfamily_del_batch')" )
@PreAuthorize("@pms.hasPermission('archives-family-batch-delete')" )
public R<Boolean> removeByIds(String ids) {
List<String> idList = null;
if (Common.isNotNull(ids)){
......@@ -154,10 +162,10 @@ public class TEmpFamilyController {
* @Author fxj
* @Date 2019-08-16
**/
@Operation(description = "批量新增员工家庭信息 hasPermission('archives_tempfamily_importListAdd')")
@Operation(description = "批量新增员工家庭信息 hasPermission('archives-family-batch-import')")
@SysLog("批量新增员工家庭信息")
@PostMapping("/importListAdd")
@PreAuthorize("@pms.hasPermission('archives_tempfamily_importListAdd')")
@PreAuthorize("@pms.hasPermission('archives-family-batch-import')")
public R<List<ErrorMessage>> importListAdd(@RequestExcel List<EmpFamilyExcelVO> excelVOList, BindingResult bindingResult) {
return tEmpFamilyService.importEmpFamilys(excelVOList, bindingResult);
}
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpProfessionalQualificationController.java
View file @ ab7e655a
......@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpProfessionalQualification;
......@@ -29,6 +30,8 @@ import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 员工职业资格信息表
......@@ -50,20 +53,28 @@ public class TEmpProfessionalQualificationController {
* @param tEmpProfessionalQualification 员工职业资格信息表
* @return
*/
@Operation(summary = "分页查询", description = "分页查询")
@Operation(description = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_get')" )
public R getTEmpProfessionalQualificationPage(Page page, TEmpProfessionalQualification tEmpProfessionalQualification) {
public R<IPage<TEmpProfessionalQualification>> getTEmpProfessionalQualificationPage(Page page, TEmpProfessionalQualification tEmpProfessionalQualification) {
return R.ok(tEmpProfessionalQualificationService.page(page, Wrappers.query(tEmpProfessionalQualification)));
}
/**
* 不分页查询
* @param tEmpProfessionalQualification 员工职业资格信息表
* @return
*/
@Operation(description = "不分页查询")
@GetMapping("/noPage" )
public R<List<TEmpProfessionalQualification>> getTEmpProfessionalQualificationNoPage(TEmpProfessionalQualification tEmpProfessionalQualification) {
return R.ok(tEmpProfessionalQualificationService.list(Wrappers.query(tEmpProfessionalQualification)));
}
/**
* 通过id查询员工职业资格信息表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@Operation(description = "通过id查询hasPermission('archives_tempprofessionalqualification_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_get')" )
public R getById(@PathVariable("id" ) String id) {
......@@ -75,7 +86,7 @@ public class TEmpProfessionalQualificationController {
* @param tEmpProfessionalQualification 员工职业资格信息表
* @return R
*/
@Operation(summary = "新增员工职业资格信息表", description = "新增员工职业资格信息表")
@Operation(description = "新增员工职业资格信息表hasPermission('archives_tempprofessionalqualification_add')")
@SysLog("新增员工职业资格信息表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_add')" )
......@@ -88,7 +99,7 @@ public class TEmpProfessionalQualificationController {
* @param tEmpProfessionalQualification 员工职业资格信息表
* @return R
*/
@Operation(summary = "修改员工职业资格信息表", description = "修改员工职业资格信息表")
@Operation(description = "修改员工职业资格信息表hasPermission('archives_tempprofessionalqualification_edit')")
@SysLog("修改员工职业资格信息表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_edit')" )
......@@ -101,7 +112,7 @@ public class TEmpProfessionalQualificationController {
* @param id id
* @return R
*/
@Operation(summary = "通过id删除员工职业资格信息表", description = "通过id删除员工职业资格信息表")
@Operation(description = "通过id删除员工职业资格信息表hasPermission('archives_tempprofessionalqualification_del')")
@SysLog("通过id删除员工职业资格信息表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_del')" )
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpWorkRecordingController.java
View file @ ab7e655a
......@@ -61,20 +61,27 @@ public class TEmpWorkRecordingController {
*/
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_get')" )
public R<IPage<TEmpWorkRecording>> getTEmpWorkRecordingPage(Page page, TEmpWorkRecording tEmpWorkRecording) {
return R.ok(tEmpWorkRecordingService.page(page, Wrappers.query(tEmpWorkRecording)));
}
/**
* 不分页查询
* @param tEmpWorkRecording 员工工作履历信息表
* @return
*/
@Operation(description = "不分页查询")
@GetMapping("/noPage" )
public R<List<TEmpWorkRecording>> getTEmpWorkRecordingNoPage(TEmpWorkRecording tEmpWorkRecording) {
return R.ok(tEmpWorkRecordingService.list(Wrappers.query(tEmpWorkRecording)));
}
/**
* 通过id查询员工工作履历信息表
* @param id id
* @return R
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@Operation(description = "通过id查询hasPermission('archives_tempworkrecording_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_get')" )
public R<TEmpWorkRecording> getById(@PathVariable("id" ) String id) {
return R.ok(tEmpWorkRecordingService.getById(id));
}
......@@ -84,7 +91,7 @@ public class TEmpWorkRecordingController {
* @param tEmpWorkRecording 员工工作履历信息表
* @return R
*/
@Operation(summary = "新增员工工作履历信息表", description = "新增员工工作履历信息表")
@Operation(description = "新增员工工作履历信息表hasPermission('archives_tempworkrecording_add')")
@SysLog("新增员工工作履历信息表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_add')" )
......@@ -98,7 +105,7 @@ public class TEmpWorkRecordingController {
* @param tEmpWorkRecording 员工工作履历信息表
* @return R
*/
@Operation(summary = "修改员工工作履历信息表", description = "修改员工工作履历信息表")
@Operation( description = "修改员工工作履历信息表hasPermission('archives_tempworkrecording_edit')")
@SysLog("修改员工工作履历信息表" )
@PutMapping
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_edit')" )
......@@ -111,7 +118,7 @@ public class TEmpWorkRecordingController {
* @param id id
* @return R
*/
@Operation(summary = "通过id删除员工工作履历信息表", description = "通过id删除员工工作履历信息表")
@Operation(description = "通过id删除员工工作履历信息表hasPermission('archives_tempworkrecording_del')")
@SysLog("通过id删除员工工作履历信息表" )
@DeleteMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del')" )
......@@ -124,7 +131,7 @@ public class TEmpWorkRecordingController {
* @param ids
* @return R
*/
@Operation(summary = "通过id删除员工家庭信息表", description = "通过id删除员工工作信息表 @pms.hasPermission('archives_tempworkrecording_del_batch')")
@Operation(description = "通过id删除员工工作信息表 @pms.hasPermission('archives_tempworkrecording_del_batch')")
@SysLog("通过id删除员工家工作息表" )
@DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del_batch')" )
......
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