Skip to content

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

人员花名册

parent 98dd53e3
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 21 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPersonnelRoster.java
View file @ 328adaf6
......@@ -18,10 +18,12 @@
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
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.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -36,9 +38,8 @@ import java.util.Date;
*/
@Data
@TableName("t_personnel_roster")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "")
public class TPersonnelRoster extends BaseEntity {
public class TPersonnelRoster{
/**
* id
......@@ -46,6 +47,7 @@ public class TPersonnelRoster extends BaseEntity {
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("id")
@Schema(description = "id")
@HeadFontStyle(fontHeightInPoints = 11)
private String id;
/**
* 客户名称
......@@ -54,6 +56,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "客户名称不能超过50个字符")
@ExcelProperty("客户名称")
@Schema(description = "客户名称")
@HeadFontStyle(fontHeightInPoints = 11)
private String customerName;
/**
* 项目名称
......@@ -62,6 +65,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "项目名称不能超过50个字符")
@ExcelProperty("项目名称")
@Schema(description = "项目名称")
@HeadFontStyle(fontHeightInPoints = 11)
private String departName;
/**
* 项目编码
......@@ -70,6 +74,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码")
@Schema(description = "项目编码")
@HeadFontStyle(fontHeightInPoints = 11)
private String departNo;
/**
* 业务类型
......@@ -78,6 +83,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "业务类型不能超过50个字符")
@ExcelProperty("业务类型")
@Schema(description = "业务类型")
@HeadFontStyle(fontHeightInPoints = 11)
private String businessPrimary;
/**
* 二级分类
......@@ -86,6 +92,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "二级分类不能超过50个字符")
@ExcelProperty("二级分类")
@Schema(description = "二级分类")
@HeadFontStyle(fontHeightInPoints = 11)
private String businessSecond;
/**
* 三级分类
......@@ -94,6 +101,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "三级分类不能超过50个字符")
@ExcelProperty("三级分类")
@Schema(description = "三级分类")
@HeadFontStyle(fontHeightInPoints = 11)
private String businessThird;
/**
* 标签
......@@ -102,6 +110,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "标签不能超过50个字符")
@ExcelProperty("标签")
@Schema(description = "标签")
@HeadFontStyle(fontHeightInPoints = 11)
private String label;
/**
* 条线类型
......@@ -110,6 +119,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "条线类型不能超过50个字符")
@ExcelProperty("条线类型")
@Schema(description = "条线类型")
@HeadFontStyle(fontHeightInPoints = 11)
private String businessType;
/**
* BU归属
......@@ -118,14 +128,16 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 30, message = "BU归属不能超过30个字符")
@ExcelProperty("BU归属")
@Schema(description = "BU归属")
@HeadFontStyle(fontHeightInPoints = 11)
private String buBelong;
/**
* 员工类型
*/
@ExcelAttribute(name = "员工类型", maxLength = 20)
@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Length(max = 20, message = "员工类型不能超过20个字符")
@ExcelProperty("员工类型")
@Schema(description = "员工类型")
@HeadFontStyle(fontHeightInPoints = 11)
private String empType;
/**
* 员工姓名
......@@ -134,14 +146,16 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 20, message = "员工姓名不能超过20个字符")
@ExcelProperty("员工姓名")
@Schema(description = "员工姓名")
@HeadFontStyle(fontHeightInPoints = 11)
private String empName;
/**
* 性别
*/
@ExcelAttribute(name = "性别", maxLength = 10)
@ExcelAttribute(name = "性别", maxLength = 10,isDataId = true,readConverterExp = "1=男,2=女")
@Length(max = 10, message = "性别不能超过10个字符")
@ExcelProperty("性别")
@Schema(description = "性别")
@HeadFontStyle(fontHeightInPoints = 11)
private String empSex;
/**
* 出生日期
......@@ -149,6 +163,7 @@ public class TPersonnelRoster extends BaseEntity {
@ExcelAttribute(name = "出生日期", isDate = true)
@ExcelProperty("出生日期")
@Schema(description = "出生日期")
@HeadFontStyle(fontHeightInPoints = 11)
private Date empBirthDate;
/**
* 年龄
......@@ -157,6 +172,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 3, message = "年龄不能超过3个字符")
@ExcelProperty("年龄")
@Schema(description = "年龄")
@HeadFontStyle(fontHeightInPoints = 11)
private String empAge;
/**
* 身份证号
......@@ -165,6 +181,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 20, message = "身份证号不能超过20个字符")
@ExcelProperty("身份证号")
@Schema(description = "身份证号")
@HeadFontStyle(fontHeightInPoints = 11)
private String empIdcard;
/**
* 银行卡号
......@@ -173,6 +190,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 25, message = "银行卡号不能超过25个字符")
@ExcelProperty("银行卡号")
@Schema(description = "银行卡号")
@HeadFontStyle(fontHeightInPoints = 11)
private String bankNo;
/**
* 开户行总行
......@@ -181,22 +199,25 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "开户行总行不能超过50个字符")
@ExcelProperty("开户行总行")
@Schema(description = "开户行总行")
@HeadFontStyle(fontHeightInPoints = 11)
private String bankName;
/**
* 开户行-省
*/
@ExcelAttribute(name = "开户行-省", maxLength = 30)
@ExcelAttribute(name = "开户行-省", maxLength = 30,isArea = true)
@Length(max = 30, message = "开户行-省不能超过30个字符")
@ExcelProperty("开户行-省")
@Schema(description = "开户行-省")
@HeadFontStyle(fontHeightInPoints = 11)
private String bankProvince;
/**
* 开户行-市
*/
@ExcelAttribute(name = "开户行-市", maxLength = 30)
@ExcelAttribute(name = "开户行-市", maxLength = 30,isArea = true,parentField = "bankProvince")
@Length(max = 30, message = "开户行-市不能超过30个字符")
@ExcelProperty("开户行-市")
@Schema(description = "开户行-市")
@HeadFontStyle(fontHeightInPoints = 11)
private String bankCity;
/**
* 开户行支行
......@@ -205,6 +226,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "开户行支行不能超过50个字符")
@ExcelProperty("开户行支行")
@Schema(description = "开户行支行")
@HeadFontStyle(fontHeightInPoints = 11)
private String bankNameSub;
/**
* 手机号码
......@@ -213,54 +235,61 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 15, message = "手机号码不能超过15个字符")
@ExcelProperty("手机号码")
@Schema(description = "手机号码")
@HeadFontStyle(fontHeightInPoints = 11)
private String empPhone;
/**
* 档案地-省
*/
@ExcelAttribute(name = "档案地-省", maxLength = 30)
@ExcelAttribute(name = "档案地-省", maxLength = 30,isArea = true)
@Length(max = 30, message = "档案地-省不能超过30个字符")
@ExcelProperty("档案地-省")
@Schema(description = "档案地-省")
@HeadFontStyle(fontHeightInPoints = 11)
private String empProvince;
/**
* 档案地-市
*/
@ExcelAttribute(name = "档案地-市", maxLength = 30)
@ExcelAttribute(name = "档案地-市", maxLength = 30,isArea = true,parentField = "empProvince")
@Length(max = 30, message = "档案地-市不能超过30个字符")
@ExcelProperty("档案地-市")
@Schema(description = "档案地-市")
@HeadFontStyle(fontHeightInPoints = 11)
private String empCity;
/**
* 档案地-县
*/
@ExcelAttribute(name = "档案地-县", maxLength = 30)
@ExcelAttribute(name = "档案地-县", maxLength = 30,isArea = true,parentField = "empCity")
@Length(max = 30, message = "档案地-县不能超过30个字符")
@ExcelProperty("档案地-县")
@Schema(description = "档案地-县")
@HeadFontStyle(fontHeightInPoints = 11)
private String empTown;
/**
* 社保缴纳地-省
*/
@ExcelAttribute(name = "社保缴纳地", maxLength = 50)
@ExcelAttribute(name = "社保缴纳地", maxLength = 50,isArea = true)
@Length(max = 50, message = "社保缴纳地不能超过50个字符")
@ExcelProperty("社保缴纳地")
@Schema(description = "社保缴纳地")
@HeadFontStyle(fontHeightInPoints = 11)
private String socialProvince;
/**
* 社保缴纳地-市
*/
@ExcelAttribute(name = "社保缴纳地-市", maxLength = 50)
@ExcelAttribute(name = "社保缴纳地-市", maxLength = 50,isArea = true,parentField = "socialProvince")
@Length(max = 50, message = "社保缴纳地-市不能超过50个字符")
@ExcelProperty("社保缴纳地-市")
@Schema(description = "社保缴纳地-市")
@HeadFontStyle(fontHeightInPoints = 11)
private String socialCity;
/**
* 社保缴纳地-县
*/
@ExcelAttribute(name = "社保缴纳地-县", maxLength = 50)
@ExcelAttribute(name = "社保缴纳地-县", maxLength = 50,isArea = true,parentField = "socialCity")
@Length(max = 50, message = "社保缴纳地-县不能超过50个字符")
@ExcelProperty("社保缴纳地-县")
@Schema(description = "社保缴纳地-县")
@HeadFontStyle(fontHeightInPoints = 11)
private String socialTown;
/**
......@@ -270,6 +299,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 32, message = "合同申请编号不能超过32个字符")
@ExcelProperty("合同申请编号")
@Schema(description = "合同申请编号")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractApplyNo;
/**
* 合同起始时间
......@@ -278,6 +308,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 20, message = "合同起始时间不能超过20个字符")
@ExcelProperty("合同起始时间")
@Schema(description = "合同起始时间")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractStart;
/**
* 合同截止时间
......@@ -286,38 +317,43 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 20, message = "合同截止时间不能超过20个字符")
@ExcelProperty("合同截止时间")
@Schema(description = "合同截止时间")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractEnd;
/**
* 合同类型
*/
@ExcelAttribute(name = "合同类型", maxLength = 10)
@ExcelAttribute(name = "合同类型")
@Length(max = 10, message = "合同类型不能超过10个字符")
@ExcelProperty("合同类型")
@Schema(description = "合同类型")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractType;
/**
* 业务细分
*/
@ExcelAttribute(name = "业务细分", maxLength = 20)
@ExcelAttribute(name = "业务细分")
@Length(max = 20, message = "业务细分不能超过20个字符")
@ExcelProperty("业务细分")
@Schema(description = "业务细分")
@HeadFontStyle(fontHeightInPoints = 11)
private String businessDetail;
/**
* 签订类型
*/
@ExcelAttribute(name = "签订类型", maxLength = 20)
@ExcelAttribute(name = "签订类型")
@Length(max = 20, message = "签订类型不能超过20个字符")
@ExcelProperty("签订类型")
@Schema(description = "签订类型")
@HeadFontStyle(fontHeightInPoints = 11)
private String signType;
/**
* 签订期限
*/
@ExcelAttribute(name = "签订期限", maxLength = 10)
@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Length(max = 10, message = "签订期限不能超过10个字符")
@ExcelProperty("签订期限")
@Schema(description = "签订期限")
@HeadFontStyle(fontHeightInPoints = 11)
private String signTerm;
/**
* 合同甲方
......@@ -326,6 +362,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 50, message = "合同甲方不能超过50个字符")
@ExcelProperty("合同甲方")
@Schema(description = "合同甲方")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractPartyA;
/**
* 合同岗位
......@@ -334,14 +371,16 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 20, message = "合同岗位不能超过20个字符")
@ExcelProperty("合同岗位")
@Schema(description = "合同岗位")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractPost;
/**
* 工时制
*/
@ExcelAttribute(name = "工时制", maxLength = 10)
@ExcelAttribute(name = "工时制",maxLength = 10,isDataId = true,dataType = ExcelAttributeConstants.WORKING_HOURS)
@Length(max = 10, message = "工时制不能超过10个字符")
@ExcelProperty("工时制")
@Schema(description = "工时制")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractTaskTime;
/**
* 合同编码
......@@ -350,6 +389,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 30, message = "合同编码不能超过30个字符")
@ExcelProperty("合同编码")
@Schema(description = "合同编码")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractCode;
/**
* 合同创建人
......@@ -358,6 +398,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 10, message = "合同创建人不能超过10个字符")
@ExcelProperty("合同创建人")
@Schema(description = "合同创建人")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractCreater;
/**
* 合同创建时间
......@@ -366,6 +407,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 10, message = "合同创建时间不能超过10个字符")
@ExcelProperty("合同创建时间")
@Schema(description = "合同创建时间")
@HeadFontStyle(fontHeightInPoints = 11)
private String contractCreateTime;
/**
* 数据生产月
......@@ -374,6 +416,7 @@ public class TPersonnelRoster extends BaseEntity {
@Length(max = 10, message = "数据生产月不能超过10个字符")
@ExcelProperty("数据生产月")
@Schema(description = "数据生产月")
@HeadFontStyle(fontHeightInPoints = 11)
private String dataCreateMonth;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPersonnelRosterSearchVo.java
View file @ 328adaf6
......@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/**
* @author fxj
......@@ -52,5 +53,14 @@ public class TPersonnelRosterSearchVo extends TPersonnelRoster {
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
/**
* @Author fxj
* 业务类型
**/
private List<String> businessTypes;
/**
* @Author fxj
* BU归属
**/
private List<String> buBelongs;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TPersonnelRosterController.java
View file @ 328adaf6
......@@ -130,7 +130,6 @@ public class TPersonnelRosterController {
**/
@Operation(description = "导出 hasPermission('demo_tpersonnelroster-export')")
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('demo_tpersonnelroster-export')")
public void export(HttpServletResponse response, @RequestBody TPersonnelRosterSearchVo searchVo) {
tPersonnelRosterService.listExport(response,searchVo);
}
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPersonnelRosterServiceImpl.java
View file @ 328adaf6
......@@ -46,6 +46,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -179,6 +180,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
r.setBankNameSub(rosterVo.getBankSubName());
r.setBankProvince(rosterVo.getBankProvince());
}
r.setDataCreateMonth(DateUtil.getYearAndMonth(LocalDateTime.now(),0));
}
this.saveBatch(list);
}
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPersonnelRosterMapper.xml
View file @ 328adaf6
......@@ -240,6 +240,20 @@
AND a.DATA_CREATE_MONTH = #{tPersonnelRoster.dataCreateMonth}
</if>
<if test="tPersonnelRoster.businessTypes != null and tPersonnelRoster.businessTypes.size() > 0">
AND a.BUSINESS_TYPE in
<foreach item="item" index="index" collection="tPersonnelRoster.businessTypes" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="tPersonnelRoster.buBelongs != null and tPersonnelRoster.buBelongs.size() > 0">
AND a.BU_BELONG in
<foreach item="item" index="index" collection="tPersonnelRoster.buBelongs" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</if>
</sql>
<!--tPersonnelRoster简单分页查询-->
......@@ -260,7 +274,7 @@
e.EMP_PHONE as 'EMP_PHONE',c1.FILE_PROVINCE as 'EMP_PROVINCE',c1.FILE_CITY as 'EMP_CITY',c1.FILE_TOWN as 'EMP_TOWN',
p.SOCIAL_PROVINCE as 'SOCIAL_PROVINCE',p.SOCIAL_CITY as 'SOCIAL_CITY',p.SOCIAL_TOWN as 'SOCIAL_TOWN',c1.APPLY_NO as 'CONTRACT_APPLY_NO',
c1.CONTRACT_START as 'CONTRACT_START',c1.CONTRACT_END as 'CONTRACT_END',c1.CONTRACT_NAME as 'CONTRACT_TYPE',c1.CONTRACT_SUB_NAME as 'BUSINESS_DETAIL',
c1.SITUATION as 'SIGN_TERM',c1.CONTRACT_TYPE as 'SIGN_TYPE',
c1.SITUATION as 'SIGN_TYPE',c1.CONTRACT_TYPE as 'SIGN_TERM',
c1.CONTRACT_PARTY as 'CONTRACT_PARTY_A',c1.POST as 'CONTRACT_POST',c1.WORKING_HOURS as 'CONTRACT_TASK_TIME',
c1.CONTRACT_NO as 'CONTRACT_CODE',c1.CREATE_NAME as 'CONTRACT_CREATER',c1.CREATE_TIME as 'CONTRACT_CREATE_TIME'
from
......@@ -302,7 +316,7 @@
<include refid="Base_Column_List"/>
from t_personnel_roster a
<where>
a.DELETE_FLAG = '0'
1=1
<include refid="tPersonnelRoster_where"/>
</where>
order by a.CREATE_TIME desc
......
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