Commit 2bfbc465 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 78dd39a9 7201f309
......@@ -99,4 +99,9 @@ public class TEmployeeContractPreExportVo implements Serializable {
@Schema(description = "状态")
@ExcelProperty("状态")
private String processStatus;
@ExcelAttribute(name = "是否已建档")
@Schema(description = "是否已建档")
@ExcelProperty("是否已建档")
private String archivesIsCreate;
}
......@@ -545,7 +545,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.in(TEmployeeContractPre::getProcessStatus, CommonConstants.socialInfoStatus)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(contractPre)) {
contractPre.setProcessStatus(CommonConstants.TWO_STRING);
contractPre.setProcessStatus("1".equals(contractPre.getSignType()) ?
CommonConstants.TWO_STRING : CommonConstants.SIX_STRING);
contractPre.setContractId(tEmployeeContractInfo.getId());
contractPre.setErrorInfo("");
contractPre.setErrorTime(null);
......
......@@ -95,87 +95,87 @@
<result property="archivesIsCreate" column="archives_is_create"/>
</resultMap>
<sql id="Base_Column_List">
id
,dept_name
,dept_no
,dept_id
,employee_name
,emp_idcard
,emp_phone
,position
,join_leave_date
,contract_type
,process_status
,signatory
,customer_username
,customer_user_loginname
,sign_type
,fadada_template
,fadada_template_id
,data_source
,expected_confirm_time
,expected_collection_time
,contract_start
,contract_end
,situation
,try_period_start
,try_period_end
,config_name
,update_flag
,try_period_type
,try_period
,salary_type
,salary_standard_per_hour
,salary_standard_per_piece
,config_id
,working_dept
,working_company
,risk_buy_desc
,other_wage
,labor_cost
,default_amount
,settlement_cycle
,payment_time
,payment_type
,dispatch_period_start
,dispatch_period_end
,work_type
,work_day_count
,work_day
,work_hours
,other_work_day
,internship_period
,internship_period_start
,internship_period_end
,post_type
,post
,work_address
,contract_term
,contract_duration_year
,contract_duration_month
,register_id
,sign_flag
,error_info
,contract_id
,revoke_reason
,working_reward
,working_hours
,dispatch_period_year
,dispatch_period_month
,error_time
,contract_end_type
,confirm_emp_select
,timeout_elec_sign
,update_time
,create_by
,create_name
,create_time
,update_by
,TASK
,TASK_TYPE
,TASK_END_STANDARD,contract_flag,a.CONTRACT_SUB_NAME
a.id
,a.dept_name
,a.dept_no
,a.dept_id
,a.employee_name
,a.emp_idcard
,a.emp_phone
,a.position
,a.join_leave_date
,a.contract_type
,a.process_status
,a.signatory
,a.customer_username
,a.customer_user_loginname
,a.sign_type
,a.fadada_template
,a.fadada_template_id
,a.data_source
,a.expected_confirm_time
,a.expected_collection_time
,a.contract_start
,a.contract_end
,a.situation
,a.try_period_start
,a.try_period_end
,a.config_name
,a.update_flag
,a.try_period_type
,a.try_period
,a.salary_type
,a.salary_standard_per_hour
,a.salary_standard_per_piece
,a.config_id
,a.working_dept
,a.working_company
,a.risk_buy_desc
,a.other_wage
,a.labor_cost
,a.default_amount
,a.settlement_cycle
,a.payment_time
,a.payment_type
,a.dispatch_period_start
,a.dispatch_period_end
,a.work_type
,a.work_day_count
,a.work_day
,a.work_hours
,a.other_work_day
,a.internship_period
,a.internship_period_start
,a.internship_period_end
,a.post_type
,a.post
,a.work_address
,a.contract_term
,a.contract_duration_year
,a.contract_duration_month
,a.register_id
,a.sign_flag
,a.error_info
,a.contract_id
,a.revoke_reason
,a.working_reward
,a.working_hours
,a.dispatch_period_year
,a.dispatch_period_month
,a.error_time
,a.contract_end_type
,a.confirm_emp_select
,a.timeout_elec_sign
,a.update_time
,a.create_by
,a.create_name
,a.create_time
,a.update_by
,a.TASK
,a.TASK_TYPE
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,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 id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null">
......@@ -276,7 +276,10 @@
<select id="getTEmployeeContractPrePage" resultMap="tEmployeeContractPreMap">
SELECT
<include refid="Base_Column_List"/>
,if(b.id is null,'1','0') archives_is_create
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>
1=1
<include refid="tEmployeeContractPre_where"/>
......@@ -334,8 +337,11 @@
WHEN a.process_status =6 THEN "签署中"
WHEN a.process_status =7 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
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>
1=1
<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