Commit e605149b authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_导出优化

parent 02be0a0c
...@@ -405,17 +405,22 @@ ...@@ -405,17 +405,22 @@
<!-- 数量 --> <!-- 数量 -->
<select id="getTEmpMainAllCountOneWork" resultType="java.lang.Integer"> <select id="getTEmpMainAllCountOneWork" resultType="java.lang.Integer">
SELECT SELECT
count(1) count(1) from (
SELECT
1
FROM t_complete_monitor a FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id left join t_employee_info e on p.EMP_ID=e.id
left join t_emp_work_recording ew on e.id=ew.EMP_ID left join t_emp_work_recording ew on e.id=ew.EMP_ID
<where> <where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ew.id is not null and ew.DELETE_FLAG = '0' and EXISTS ( p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0 and ew.id is not null and ew.DELETE_FLAG = '0' and EXISTS (
select 1 from (select a.emp_id from t_emp_work_recording a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ew.emp_id select 1 from (select a.emp_id from t_emp_work_recording a GROUP BY a.EMP_ID HAVING count(1)>1) ea where
ea.emp_id=ew.emp_id
) )
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
group by ew.id
) a
</select> </select>
<!--导出统计list1主要工作经历--> <!--导出统计list1主要工作经历-->
...@@ -433,7 +438,7 @@ ...@@ -433,7 +438,7 @@
) )
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
ORDER BY e.emp_idcard DESC group by ew.id ORDER BY e.emp_idcard DESC
<if test="tCompleteMonitor != null"> <if test="tCompleteMonitor != null">
<if test="tCompleteMonitor.limitStart != null"> <if test="tCompleteMonitor.limitStart != null">
limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd} limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
...@@ -444,7 +449,9 @@ ...@@ -444,7 +449,9 @@
<!-- 数量 --> <!-- 数量 -->
<select id="getTEmpMainAllCountTwoFamily" resultType="java.lang.Integer"> <select id="getTEmpMainAllCountTwoFamily" resultType="java.lang.Integer">
SELECT SELECT
count(1) count(1) from (
SELECT
1
FROM t_complete_monitor a FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id left join t_employee_info e on p.EMP_ID=e.id
...@@ -455,6 +462,7 @@ ...@@ -455,6 +462,7 @@
) )
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
group by ef.id ) a
</select> </select>
<!--导出统计list2主要家庭成员信息--> <!--导出统计list2主要家庭成员信息-->
<select id="getTEmpMainAllListTwoFamily" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO"> <select id="getTEmpMainAllListTwoFamily" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
...@@ -472,7 +480,7 @@ ...@@ -472,7 +480,7 @@
) )
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
ORDER BY e.emp_idcard DESC group by ef.id ORDER BY e.emp_idcard DESC
<if test="tCompleteMonitor != null"> <if test="tCompleteMonitor != null">
<if test="tCompleteMonitor.limitStart != null"> <if test="tCompleteMonitor.limitStart != null">
limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd} limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
...@@ -483,7 +491,9 @@ ...@@ -483,7 +491,9 @@
<!-- 数量 --> <!-- 数量 -->
<select id="getTEmpMainAllCountThreeProfessional" resultType="java.lang.Integer"> <select id="getTEmpMainAllCountThreeProfessional" resultType="java.lang.Integer">
SELECT SELECT
count(1) count(1) from (
SELECT
1
FROM t_complete_monitor a FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id left join t_employee_info e on p.EMP_ID=e.id
...@@ -494,6 +504,7 @@ ...@@ -494,6 +504,7 @@
) )
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
group by ep.id ) a
</select> </select>
<!--导出统计list3职业资格信息--> <!--导出统计list3职业资格信息-->
<select id="getTEmpMainAllListThreeProfessional" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO"> <select id="getTEmpMainAllListThreeProfessional" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
...@@ -511,7 +522,7 @@ ...@@ -511,7 +522,7 @@
) )
<include refid="tCompleteMonitor_where"/> <include refid="tCompleteMonitor_where"/>
</where> </where>
ORDER BY e.emp_idcard DESC group by ep.id ORDER BY e.emp_idcard DESC
<if test="tCompleteMonitor != null"> <if test="tCompleteMonitor != null">
<if test="tCompleteMonitor.limitStart != null"> <if test="tCompleteMonitor.limitStart != null">
limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd} limit #{tCompleteMonitor.limitStart},#{tCompleteMonitor.limitEnd}
......
...@@ -135,4 +135,6 @@ public class SocialSoldierYsdAddVo implements Serializable { ...@@ -135,4 +135,6 @@ public class SocialSoldierYsdAddVo implements Serializable {
private String isAdd; private String isAdd;
@ExcelProperty("是否只续保【医保增员】") @ExcelProperty("是否只续保【医保增员】")
private String isXu; private String isXu;
@ExcelProperty("提示已缴费是否继续申报【医保增员】")
private String isShen;
} }
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<!-- 社保士兵医生大增加模板--> <!-- 社保士兵医生大增加模板-->
<select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo"> <select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo">
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,'' isBatch,'' isAutoMonth,'' isAdd,'' isXu ,'' isBatch,'是' isAutoMonth,'' isAdd,'' isXu,'是' isShen
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','2','3') and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','2','3')
and ( and (
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<!-- 社保士兵医生大减少模板--> <!-- 社保士兵医生大减少模板-->
<select id="getSocialSoldierYsdReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo"> <select id="getSocialSoldierYsdReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo">
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,'' isBatch,'' isAutoMonth,'' isAdd,'' isXu ,'' isBatch,'是' isAutoMonth,'' isAdd,'' isXu,'是' isShen
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','2','3') and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','2','3')
and ( and (
......
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