Commit c536570c authored by fangxinjiang's avatar fangxinjiang

项目档案无岗位更新岗位fxj 2024-04-17

parent b349c5f8
...@@ -34,7 +34,7 @@ public class EmployeeConstants { ...@@ -34,7 +34,7 @@ public class EmployeeConstants {
public static final String CHECK_ERROR = "校验服务错误,请联系管理员!"; public static final String CHECK_ERROR = "校验服务错误,请联系管理员!";
public static final String CHECK_NO_RESPONSE = "校验服务器未返回,请联系管理员!"; public static final String CHECK_NO_RESPONSE = "校验服务器未返回,请联系管理员!";
public static final String MARRY_STATUS_NOT_NULL = "婚姻状况不可为空"; public static final String MARRY_STATUS_NOT_NULL = "婚姻状况不可为空";
public static final String POLITICAL_STATUS_NOT_NULL = "婚姻状况不可为空"; public static final String POLITICAL_STATUS_NOT_NULL = "政治面貌不可为空";
// 拦截合同使用 // 拦截合同使用
public static final String SITUATION_ONE = "正常签订"; public static final String SITUATION_ONE = "正常签订";
......
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
<result property="post" column="POST"/> <result property="post" column="POST"/>
<result property="remark" column="REMARK"/> <result property="remark" column="REMARK"/>
<result property="memo" column="MEMO"/> <result property="memo" column="MEMO"/>
<result property="tryPeriod" column="TRY_PERIOD"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -515,7 +516,8 @@ ...@@ -515,7 +516,8 @@
ELSE a.type END as "type", ELSE a.type END as "type",
b.REMARK, b.REMARK,
a.REMARK as memo, a.REMARK as memo,
a.CREATE_TIME a.CREATE_TIME,
a.TRY_PERIOD
FROM t_employee_contract_info a FROM t_employee_contract_info a
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
...@@ -593,7 +595,8 @@ ...@@ -593,7 +595,8 @@
count(1) CREATE_NUM, count(1) CREATE_NUM,
min(a.CONTRACT_START) START_DATE, min(a.CONTRACT_START) START_DATE,
max(a.CONTRACT_END) END_DATE, max(a.CONTRACT_END) END_DATE,
GROUP_CONCAT(concat(a.CONTRACT_START,'~',ifnull(a.CONTRACT_END,'')) ORDER BY a.CONTRACT_START asc) HISTORY GROUP_CONCAT(concat(a.CONTRACT_START,'~',ifnull(a.CONTRACT_END,'')) ORDER BY a.CONTRACT_START asc) HISTORY,
a.TRY_PERIOD
FROM t_employee_contract_info a FROM t_employee_contract_info a
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
......
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