Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

+/*
+ *    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)
+ */
+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.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 项目档案表
+ *
+ * @author huyc
+ * @date 2022-06-20 09:19:40
+ */
+@Data
+@TableName("t_employee_project")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "项目档案表")
+public class TEmployeeProject extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description ="主键")
+    private String id;
+
+    /**
+     * 人员档案主表id
+     */
+    @Schema(description ="人员档案主表id")
+    private String empId;
+
+    /**
+     * 员工主码（系统自动生成：ZM+年月日+5位数字）
+     */
+    @Schema(description ="员工主码（系统自动生成：ZM+年月日+5位数字）")
+    private String empCode;
+
+    /**
+     * 员工类型（字典值，0外包1派遣2代理）
+     */
+    @Schema(description ="员工类型（字典值，0外包1派遣2代理）")
+    private String empNatrue;
+
+    /**
+     * 员工姓名
+     */
+    @Schema(description ="员工姓名")
+    private String empName;
+
+    /**
+     * 身份证号码
+     */
+    @Schema(description ="身份证号码")
+    private String empIdcard;
+
+    /**
+     * 开户行
+     */
+    @Schema(description ="开户行")
+    private String bankName;
+
+    /**
+     * 支行
+     */
+    @Schema(description ="支行")
+    private String bankSubName;
+
+    /**
+     * 银行卡号
+     */
+    @Schema(description ="银行卡号")
+    private String bankNo;
+
+    /**
+     * 减项操作人id
+     */
+    @Schema(description ="减项操作人id")
+    private String leaveUser;
+
+    /**
+     * 减项时间
+     */
+    @Schema(description ="减项时间")
+    private LocalDateTime leaveTime;
+
+    /**
+     * 减项原因
+     */
+    @Schema(description ="减项原因")
+    private String leaveReason;
+
+    /**
+     * 减项备注
+     */
+    @Schema(description ="减项备注")
+    private String leaveRemark;
+
+    /**
+     * 是否同步减档（0否；1是）
+     */
+    @Schema(description ="是否同步减档（0否；1是）")
+    private Integer isLeaveEmployee;
+
+    /**
+     * 员工编码
+     */
+    @Schema(description ="员工编码")
+    private String empNo;
+
+    /**
+     * 客户id
+     */
+    @Schema(description ="客户id")
+    private String unitId;
+
+    /**
+     * 客户名称
+     */
+    @Schema(description ="客户名称")
+    private String unitName;
+
+    /**
+     * 客户编码
+     */
+    @Schema(description ="客户编码")
+    private String unitNo;
+
+    /**
+     * 项目id
+     */
+    @Schema(description ="项目id")
+    private String deptId;
+
+    /**
+     * 项目名称
+     */
+    @Schema(description ="项目名称")
+    private String deptName;
+
+    /**
+     * 项目编码
+     */
+    @Schema(description ="项目编码")
+    private String deptNo;
+
+    /**
+     * 业务类型一级分类
+     */
+    @Schema(description ="业务类型一级分类")
+    private String businessPrimaryType;
+
+    /**
+     * 业务类型二级分类
+     */
+    @Schema(description ="业务类型二级分类")
+    private String businessSecondType;
+
+    /**
+     * 业务类型三级分类
+     */
+    @Schema(description ="业务类型三级分类")
+    private String businessThirdType;
+
+    /**
+     * 合同类型（字典值）
+     */
+    @Schema(description ="合同类型（字典值）")
+    private String contractType;
+
+    /**
+     * 工时制
+     */
+    @Schema(description ="工时制")
+    private String workingHours;
+
+    /**
+     * 就职岗位
+     */
+    @Schema(description ="就职岗位")
+    private String post;
+
+    /**
+     * 入职日期
+     */
+    @Schema(description ="入职日期")
+    private LocalDateTime enjoinDate;
+
+    /**
+     * 试用期（单位月）
+     */
+    @Schema(description ="试用期（单位月）")
+    private String tryPeriod;
+
+    /**
+     * 项目档案来源（字典：4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬）
+     */
+    @Schema(description ="项目档案来源（字典：4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬）")
+    private String projectSource;
+
+    /**
+     * 计税月份
+     */
+    @Schema(description ="计税月份")
+    private String taxMonth;
+
+    /**
+     * 项目档案状态（0草稿、1已审核）
+     */
+    @Schema(description ="项目档案状态（0草稿、1已审核）")
+    private Integer status;
+
+    /**
+     * 项目状态（0正常；1已减项）
+     */
+    @Schema(description ="项目状态（0正常；1已减项）")
+    private Integer projectStatus;
+
+    /**
+     * 是否删除 0否/1是
+     */
+    @Schema(description ="是否删除 0否/1是")
+    private String deleteFlag;
+
+    /**
+     * 创建人id
+     */
+    @Schema(description ="创建人id")
+    private String createBy;
+
+    /**
+     * 创建人姓名
+     */
+    @Schema(description ="创建人姓名")
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @Schema(description ="创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人id
+     */
+    @Schema(description ="更新人id")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @Schema(description ="更新时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    @Schema(description ="备注")
+    private String remark;
+
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java

+/*
+ *    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)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.archives.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 项目档案表
+ *
+ * @author huyc
+ * @date 2022-06-20 09:19:40
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/temployeeproject" )
+@Tag(name = "项目档案表管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TEmployeeProjectController {
+
+    private final TEmployeeProjectService tEmployeeProjectService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param tEmployeeProject 项目档案表
+     * @return
+     */
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('archives_temployeeproject_get')" )
+    public R getTEmployeeProjectPage(Page page, TEmployeeProject tEmployeeProject) {
+        return R.ok(tEmployeeProjectService.page(page, Wrappers.query(tEmployeeProject)));
+    }
+
+
+    /**
+     * 通过id查询项目档案表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询")
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('archives_temployeeproject_get')" )
+    public R getById(@PathVariable("id" ) String id) {
+        return R.ok(tEmployeeProjectService.getById(id));
+    }
+
+    /**
+     * 新增项目档案表
+     * @param tEmployeeProject 项目档案表
+     * @return R
+     */
+    @Operation(summary = "新增项目档案表", description = "新增项目档案表")
+    @SysLog("新增项目档案表" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('archives_temployeeproject_add')" )
+    public R save(@RequestBody TEmployeeProject tEmployeeProject) {
+        return R.ok(tEmployeeProjectService.save(tEmployeeProject));
+    }
+
+    /**
+     * 修改项目档案表
+     * @param tEmployeeProject 项目档案表
+     * @return R
+     */
+    @Operation(summary = "修改项目档案表", description = "修改项目档案表")
+    @SysLog("修改项目档案表" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('archives_temployeeproject_edit')" )
+    public R updateById(@RequestBody TEmployeeProject tEmployeeProject) {
+        return R.ok(tEmployeeProjectService.updateById(tEmployeeProject));
+    }
+
+    /**
+     * 通过id删除项目档案表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id删除项目档案表", description = "通过id删除项目档案表")
+    @SysLog("通过id删除项目档案表" )
+    @DeleteMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('archives_temployeeproject_del')" )
+    public R removeById(@PathVariable String id) {
+        return R.ok(tEmployeeProjectService.removeById(id));
+    }
+
+	/**
+	 * 新增项目档案校验
+	 * @param tEmployeeProject 项目档案表
+	 * @return R
+	 */
+	@Operation(summary = "新增项目档案校验", description = "新增项目档案校验")
+	@SysLog("新增项目档案校验" )
+	@PostMapping("/check")
+	@PreAuthorize("@pms.hasPermission('archives_temployeeproject_addcheck')" )
+	public R addCheck(@RequestBody TEmployeeProject tEmployeeProject) {
+		return R.ok(tEmployeeProjectService.addCheck(tEmployeeProject));
+	}
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java

+/*
+ *    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)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.archives.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目档案表
+ *
+ * @author huyc
+ * @date 2022-06-20 09:19:40
+ */
+@Mapper
+public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java

+/*
+ *    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)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.archives.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+
+/**
+ * 项目档案表
+ *
+ * @author huyc
+ * @date 2022-06-20 09:19:40
+ */
+public interface TEmployeeProjectService extends IService<TEmployeeProject> {
+
+	R addCheck(TEmployeeProject tEmployeeProject);
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

+/*
+ *    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)
+ */
+package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目档案表
+ *
+ * @author huyc
+ * @date 2022-06-20 09:19:40
+ */
+@Service
+public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMapper, TEmployeeProject> implements TEmployeeProjectService {
+
+	@Override
+	public R addCheck(TEmployeeProject tEmployeeProject) {
+		return null;
+	}
+}

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pig4cloud.pig.demo.mapper.TEmployeeProjectMapper">
+
+  <resultMap id="tEmployeeProjectMap" type="com.pig4cloud.pig.demo.entity.TEmployeeProject">
+    <id property="id" column="ID"/>
+    <result property="empId" column="EMP_ID"/>
+    <result property="empCode" column="EMP_CODE"/>
+    <result property="empNatrue" column="EMP_NATRUE"/>
+    <result property="empName" column="EMP_NAME"/>
+    <result property="empIdcard" column="EMP_IDCARD"/>
+    <result property="bankName" column="BANK_NAME"/>
+    <result property="bankSubName" column="BANK_SUB_NAME"/>
+    <result property="bankNo" column="BANK_NO"/>
+    <result property="leaveUser" column="LEAVE_USER"/>
+    <result property="leaveTime" column="LEAVE_TIME"/>
+    <result property="leaveReason" column="LEAVE_REASON"/>
+    <result property="leaveRemark" column="LEAVE_REMARK"/>
+    <result property="isLeaveEmployee" column="IS_LEAVE_EMPLOYEE"/>
+    <result property="empNo" column="EMP_NO"/>
+    <result property="unitId" column="UNIT_ID"/>
+    <result property="unitName" column="UNIT_NAME"/>
+    <result property="unitNo" column="UNIT_NO"/>
+    <result property="deptId" column="DEPT_ID"/>
+    <result property="deptName" column="DEPT_NAME"/>
+    <result property="deptNo" column="DEPT_NO"/>
+    <result property="businessPrimaryType" column="BUSINESS_PRIMARY_TYPE"/>
+    <result property="businessSecondType" column="BUSINESS_SECOND_TYPE"/>
+    <result property="businessThirdType" column="BUSINESS_THIRD_TYPE"/>
+    <result property="contractType" column="CONTRACT_TYPE"/>
+    <result property="workingHours" column="WORKING_HOURS"/>
+    <result property="post" column="POST"/>
+    <result property="enjoinDate" column="ENJOIN_DATE"/>
+    <result property="tryPeriod" column="TRY_PERIOD"/>
+    <result property="projectSource" column="PROJECT_SOURCE"/>
+    <result property="taxMonth" column="TAX_MONTH"/>
+    <result property="status" column="STATUS"/>
+    <result property="projectStatus" column="PROJECT_STATUS"/>
+    <result property="deleteFlag" column="DELETE_FLAG"/>
+    <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"/>
+    <result property="remark" column="REMARK"/>
+  </resultMap>
+</mapper>