Commit 90de898a authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 3929f27f
......@@ -1757,7 +1757,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
@Override
public R<List<TEmployeeContractPreNewDetailVo>> getDetailList(ContractAlertSearchVo tEmployeeContractPreNew) {
//系统会自动拉取当前客服且“预计合同发起时间”为空的或为今日及今日之前的,续签状态为“待发起、发起失败、审核不通过、签署失败”的合同信息
//续签状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署
//续签状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署 11系统自动撤销
List<String> statusList = new ArrayList<>();
statusList.add(CommonConstants.ONE_STRING);
statusList.add(CommonConstants.FIVE_STRING);
......
......@@ -191,7 +191,7 @@
AND a.ID = #{tEmpContractAlert.id}
</if>
<if test="tEmpContractAlert.empName != null and tEmpContractAlert.empName.trim() != ''">
AND a.EMP_NAME = #{tEmpContractAlert.empName}
AND a.EMP_NAME like concat('%', #{tEmpContractAlert.empName}, '%')
</if>
<if test="tEmpContractAlert.empId != null and tEmpContractAlert.empId.trim() != ''">
AND a.EMP_ID = #{tEmpContractAlert.empId}
......@@ -200,7 +200,7 @@
AND a.DEPT_ID = #{tEmpContractAlert.deptId}
</if>
<if test="tEmpContractAlert.project != null and tEmpContractAlert.project.trim() != ''">
AND a.PROJECT = #{tEmpContractAlert.project}
AND a.PROJECT like concat('%', #{tEmpContractAlert.project}, '%')
</if>
<if test="tEmpContractAlert.deptNoList != null and tEmpContractAlert.deptNoList.size > 0">
AND a.PROJECT in
......
......@@ -710,7 +710,7 @@
b.emp_idcard,
b.emp_phone,
b.employee_nature,
b.position,
b.post as 'position',
b.customer_username,
b.customer_user_loginname,
b.sign_type,
......
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