sunsail-platform-admin.git

			@@ -19,31 +19,31 @@
			<select id="countZcygBaseInfoList" resultType="java.util.Map">
			SELECT
			count(
			IF (t.dimissionType = '1', 1, NULL)
			IF (t2.dimissionType = '6', 1, NULL)
			) zclz,
			count(
			IF (t.dimissionType = '2', 1, NULL)
			IF (t2.dimissionType = '4', 1, NULL)
			) zdlz,
			count(
			IF (t.dimissionType = '4', 1, NULL)
			IF (t2.dimissionType = '3', 1, NULL)
			) gsct
			FROM
			t_emp_baseinfo t inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t.delFlag=0 and t.empStatus='1'
			FROM t_emp_dimissionlog t2 inner join
			t_emp_baseinfo t on t2.empId=t.empId inner join t_dept t1 on t.deptId=t1.DEPT_ID ${ew.customSqlSegment} and t2.delFlag=0 and t.empStatus='1'
			<choose>
			<when test="btime!=null and btime!='' and etime!=null and etime!=''">
			and date_format(t.createTime,'%Y-%m-%d') >= #{btime} and date_format(t.createTime,'%Y-%m-%d') <= #{etime}
			and date_format(t2.dimissionDate,'%Y-%m-%d') >= #{btime} and date_format(t2.dimissionDate,'%Y-%m-%d') <= #{etime}
			</when>
			<when test="index==0">
			and TO_DAYS(t.createTime) = TO_DAYS(NOW())
			and TO_DAYS(t2.dimissionDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t.createTime,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
			and date_format(t2.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
			</when>
			<otherwise>
			and YEAR(t.createTime)=YEAR(NOW())
			and YEAR(t2.dimissionDate)=YEAR(NOW())
			</otherwise>
			</choose>

			@@ -73,7 +73,7 @@
			and TO_DAYS(t.entryDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t.entryDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t.entryDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t.entryDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -97,7 +97,7 @@
			and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -120,7 +120,7 @@
			and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -146,7 +146,7 @@
			and TO_DAYS(t2.signingDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -171,7 +171,7 @@
			and TO_DAYS(t2.signingDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -196,7 +196,7 @@
			and TO_DAYS(t2.endDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.endDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.endDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -242,7 +242,7 @@
			and TO_DAYS(t2.returnDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.returnDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -275,7 +275,7 @@
			and TO_DAYS(t2.arbitrationDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.arbitrationDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -299,7 +299,7 @@
			and TO_DAYS(t2.injuredTime) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -320,7 +320,7 @@
			and TO_DAYS(t2.injuredTime) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -347,7 +347,7 @@
			and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -370,7 +370,7 @@
			and TO_DAYS(t2.applayDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -393,7 +393,7 @@
			and TO_DAYS(t2.physicalExamDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.physicalExamDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -416,7 +416,7 @@
			and TO_DAYS(t.certificateValidity) <= TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t.certificateValidity,'%Y-%m-%d')) <= YEARWEEK(now())
			and YEARWEEK(date_format(t.certificateValidity,'%Y-%m-%d'),1) <= YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t.certificateValidity,'%Y-%m') <= date_format(now(),'%Y-%m')
			@@ -437,7 +437,7 @@
			and TO_DAYS(t2.changeDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.changeDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -461,7 +461,7 @@
			and TO_DAYS(t2.badDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t2.badDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t2.badDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t2.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -537,7 +537,7 @@
			and TO_DAYS(t1.certificateValidity) <= TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.certificateValidity,'%Y-%m-%d')) <= YEARWEEK(now())
			and YEARWEEK(date_format(t1.certificateValidity,'%Y-%m-%d'),1) <= YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.certificateValidity,'%Y-%m') <= date_format(now(),'%Y-%m')
			@@ -566,7 +566,7 @@
			and TO_DAYS(t1.entryDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.entryDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.entryDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.entryDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -641,7 +641,7 @@
			and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -655,20 +655,20 @@


			<select id="zcbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
			select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1 and t1.delFlag=0 and t1.empStatus='1'
			select t1.* from t_emp_dimissionlog t inner join t_emp_baseinfo t1 on t.empId=t1.empId left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1 and t.delFlag=0 and t1.empStatus='1'
			and t2.DEPT_ID in
			<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
			#{item}
			</foreach>
			<choose>
			<when test="number==8">
			and t1.dimissionType = '1'
			and t.dimissionType = '6'
			</when>
			<when test="number==9">
			and t1.dimissionType = '2'
			and t.dimissionType = '4'
			</when>
			<when test="number==10">
			and t1.dimissionType = '4'
			and t.dimissionType = '3'
			</when>
			<otherwise>

			@@ -680,19 +680,19 @@
			</if>
			<choose>
			<when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
			and date_format(t1.createTime,'%Y-%m-%d') >= #{btime} and date_format(t1.createTime,'%Y-%m-%d') <= #{etime}
			and date_format(t.dimissionDate,'%Y-%m-%d') >= #{btime} and date_format(t1.dimissionDate,'%Y-%m-%d') <= #{etime}
			</when>
			<when test="index==0">
			and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
			and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
			and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
			</when>
			<otherwise>
			and YEAR(t1.createTime)=YEAR(NOW())
			and YEAR(t.dimissionDate)=YEAR(NOW())
			</otherwise>
			</choose>

			@@ -716,7 +716,7 @@
			and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -736,7 +736,7 @@
			and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -756,7 +756,7 @@
			and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -798,7 +798,7 @@
			and TO_DAYS(t1.endDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -830,7 +830,7 @@
			and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -900,7 +900,7 @@
			and TO_DAYS(t1.returnDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -932,7 +932,7 @@
			and TO_DAYS(t1.physicalExamDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -967,7 +967,7 @@
			and TO_DAYS(t1.arbitrationDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -1001,7 +1001,7 @@
			and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -1033,7 +1033,7 @@
			and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -1066,7 +1066,7 @@
			and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -1099,7 +1099,7 @@
			and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -1131,7 +1131,7 @@
			and TO_DAYS(t1.badDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
			@@ -1164,7 +1164,7 @@
			and TO_DAYS(t1.changeDate) = TO_DAYS(NOW())
			</when>
			<when test="index==1">
			and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
			and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d'),1) = YEARWEEK(now())
			</when>
			<when test="index==2">
			and date_format(t1.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')