Commit e7f1ad17 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 29435f37
...@@ -99,4 +99,9 @@ public class TEmployeeContractPreExportVo implements Serializable { ...@@ -99,4 +99,9 @@ public class TEmployeeContractPreExportVo implements Serializable {
@Schema(description = "状态") @Schema(description = "状态")
@ExcelProperty("状态") @ExcelProperty("状态")
private String processStatus; private String processStatus;
@ExcelAttribute(name = "是否已建档")
@Schema(description = "是否已建档")
@ExcelProperty("是否已建档")
private String archivesIsCreate;
} }
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
,TASK_TYPE ,TASK_TYPE
,TASK_END_STANDARD,contract_flag,a.CONTRACT_SUB_NAME ,TASK_END_STANDARD,contract_flag,a.CONTRACT_SUB_NAME
,a.request_id ,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time,a.archives_is_create ,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
</sql> </sql>
<sql id="tEmployeeContractPre_where"> <sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null"> <if test="tEmployeeContractPre != null">
...@@ -276,7 +276,10 @@ ...@@ -276,7 +276,10 @@
<select id="getTEmployeeContractPrePage" resultMap="tEmployeeContractPreMap"> <select id="getTEmployeeContractPrePage" resultMap="tEmployeeContractPreMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
,if(b.id is null,'1','0') archives_is_create
FROM t_employee_contract_pre a FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where> <where>
1=1 1=1
<include refid="tEmployeeContractPre_where"/> <include refid="tEmployeeContractPre_where"/>
...@@ -334,8 +337,11 @@ ...@@ -334,8 +337,11 @@
WHEN a.process_status =6 THEN "签署中" WHEN a.process_status =6 THEN "签署中"
WHEN a.process_status =7 THEN "签署失败" WHEN a.process_status =7 THEN "签署失败"
WHEN a.process_status =8 THEN "电子待归档" WHEN a.process_status =8 THEN "电子待归档"
ELSE a.process_status END as process_status ELSE a.process_status END as process_status,
if(b.id is null,'否','是') archives_is_create
FROM t_employee_contract_pre a FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where> <where>
1=1 1=1
<include refid="tEmployeeContractPre_where"/> <include refid="tEmployeeContractPre_where"/>
......
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