Commit b2f5ac30 authored by hongguangwu's avatar hongguangwu

post2

parent 04122721
...@@ -37,7 +37,7 @@ import java.time.LocalDateTime; ...@@ -37,7 +37,7 @@ import java.time.LocalDateTime;
@TableName("t_employee_contract_info") @TableName("t_employee_contract_info")
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Schema(description = "员工合同") @Schema(description = "员工合同")
public class TEmployeeContrctInfo extends BaseEntity { public class TEmployeeContractInfo extends BaseEntity {
/** /**
* 主键 * 主键
......
...@@ -19,8 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller; ...@@ -19,8 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContrctInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractInfoService;
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;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
...@@ -43,22 +43,22 @@ import org.springframework.web.bind.annotation.*; ...@@ -43,22 +43,22 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/temployeecontrctinfo") @RequestMapping("/temployeecontrctinfo")
@Tag(name = "员工合同管理") @Tag(name = "员工合同管理")
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class TEmployeeContrctInfoController { public class TEmployeeContractInfoController {
private final TEmployeeContrctInfoService tEmployeeContrctInfoService; private final TEmployeeContractInfoService tEmployeeContractInfoService;
/** /**
* 分页查询 * 分页查询
* *
* @param page 分页对象 * @param page 分页对象
* @param tEmployeeContrctInfo 员工合同 * @param tEmployeeContractInfo 员工合同
* @return * @return
*/ */
@Operation(summary = "分页查询", description = "分页查询") @Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page") @GetMapping("/page")
@PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_get')") @PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_get')")
public R getTEmployeeContrctInfoPage(Page page, TEmployeeContrctInfo tEmployeeContrctInfo) { public R getTEmployeeContrctInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
return R.ok(tEmployeeContrctInfoService.page(page, Wrappers.query(tEmployeeContrctInfo))); return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page,tEmployeeContractInfo));
} }
...@@ -72,35 +72,35 @@ public class TEmployeeContrctInfoController { ...@@ -72,35 +72,35 @@ public class TEmployeeContrctInfoController {
@GetMapping("/{id}") @GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_get')") @PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_get')")
public R getById(@PathVariable("id") String id) { public R getById(@PathVariable("id") String id) {
return R.ok(tEmployeeContrctInfoService.getById(id)); return R.ok(tEmployeeContractInfoService.getById(id));
} }
/** /**
* 新增员工合同 * 新增员工合同
* *
* @param tEmployeeContrctInfo 员工合同 * @param tEmployeeContractInfo 员工合同
* @return R * @return R
*/ */
@Operation(summary = "新增员工合同", description = "新增员工合同:hasPermission('contract_temployeecontrctinfo_add')") @Operation(summary = "新增员工合同", description = "新增员工合同:hasPermission('contract_temployeecontrctinfo_add')")
@SysLog("新增员工合同") @SysLog("新增员工合同")
@PostMapping @PostMapping
@PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_add')") @PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_add')")
public R save(@RequestBody TEmployeeContrctInfo tEmployeeContrctInfo) { public R save(@RequestBody TEmployeeContractInfo tEmployeeContractInfo) {
return R.ok(tEmployeeContrctInfoService.save(tEmployeeContrctInfo)); return R.ok(tEmployeeContractInfoService.save(tEmployeeContractInfo));
} }
/** /**
* 修改员工合同 * 修改员工合同
* *
* @param tEmployeeContrctInfo 员工合同 * @param tEmployeeContractInfo 员工合同
* @return R * @return R
*/ */
@Operation(summary = "修改员工合同", description = "修改员工合同:hasPermission('contract_temployeecontrctinfo_edit')") @Operation(summary = "修改员工合同", description = "修改员工合同:hasPermission('contract_temployeecontrctinfo_edit')")
@SysLog("修改员工合同") @SysLog("修改员工合同")
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_edit')") @PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_edit')")
public R updateById(@RequestBody TEmployeeContrctInfo tEmployeeContrctInfo) { public R updateById(@RequestBody TEmployeeContractInfo tEmployeeContractInfo) {
return R.ok(tEmployeeContrctInfoService.updateById(tEmployeeContrctInfo)); return R.ok(tEmployeeContractInfoService.updateById(tEmployeeContractInfo));
} }
/** /**
...@@ -114,7 +114,7 @@ public class TEmployeeContrctInfoController { ...@@ -114,7 +114,7 @@ public class TEmployeeContrctInfoController {
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_del')") @PreAuthorize("@pms.hasPermission('contract_temployeecontrctinfo_del')")
public R removeById(@PathVariable String id) { public R removeById(@PathVariable String id) {
return R.ok(tEmployeeContrctInfoService.removeById(id)); return R.ok(tEmployeeContractInfoService.removeById(id));
} }
} }
...@@ -233,9 +233,9 @@ public class TEmployeeInfoController { ...@@ -233,9 +233,9 @@ public class TEmployeeInfoController {
* @Date: 2022/6/21 19:42 * @Date: 2022/6/21 19:42
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
@Operation(summary = "通过ids批量删除人员档案表", description = "通过ids批量删除人员档案表") @Operation(summary = "通过idList批量删除人员档案表", description = "通过ids批量删除人员档案表")
@SysLog("通过ids批量删除人员档案表") @SysLog("通过idList批量删除人员档案表")
@GetMapping("/batchDeleteEmployee") @PostMapping("/batchDeleteEmployee")
@PreAuthorize("@pms.hasPermission('temployeeinfo_batch_del')") @PreAuthorize("@pms.hasPermission('temployeeinfo_batch_del')")
public R<List<ErrorMessageVO>> batchDeleteEmployee(@RequestBody List<String> idList) { public R<List<ErrorMessageVO>> batchDeleteEmployee(@RequestBody List<String> idList) {
return tEmployeeInfoService.batchDeleteEmployee(idList); return tEmployeeInfoService.batchDeleteEmployee(idList);
......
...@@ -18,8 +18,11 @@ ...@@ -18,8 +18,11 @@
package com.yifu.cloud.plus.v1.yifu.archives.mapper; package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/** /**
* 员工合同 * 员工合同
...@@ -28,6 +31,14 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -28,6 +31,14 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2022-06-29 20:45:22 * @date 2022-06-29 20:45:22
*/ */
@Mapper @Mapper
public interface TEmployeeContrctInfoMapper extends BaseMapper<TEmployeeContrctInfo> { public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContractInfo> {
/**
* 员工合同信息表简单分页查询
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, @Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo);
} }
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
package com.yifu.cloud.plus.v1.yifu.archives.service; package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
/** /**
* 员工合同 * 员工合同
...@@ -26,6 +28,14 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo; ...@@ -26,6 +28,14 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo;
* @author hgw * @author hgw
* @date 2022-06-29 20:45:22 * @date 2022-06-29 20:45:22
*/ */
public interface TEmployeeContrctInfoService extends IService<TEmployeeContrctInfo> { public interface TEmployeeContractInfoService extends IService<TEmployeeContractInfo> {
/**
* 员工合同信息表简单分页查询
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo);
} }
...@@ -16,10 +16,12 @@ ...@@ -16,10 +16,12 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContrctInfoMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContrctInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -29,6 +31,15 @@ import org.springframework.stereotype.Service; ...@@ -29,6 +31,15 @@ import org.springframework.stereotype.Service;
* @date 2022-06-29 20:45:22 * @date 2022-06-29 20:45:22
*/ */
@Service @Service
public class TEmployeeContrctInfoServiceImpl extends ServiceImpl<TEmployeeContrctInfoMapper, TEmployeeContrctInfo> implements TEmployeeContrctInfoService { public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContractInfoMapper, TEmployeeContractInfo> implements TEmployeeContractInfoService {
/**
* 员工合同信息表简单分页查询
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
@Override
public IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
return baseMapper.getTEmployeeContractInfoPage(page, tEmployeeContractInfo);
}
} }
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ 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)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="archives.contract.mapper.TEmployeeContrctInfoMapper">
<resultMap id="tEmployeeContrctInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContrctInfo">
<id property="id" column="ID"/>
<result property="empNo" column="EMP_NO"/>
<result property="empId" column="EMP_ID"/>
<result property="empName" column="EMP_NAME"/>
<result property="empIdcard" column="EMP_IDCARD"/>
<result property="contractName" column="CONTRACT_NAME"/>
<result property="contractType" column="CONTRACT_TYPE"/>
<result property="contractStart" column="CONTRACT_START"/>
<result property="contractEnd" column="CONTRACT_END"/>
<result property="subjectDepart" column="SUBJECT_DEPART"/>
<result property="subjectUnit" column="SUBJECT_UNIT"/>
<result property="situation" column="SITUATION"/>
<result property="contractTerm" column="CONTRACT_TERM"/>
<result property="contractNo" column="CONTRACT_NO"/>
<result property="remark" column="REMARK"/>
<result property="isObsolete" column="IS_OBSOLETE"/>
<result property="isFile" column="IS_FILE"/>
<result property="oldId" column="OLD_ID"/>
<result property="enjoinDate" column="ENJOIN_DATE"/>
<result property="post" column="POST"/>
<result property="workingHours" column="WORKING_HOURS"/>
<result property="fileCabinetNo" column="FILE_CABINET_NO"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="inUse" column="IN_USE"/>
<result property="obsoleteReason" column="OBSOLETE_REASON"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="fileProvince" column="FILE_PROVINCE"/>
<result property="fileCity" column="FILE_CITY"/>
<result property="fileTown" column="FILE_TOWN"/>
<result property="workingStatusSub" column="WORKING_STATUS_SUB"/>
<result property="workFlag" column="WORK_FLAG"/>
<result property="periodStart" column="PERIOD_START"/>
<result property="periodEnd" column="PERIOD_END"/>
<result property="periodSalaryPerMonth" column="PERIOD_SALARY_PER_MONTH"/>
<result property="salaryType" column="SALARY_TYPE"/>
<result property="salaryStandardPerHour" column="SALARY_STANDARD_PER_HOUR"/>
<result property="salaryStandardPerPiece" column="SALARY_STANDARD_PER_PIECE"/>
<result property="dispatchFlag" column="DISPATCH_FLAG"/>
<result property="warnEmailUserId" column="WARN_EMAIL_USER_ID"/>
<result property="fddFlag" column="FDD_FLAG"/>
<result property="isSign" column="IS_SIGN"/>
<result property="createBy" column="CREATE_BY"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/>
</resultMap>
</mapper>
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