update:人力资源表

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -58,15 +58,14 @@ public class NewsController extends BaseController {
 		
 		String clientId = queryInfo.getClientId();
 		
-		if (StringUtils.equalsIgnoreCase("student", clientId)) {
+		if (!StringUtils.equalsIgnoreCase("student", clientId)) {
+			queryInfo.setOrganIdList(webFeignService.queryOrganIdByUserId(user.getId(), clientId));
+		} else {
 			if (user == null || user.getId() == null) {
 				queryInfo.setOrganId(43);
 			} else {
 				queryInfo.setOrganId(user.getOrganId());
 			}
-			
-		}else{
-			queryInfo.setOrganIdList(webFeignService.queryOrganIdByUserId(user.getId(), clientId));
 		}
 		
 		Map<String, Object> params = new HashMap<String, Object>();

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/EmployeeInfo.java

@@ -113,6 +113,9 @@ public class EmployeeInfo {
 	private JobNatureEnum jobNature;
 	
 	private String hrbp;
+	
+	/** 下次回访时间 */
+	private java.util.Date nextVisitDate;
 
 	/**  */
 	private java.util.Date createTime;
@@ -408,6 +411,14 @@ public class EmployeeInfo {
 		this.jobNature = jobNature;
 	}
 
+	public java.util.Date getNextVisitDate() {
+		return nextVisitDate;
+	}
+
+	public void setNextVisitDate(java.util.Date nextVisitDate) {
+		this.nextVisitDate = nextVisitDate;
+	}
+
 	public String getHrbp() {
 		return hrbp;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EmployeeInfoQueryInfo.java

@@ -36,6 +36,10 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	private Date startDate;
 	
 	private Date endDate;
+	
+	private Date visitStartDate;
+	
+	private Date visitEndDate;
 
 	public String getUserNameOrIdOrMobile() {
 		return userNameOrIdOrMobile;
@@ -116,4 +120,20 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	public void setIntentionCity(String intentionCity) {
 		this.intentionCity = intentionCity;
 	}
+
+	public Date getVisitStartDate() {
+		return visitStartDate;
+	}
+
+	public void setVisitStartDate(Date visitStartDate) {
+		this.visitStartDate = visitStartDate;
+	}
+
+	public Date getVisitEndDate() {
+		return visitEndDate;
+	}
+
+	public void setVisitEndDate(Date visitEndDate) {
+		this.visitEndDate = visitEndDate;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/EmployeeVisitService.java

@@ -5,4 +5,5 @@ import com.ym.mec.common.service.BaseService;
 
 public interface EmployeeVisitService extends BaseService<Long, EmployeeVisit> {
 
+	long insert(EmployeeVisit employeeVisit);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeVisitServiceImpl.java

@@ -1,12 +1,18 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.ym.mec.biz.dal.dao.EmployeeInfoDao;
 import com.ym.mec.biz.dal.dao.EmployeeVisitDao;
+import com.ym.mec.biz.dal.entity.EmployeeInfo;
 import com.ym.mec.biz.dal.entity.EmployeeVisit;
 import com.ym.mec.biz.service.EmployeeVisitService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
@@ -14,10 +20,29 @@ public class EmployeeVisitServiceImpl extends BaseServiceImpl<Long, EmployeeVisi
 	
 	@Autowired
 	private EmployeeVisitDao employeeVisitDao;
+	
+	@Autowired
+	private EmployeeInfoDao employeeInfoDao; 
 
 	@Override
 	public BaseDAO<Long, EmployeeVisit> getDAO() {
 		return employeeVisitDao;
 	}
+
+	@Override
+    @Transactional(rollbackFor = Exception.class)
+	public long insert(EmployeeVisit bean) {
+		
+		EmployeeInfo employeeInfo = employeeInfoDao.get(bean.getEmployeeInfoId());
+		if(employeeInfo == null){
+			throw new BizException("用户信息查询失败");
+		}
+		
+		employeeInfo.setNextVisitDate(bean.getNextVisitDate());
+		employeeInfo.setUpdateTime(new Date());
+		employeeInfoDao.update(employeeInfo);
+		
+		return super.insert(bean);
+	}
 	
 }

mec-biz/src/main/resources/config/mybatis/EmployeeInfoMapper.xml

@@ -41,6 +41,7 @@
 		<result column="organName" property="organName" />
 		<result column="subjectName" property="subjectName" />
 		<result column="operatorName" property="operatorName" />
+		<result column="next_visit_date_" property="nextVisitDate" />
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.EmployeeInfoDto" id="EmployeeInfoDto" extends="EmployeeInfo">
@@ -139,6 +140,9 @@
 			<if test="hrbp != null">
 				hrbp_ = #{hrbp},
 			</if>
+			<if test="nextVisitDate != null">
+				next_visit_date_ = #{nextVisitDate},
+			</if>
 				source_from_ = #{sourceFrom}
 		</set>
 		WHERE id_ = #{id}
@@ -178,6 +182,12 @@
 	        <if test="endDate != null">
 	            AND ei.update_time_ &lt;= #{endDate}
 	        </if>
+	        <if test="visitStartDate != null">
+	            AND ei.next_visit_date_ &gt;= #{visitStartDate}
+	        </if>
+	        <if test="visitEndDate != null">
+	            AND ei.next_visit_date_ &lt;= #{visitEndDate}
+	        </if>
 	        <if test="operator != null">
 	            AND (ei.operator_id_ like concat('%',#{operator},'%') or u.real_name_ like concat('%',#{operator},'%'))
 	        </if>