招聘管理系统V2: 1.订单类型和用工类型设置默认值 2.解决团多管理招聘专员数据为0的问题

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

@@ -7,6 +7,10 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#recruitType1").removeAttr("style");//radio button靠左对齐	
+			//给radio button 赋默认值
+			var recruitType = $('input:radio[name="recruitType"]:checked').val();
+			if(!recruitType) $("#recruitType1").attr('checked',true);
+			
 			validateForm = $("#inputForm").validate({
 			 	rules: {
 			 		recruitType: {required:true}

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

@@ -7,6 +7,10 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#recruitType1").removeAttr("style");//radio button靠左对齐
+			//给radio button 赋默认值
+			var recruitType = $('input:radio[name="recruitType"]:checked').val();
+			if(!recruitType) $("#recruitType1").attr('checked',true);
+			
 			recruitTypeChange();
 			$('#cashbackDate').datetimepicker({
 		        format: "YYYY-MM-DD"

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

@@ -7,6 +7,9 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#candidateType1").removeAttr("style");//radio button靠左对齐
+			//给radio button 赋默认值
+			var candidateType = $('input:radio[name="candidateType"]:checked').val();
+			if(!candidateType) $("#candidateType1").attr('checked',true);
 			$('#interviewTime').datetimepicker({
 		        format: "HH:mm"
 		    });

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

@@ -18,15 +18,15 @@
 	</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 WHERE b.belong_time BETWEEN #{startSearchDate} AND #{endSearchDate} 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
+		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b WHERE b.belong_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) 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
 		UNION ALL
-		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b WHERE b.belong_time BETWEEN #{startSearchDate} AND #{endSearchDate} 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 IN (1,3,5)
+		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b WHERE b.belong_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) 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 IN (1,3,5)
 		UNION ALL
-		SELECT COUNT(d.id) FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.interview_time BETWEEN #{startSearchDate} AND #{endSearchDate} AND (d.status = 2 OR d.status = 3) AND d.track_by = #{name}
+		SELECT COUNT(d.id) FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.interview_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND (d.status = 2 OR d.status = 3) AND d.track_by = #{name}
 		UNION ALL
-		SELECT COUNT(d.id) FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.onboarding_date BETWEEN #{startSearchDate} AND #{endSearchDate} AND d.status = 7 AND d.track_by = #{name}
+		SELECT COUNT(d.id) FROM om_candidate_track_detail d LEFT JOIN om_candidate_track t ON t.id=d.candidate_track_id WHERE t.onboarding_date BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) AND d.status = 7 AND d.track_by = #{name}
 		UNION ALL
-		SELECT COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b WHERE b.belong_time BETWEEN #{startSearchDate} AND #{endSearchDate} 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 COUNT(s.id) FROM (SELECT p.* FROM (SELECT b.* FROM om_candidate_belong b WHERE b.belong_time BETWEEN #{startSearchDate} AND DATE_ADD(#{endSearchDate},INTERVAL 1 DAY) 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="findAllCandidateDataCount" resultType="java.lang.Integer">
@@ -39,13 +39,13 @@
 	<!-- 根据时间获取所有招聘专员的候选人数据统计 -->
 	<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.interview_time BETWEEN #{startSearchDate} AND #{endSearchDate} AND (d.status = 2 OR d.status = 3)
+			(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.interview_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.interview_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 #{endSearchDate} AND e.status = 5)) AS c
+			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 #{endSearchDate} AND d.status = 5
+		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 #{endSearchDate} AND d.status = 7
+		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>

happy-job-module-crm/src/main/java/com/jeeplus/modules/omcandidate/web/OmTeamManageController.java

@@ -58,6 +58,8 @@ public class OmTeamManageController extends BaseController {
 		Page<OmTeamManage> page = omTeamManageService.findPage(new Page<OmTeamManage>(request, response), omTeamManage); 
 		List<Integer> list;
 		OmTeamManage teamManage = new OmTeamManage();
+		teamManage.setStartSearchDate(omTeamManage.getStartSearchDate());
+		teamManage.setEndSearchDate(omTeamManage.getEndSearchDate());
 		for (int i = 0; i< page.getList().size();i++){
 			teamManage.setName(page.getList().get(i).getName());
 			list = omTeamManageService.findCandidateDataCount(teamManage);