Commit 616d01d4 authored by huyuchen's avatar huyuchen

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

parents 83f34798 e4bbf5c0
...@@ -26,7 +26,7 @@ mybatis-plus: ...@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value: 0 logic-not-delete-value: 0
configuration: configuration:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置 # spring security 配置
security: security:
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="DEBUG"> <root level="error">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="debug"/> <appender-ref ref="debug"/>
<appender-ref ref="error"/> <appender-ref ref="error"/>
......
...@@ -337,12 +337,13 @@ ...@@ -337,12 +337,13 @@
c1.CONTRACT_NO as 'CONTRACT_CODE',c1.CREATE_NAME as 'CONTRACT_CREATER',c1.CREATE_TIME as 'CONTRACT_CREATE_TIME', c1.CONTRACT_NO as 'CONTRACT_CODE',c1.CREATE_NAME as 'CONTRACT_CREATER',c1.CREATE_TIME as 'CONTRACT_CREATE_TIME',
d.id as "SETTLE_DOMAIN" d.id as "SETTLE_DOMAIN"
from from
(select MAX(c.CREATE_TIME),c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0' (select MAX(c.CREATE_TIME) as "CREATE_TIME",c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0'
GROUP BY c.DEPT_NO,c.EMP_IDCARD) t GROUP BY c.DEPT_NO,c.EMP_IDCARD) t
LEFT JOIN t_employee_info e on e.EMP_IDCARD=t.EMP_IDCARD LEFT JOIN t_employee_info e on e.EMP_IDCARD=t.EMP_IDCARD
LEFT JOIN t_employee_project p on p.EMP_IDCARD=t.EMP_IDCARD and p.DEPT_NO=t.DEPT_NO LEFT JOIN t_employee_project p on p.EMP_IDCARD=t.EMP_IDCARD and p.DEPT_NO=t.DEPT_NO
LEFT JOIN t_settle_domain d on d.DEPART_NO=t.DEPT_NO LEFT JOIN t_settle_domain d on d.DEPART_NO=t.DEPT_NO
INNER JOIN t_employee_contract_info c1 on c1.id=t.id GROUP BY t.DEPT_NO,t.EMP_IDCARD INNER JOIN t_employee_contract_info c1 on c1.EMP_IDCARD=t.EMP_IDCARD and c1.DEPT_NO=t.DEPT_NO and c1.CREATE_TIME=t.CREATE_TIME
GROUP BY t.DEPT_NO,t.EMP_IDCARD
<if test="tPersonnelRoster != null"> <if test="tPersonnelRoster != null">
<if test="tPersonnelRoster.limitStart != null"> <if test="tPersonnelRoster.limitStart != null">
limit #{tPersonnelRoster.limitStart},#{tPersonnelRoster.limitEnd} limit #{tPersonnelRoster.limitStart},#{tPersonnelRoster.limitEnd}
...@@ -351,13 +352,19 @@ ...@@ -351,13 +352,19 @@
</select> </select>
<select id="getTPersonnelRosterCount" resultType="java.lang.Integer"> <select id="getTPersonnelRosterCount" resultType="java.lang.Integer">
select count(1) select count(1)
from from (
(select MAX(c.CREATE_TIME),c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0' select count(1)
GROUP BY c.DEPT_NO,c.EMP_IDCARD) t from (select MAX(c.CREATE_TIME) as "CREATE_TIME", c.id, c.EMP_IDCARD, c.DEPT_NO
INNER JOIN t_employee_info e on e.EMP_IDCARD=t.EMP_IDCARD from t_employee_contract_info c
INNER JOIN t_employee_project p on p.EMP_IDCARD=t.EMP_IDCARD and p.DEPT_NO=t.DEPT_NO WHERE c.IN_USE = 0
INNER JOIN t_settle_domain d on d.DEPART_NO=t.DEPT_NO and c.DELETE_FLAG = '0'
INNER JOIN t_employee_contract_info c1 on c1.id=t.id GROUP BY c.DEPT_NO, c.EMP_IDCARD) t
LEFT JOIN t_employee_info e on e.EMP_IDCARD = t.EMP_IDCARD
LEFT JOIN t_employee_project p on p.EMP_IDCARD = t.EMP_IDCARD and p.DEPT_NO = t.DEPT_NO
LEFT JOIN t_settle_domain d on d.DEPART_NO = t.DEPT_NO
INNER JOIN t_employee_contract_info c1 on c1.EMP_IDCARD=t.EMP_IDCARD and c1.DEPT_NO=t.DEPT_NO and c1.CREATE_TIME=t.CREATE_TIME
GROUP BY t.DEPT_NO, t.EMP_IDCARD
) a
</select> </select>
<select id="noPageCountDiy" resultType="java.lang.Integer"> <select id="noPageCountDiy" resultType="java.lang.Integer">
select select
......
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