招聘管理V2：团队管理页面中间入职人次统计调整

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omTeamManageList.jsp

@@ -93,7 +93,7 @@ $(document).ready(function() {
 		    }
 			,{
    		        field: 'candidateCount',
-   		        title: '用户总数',
+   		        title: '当前用户总数',
    		        sortable: false,
    		        sortName: 'candidateCount',
                    formatter:function(value, row , index){
@@ -102,7 +102,7 @@ $(document).ready(function() {
    		    }
 			,{
    		        field: 'followupCount',
-   		        title: '正在跟进',
+   		        title: '当前正在跟进',
    		        sortable: false,
    		        sortName: 'followupCount',
                    formatter:function(value, row , index){
@@ -129,7 +129,7 @@ $(document).ready(function() {
    		    }
 			,{
    		        field: 'onthejobCount',
-   		        title: '在职人数',
+   		        title: '在职',
    		        sortable: false,
    		        sortName: 'onthejobCount',
                    formatter:function(value, row , index){
@@ -319,7 +319,7 @@ $(document).ready(function() {
 				<div class="col-sm-3">					
 					<div class="clearfix stat-detail">
 						<div class="label-body header-data"><span>0</span></div>
-						<div class="label-body">在职人数</div>
+						<div class="label-body">入职人次</div>
 					</div>
 				</div>
 			</a>

happy-job-module-crm/src/main/java/com/jeeplus/modules/omcandidate/mapper/xml/OmTeamManageMapper.xml

@@ -24,6 +24,18 @@
 		UNION ALL
 		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b ORDER BY b.id DESC LIMIT 999999999) as p GROUP BY p.candidate_id HAVING p.type <> 2 ORDER BY p.id) AS s left join om_candidate o on o.id=s.candidate_id where o.status=7
 	</select>
+	<!-- 根据时间获取所有招聘专员的候选人数据统计 （页面中间）-->
+	<select id="findAllCandidateDataByDate" parameterType="OmTeamManage" resultType="java.lang.Integer">
+		SELECT SUM(c.count) FROM 
+			(SELECT COUNT(d.id) AS count FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.generate_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND (d.status = 2 OR d.status = 3)
+			UNION ALL
+			SELECT COUNT(d.id) AS count FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.generate_time &lt; #{startSearchDate} AND (d.status = 2 OR d.status = 3)
+			AND d.candidate_track_id IN (SELECT DISTINCT e.candidate_track_id FROM om_candidate_track_detail e WHERE e.track_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND e.status = 5)) AS c
+		UNION ALL
+		SELECT COUNT(d.id) FROM om_candidate_track_detail d WHERE d.track_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND d.status = 5
+		UNION ALL
+		SELECT COUNT(d.id) FROM om_candidate_track_detail d WHERE d.onboarding_date BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND d.status = 7
+	</select>
 	<!-- 获取招聘专员的候选人数据统计 -->
 	<select id="findCandidateDataCount" parameterType="OmTeamManage" resultType="java.lang.Integer">
 		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b ORDER BY b.id DESC LIMIT 999999999) as p GROUP BY p.candidate_id HAVING p.type &lt;&gt; 2 AND p.belong_user = #{name} ORDER BY p.id) AS s
@@ -36,16 +48,4 @@
 		UNION ALL
 		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b ORDER BY b.id DESC LIMIT 999999999) as p GROUP BY p.candidate_id HAVING p.type &lt;&gt; 2 AND p.belong_user = #{name} ORDER BY p.id) AS s left join om_candidate o on o.id=s.candidate_id where o.status=7
 	</select>
-	<!-- 根据时间获取所有招聘专员的候选人数据统计 -->
-	<select id="findAllCandidateDataByDate" parameterType="OmTeamManage" resultType="java.lang.Integer">
-		SELECT SUM(c.count) FROM 
-			(SELECT COUNT(d.id) AS count FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.generate_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND (d.status = 2 OR d.status = 3)
-			UNION ALL
-			SELECT COUNT(d.id) AS count FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.generate_time &lt; #{startSearchDate} AND (d.status = 2 OR d.status = 3)
-			AND d.candidate_track_id IN (SELECT DISTINCT e.candidate_track_id FROM om_candidate_track_detail e WHERE e.track_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND e.status = 5)) AS c
-		UNION ALL
-		SELECT COUNT(d.id) FROM om_candidate_track_detail d WHERE d.track_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND d.status = 5
-		UNION ALL
-		SELECT COUNT(d.id) FROM om_candidate_track_detail d WHERE d.track_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND d.status = 7
-	</select>
 </mapper>