Commit 52603ec0 authored by fangxinjiang's avatar fangxinjiang

项目规则配置-fxj

parent e6cfd6fd
...@@ -52,7 +52,7 @@ public class SysAutoDictItem extends BaseEntity { ...@@ -52,7 +52,7 @@ public class SysAutoDictItem extends BaseEntity {
/** /**
* 字典ID * 字典ID
*/ */
@ExcelAttribute(name = "字典ID", isNotEmpty = true, errorInfo = "字典ID不能为空") @ExcelAttribute(name = "字典ID")
@NotBlank(message = "字典ID不能为空") @NotBlank(message = "字典ID不能为空")
@ExcelProperty("字典ID") @ExcelProperty("字典ID")
@Schema(description = "字典ID") @Schema(description = "字典ID")
......
...@@ -62,20 +62,25 @@ public class TAutoEmpRuleInfo extends BaseEntity { ...@@ -62,20 +62,25 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/** /**
* 收集方式:0自动1 手动 * 收集方式:0自动1 手动
*/ */
@ExcelAttribute(name = "收集方式:0自动1 手动", isNotEmpty = true, errorInfo = "收集方式不能为空", maxLength = 1) @ExcelAttribute(name = "收集方式:0自动1 手动")
@NotBlank(message = "收集方式:0自动1 手动不能为空")
@Length(max = 1, message = "收集方式:0自动1 手动不能超过1个字符") @Length(max = 1, message = "收集方式:0自动1 手动不能超过1个字符")
@ExcelProperty("收集方式:0自动1 手动") @ExcelProperty("收集方式:0自动1 手动")
@Schema(description = "收集方式:0自动1 手动") @Schema(description = "收集方式:0自动1 手动")
private String collectType; private String collectType;
/**
* 推送类型
*/
@ExcelAttribute(name = "推送类型")
@ExcelProperty("推送类型")
@Schema(description = "推送类型 0 入职日期")
private String pushType;
/** /**
* 推送时间 * 推送时间
*/ */
@ExcelAttribute(name = "推送时间", isNotEmpty = true, errorInfo = "推送时间不能为空", isDate = true) @ExcelAttribute(name = "推送时间")
@NotBlank(message = "推送时间不能为空")
@ExcelProperty("推送时间") @ExcelProperty("推送时间")
@Schema(description = "推送时间") @Schema(description = "推送时间")
private Date pushDate; private String pushDate;
/** /**
* 员工类型 * 员工类型
*/ */
...@@ -119,7 +124,7 @@ public class TAutoEmpRuleInfo extends BaseEntity { ...@@ -119,7 +124,7 @@ public class TAutoEmpRuleInfo extends BaseEntity {
/** /**
* 业务细分(同合的业务细分) * 业务细分(同合的业务细分)
*/ */
@ExcelAttribute(name = "业务细分(同合的业务细分)", isNotEmpty = true, errorInfo = "业务细分不能为空", maxLength = 32) @ExcelAttribute(name = "业务细分(同合的业务细分)")
@NotBlank(message = "业务细分(同合的业务细分)不能为空") @NotBlank(message = "业务细分(同合的业务细分)不能为空")
@Length(max = 32, message = "业务细分(同合的业务细分)不能超过32个字符") @Length(max = 32, message = "业务细分(同合的业务细分)不能超过32个字符")
@ExcelProperty("业务细分(同合的业务细分)") @ExcelProperty("业务细分(同合的业务细分)")
......
...@@ -91,6 +91,12 @@ public class TAutoMainRel extends BaseEntity { ...@@ -91,6 +91,12 @@ public class TAutoMainRel extends BaseEntity {
@Schema(description = "服务状态:0正常 1停止服务 2冻结") @Schema(description = "服务状态:0正常 1停止服务 2冻结")
@TableField(exist = false) @TableField(exist = false)
private String stopFlag; private String stopFlag;
/**
* 岗位是否统一
*/
@ExcelAttribute(name = "岗位是否统一", maxLength = 1)
@Schema(description = "岗位是否统一 0是 1 否")
private String postFlag;
/** /**
* 项目名称 * 项目名称
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.annotation.write.style.HeadStyle;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
...@@ -42,6 +43,7 @@ import java.util.Date; ...@@ -42,6 +43,7 @@ import java.util.Date;
* @date 2025-03-13 15:15:26 * @date 2025-03-13 15:15:26
*/ */
@Data @Data
@ColumnWidth(30)
@Schema(description = "项目配置表主表") @Schema(description = "项目配置表主表")
public class TAutoMainRelExportVo implements Serializable { public class TAutoMainRelExportVo implements Serializable {
/** /**
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<id property="id" column="ID"/> <id property="id" column="ID"/>
<result property="autoFlag" column="AUTO_FLAG"/> <result property="autoFlag" column="AUTO_FLAG"/>
<result property="collectType" column="COLLECT_TYPE"/> <result property="collectType" column="COLLECT_TYPE"/>
<result property="pushType" column="PUSH_TYPE"/>
<result property="pushDate" column="PUSH_DATE"/> <result property="pushDate" column="PUSH_DATE"/>
<result property="empType" column="EMP_TYPE"/> <result property="empType" column="EMP_TYPE"/>
<result property="empProvince" column="EMP_PROVINCE"/> <result property="empProvince" column="EMP_PROVINCE"/>
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
a.UPDATE_TIME, a.UPDATE_TIME,
a.DEPT_NO, a.DEPT_NO,
a.DEPT_ID, a.DEPT_ID,
a.MAIN_ID a.MAIN_ID,a.PUSH_TYPE
</sql> </sql>
<sql id="tAutoEmpRuleInfo_where"> <sql id="tAutoEmpRuleInfo_where">
<if test="tAutoEmpRuleInfo != null"> <if test="tAutoEmpRuleInfo != null">
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/> <result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="postFlag" column="POST_FLAG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
a.CREATE_NAME, a.CREATE_NAME,
a.CREATE_TIME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_TIME a.UPDATE_TIME,a.post_flag
</sql> </sql>
<sql id="tAutoMainRel_where"> <sql id="tAutoMainRel_where">
<if test="tAutoMainRel != null"> <if test="tAutoMainRel != null">
...@@ -95,7 +96,7 @@ ...@@ -95,7 +96,7 @@
a.CREATE_NAME, a.CREATE_NAME,
a.CREATE_TIME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_TIME a.UPDATE_TIME,a.post_flag
,b.DEPART_NAME,IFNULL(b.cs_name,'') csUserName,b.DEPART_NO dept_NO,IF(b.STOP_FLAG='0','是','否') STOP_FLAG ,b.DEPART_NAME,IFNULL(b.cs_name,'') csUserName,b.DEPART_NO dept_NO,IF(b.STOP_FLAG='0','是','否') STOP_FLAG
FROM t_auto_main_rel a FROM t_auto_main_rel a
left join t_settle_domain b on a.DEPT_ID = b.id left join t_settle_domain b on a.DEPT_ID = b.id
......
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