|
|
@@ -1,15 +1,6 @@
|
|
|
package com.goafanti.user.service.impl;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.UserServiceFollowMapper;
|
|
|
import com.goafanti.common.dao.UserServiceMapper;
|
|
|
@@ -19,12 +10,16 @@ import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
-import com.goafanti.user.bo.InputListOrderUserService;
|
|
|
-import com.goafanti.user.bo.InputUserServiceFollow;
|
|
|
-import com.goafanti.user.bo.OrderProject;
|
|
|
-import com.goafanti.user.bo.OutOrderUserService;
|
|
|
-import com.goafanti.user.bo.OutUserServiceFollow;
|
|
|
+import com.goafanti.user.bo.*;
|
|
|
import com.goafanti.user.service.UserServiceService;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@Service
|
|
|
public class UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> implements UserServiceService {
|
|
|
@@ -84,6 +79,7 @@ public class UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
|
|
|
if(i.getEndSignTimes()!=null)map.put("endSignTimes", i.getEndSignTimes()+" 23:59:59");
|
|
|
if(i.getAddWechat()!=null)map.put("addWechat", i.getAddWechat());
|
|
|
if(i.getRenewal()!=null)map.put("renewal", i.getRenewal());
|
|
|
+ if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
|
|
|
return map;
|
|
|
}
|
|
|
|