Commit c7a94998 authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent b5d25c2c
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.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; 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.core.constant.ExcelAttributeConstants;
...@@ -53,6 +54,7 @@ public class EmployeeRegistrationPreInfoExportVo implements Serializable { ...@@ -53,6 +54,7 @@ public class EmployeeRegistrationPreInfoExportVo implements Serializable {
@ExcelAttribute(name = "入职日期", isDate = true) @ExcelAttribute(name = "入职日期", isDate = true)
@Schema(description = "入职日期") @Schema(description = "入职日期")
@ExcelProperty("入职日期") @ExcelProperty("入职日期")
@DateTimeFormat("yyyy-MM-dd")
private Date joinLeaveDate; private Date joinLeaveDate;
@ExcelAttribute(name = "确认人") @ExcelAttribute(name = "确认人")
......
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
a.server_item, a.server_item,
a.emp_nature, a.emp_nature,
a.contract_type, a.contract_type,
concat(a.file_province,a.file_city,a.file_town) as fileAdress concat(a.file_province,'/',a.file_city,if(a.file_town is null,'',concat('/',a.file_town))) as fileAdress
FROM employee_registration_pre a FROM employee_registration_pre a
<where> <where>
1=1 1=1
......
...@@ -186,6 +186,7 @@ ...@@ -186,6 +186,7 @@
a.delete_flag = '0' and a.IS_COMPLETE = '1' a.delete_flag = '0' and a.IS_COMPLETE = '1'
<include refid="employeeRegistrationPre_where"/> <include refid="employeeRegistrationPre_where"/>
</where> </where>
order by a.CREATE_TIME desc
</select> </select>
...@@ -234,6 +235,7 @@ ...@@ -234,6 +235,7 @@
a.delete_flag = '0' and a.IS_COMPLETE = '1' a.delete_flag = '0' and a.IS_COMPLETE = '1'
<include refid="employeeRegistrationPre_where"/> <include refid="employeeRegistrationPre_where"/>
</where> </where>
order by a.CREATE_TIME desc
</select> </select>
<!--tCompleteMonitor简单分页查询--> <!--tCompleteMonitor简单分页查询-->
......
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