Browse Source

外呼系统开发

anderx 1 year ago
parent
commit
794040c447
23 changed files with 751 additions and 822 deletions
  1. 18 61
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  2. 4 4
      src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java
  3. 11 44
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  4. 64 6
      src/main/java/com/goafanti/common/dao/UserMapper.java
  5. 379 371
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  6. 137 45
      src/main/java/com/goafanti/common/model/User.java
  7. 8 6
      src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java
  8. 7 20
      src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java
  9. 10 23
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  10. 7 6
      src/main/java/com/goafanti/customer/service/impl/AdminOrgAnnualReportServiceImpl.java
  11. 23 23
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  12. 2 2
      src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java
  13. 14 69
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  14. 1 1
      src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java
  15. 2 2
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  16. 2 2
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  17. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  18. 11 44
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  19. 1 1
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  20. 22 48
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  21. 20 36
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  22. 2 2
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  23. 5 5
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

+ 18 - 61
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -1,60 +1,11 @@
 package com.goafanti.achievement.service.impl;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.achievement.bo.AchievementImportBo;
-import com.goafanti.achievement.bo.AchievementListBo;
-import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
-import com.goafanti.achievement.bo.AchievementPartnerListBo;
-import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
+import com.goafanti.achievement.bo.*;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AchievementDemandCountMapper;
-import com.goafanti.common.dao.AchievementDemandMapper;
-import com.goafanti.common.dao.AchievementInterestMapper;
-import com.goafanti.common.dao.AchievementKeywordMapper;
-import com.goafanti.common.dao.AchievementMapper;
-import com.goafanti.common.dao.DemandKeywordMapper;
-
-import com.goafanti.common.dao.NoticeMapper;
-import com.goafanti.common.dao.OrganizationIdentityMapper;
-import com.goafanti.common.dao.UserIdentityMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.dao.UserRoleMapper;
-import com.goafanti.common.enums.AchievementAuditStatus;
-import com.goafanti.common.enums.AchievementReleaseStatus;
-import com.goafanti.common.enums.AchievementSwitchSign;
-import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.DemandAuditStatus;
-import com.goafanti.common.enums.DemandReleaseStatus;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.common.model.Achievement;
-import com.goafanti.common.model.AchievementDemand;
-import com.goafanti.common.model.AchievementDemandCount;
-import com.goafanti.common.model.AchievementKeyword;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.User;
-import com.goafanti.common.model.UserIdentity;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -63,12 +14,18 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
 import com.goafanti.customer.bo.CustomerPersonalDetailBo;
 import com.goafanti.demand.bo.DemandAchievementListBo;
-import com.goafanti.portal.bo.AchievementDetailBo;
-import com.goafanti.portal.bo.AchievementPortalDetailBo;
-import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
-import com.goafanti.portal.bo.AchievementSearchListBo;
-import com.goafanti.portal.bo.BoutiqueListBo;
-import com.goafanti.portal.bo.InternationalListBo;
+import com.goafanti.portal.bo.*;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.*;
 
 @Service
 public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> implements AchievementService {
@@ -171,7 +128,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		String ownerId = "";
 		if (TokenManager.getToken() instanceof User) {
 			a.setOwnerId(TokenManager.getUserId());
-			User u=userMapper.selectByPrimaryKey(TokenManager.getUserId());
+			User u=userMapper.queryById(TokenManager.getUserId());
 			if (null != u) {
 				ownerId = u.getId();
 				if(ownerType == null) ownerType = u.getType();
@@ -884,7 +841,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		if (null!=TokenManager.getUserId()) {
 			a.setOwnerId(TokenManager.getUserId());
-			User u=userMapper.selectByPrimaryKey(TokenManager.getUserId());
+			User u=userMapper.queryById(TokenManager.getUserId());
 			if (null!=u.getType()) {
 				a.setOwnerType(u.getType());
 			}if (StringUtils.isNotBlank(u.getMobile())) {

+ 4 - 4
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -83,7 +83,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         ub.setRemarks("领取限定项目触发");
         userBusinessMapper.insertSelective(ub);
         addUserLog(in,0);
-        User user = userMapper.selectByPrimaryKey(in.getUid());
+        User user = userMapper.queryById(in.getUid());
         BusinessProject businessProject = businessProjectMapper.queryById(in.getPid());
         String str =String.format("客户:%s,已被营销员%s领取了【限定项目:%s】",user.getNickname(),TokenManager.getAdminToken().getName(),businessProject.getBname());
         //如果客户是当事人的不提示消息
@@ -106,7 +106,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         in.setAid(TokenManager.getAdminId());
         String aname=null;
         List<OutRestrictProject> list = restrictProjectMapper.selectByUidAndAid(in);
-        User u = userMapper.selectByPrimaryKey(in.getUid());
+        User u = userMapper.queryById(in.getUid());
         for (OutRestrictProject e : list) {
             if (e.getType()==null){
                 e.setType(0);
@@ -235,7 +235,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
                 UserRestrictProjectBo bo = new UserRestrictProjectBo();
                 bo.setUid(s);
                 bo.setAdminSalesman(0);
-                User user = userMapper.selectByPrimaryKey(s);
+                User user = userMapper.queryById(s);
                 bo.setUserName(user.getNickname());
                 if (!flag){
                     if (user.getShareType()==0||user.getShareType()==2){
@@ -281,7 +281,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         Integer rpCount =restrictProjectMapper.selectPrivateByAid(TokenManager.getAdminId());
         rpCount=rpCount==null?0:rpCount;
         i=i+rpCount;
-        User user = userMapper.selectByPrimaryKey(uid);
+        User user = userMapper.queryById(uid);
         if (user.getShareType()==0||user.getShareType()==2){
             //0私有 2签单
             if (!user.getAid().equals(TokenManager.getAdminId())){

+ 11 - 44
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -1,53 +1,20 @@
 package com.goafanti.cognizance.service.impl;
 
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.cognizance.bo.BusinessCountBo;
-import com.goafanti.cognizance.bo.CognizanceBo;
-import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
-import com.goafanti.cognizance.bo.CognizanceContractBo;
-import com.goafanti.cognizance.bo.CognizanceDetailBo;
-import com.goafanti.cognizance.bo.CognizanceManageCostBo;
-import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
-import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
-import com.goafanti.cognizance.bo.CultivationListBo;
+import com.goafanti.cognizance.bo.*;
 import com.goafanti.cognizance.service.OrgCognizanceService;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.CopyrightInfoMapper;
-import com.goafanti.common.dao.OrgCognizanceLogMapper;
-import com.goafanti.common.dao.OrgCognizanceMapper;
-import com.goafanti.common.dao.OrgCognizanceProportionMapper;
-import com.goafanti.common.dao.OrganizationIdentityMapper;
-import com.goafanti.common.dao.PatentInfoMapper;
-import com.goafanti.common.dao.TechProjectMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.OrgCognizanceStatus;
-import com.goafanti.common.enums.ProportionStatus;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Contract;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrgCognizance;
-import com.goafanti.common.model.OrgCognizanceLog;
-import com.goafanti.common.model.OrgCognizanceProportion;
-import com.goafanti.common.model.OrgHumanResource;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.User;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
+import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
 
 @Service
 public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper> implements OrgCognizanceService {
@@ -394,7 +361,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
-		User u = userMapper.selectByPrimaryKey(cog.getUid());
+		User u = userMapper.queryById(cog.getUid());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}

+ 64 - 6
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -19,19 +19,75 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * (User)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-19 15:44:01
+ */
 public interface UserMapper {
 
-    int deleteByPrimaryKey(String id);
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    User queryById(String id);
 
-    int insert(User record);
 
-    int insertSelective(User record);
 
-    User selectByPrimaryKey(String id);
+    /**
+     * 统计总行数
+     *
+     * @param user 查询条件
+     * @return 总行数
+     */
+    int findUserCount(User user);
+
+    /**
+     * 新增数据
+     *
+     * @param user 实例对象
+     * @return 影响行数
+     */
+    int insert(User user);
 
-    int updateByPrimaryKeySelective(User record);
 
-    int updateByPrimaryKey(User record);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<User> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<User> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param user 实例对象
+     * @return 影响行数
+     */
+    int update(User user);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(String id);
+
+
+    /**
+     * 新增数据
+     *
+     * @param user 实例对象
+     * @return 影响行数
+     */
+    int insertSelective(User user);
 
     UserPageHomeBo selectUserPageHomeBoByUserId(String uid);
 
@@ -259,3 +315,5 @@ public interface UserMapper {
 
     int selectUserLevel(String aid);
 }
+
+

File diff suppressed because it is too large
+ 379 - 371
src/main/java/com/goafanti/common/mapper/UserMapper.xml


+ 137 - 45
src/main/java/com/goafanti/common/model/User.java

@@ -2,95 +2,186 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+
 /**
- * @TableName user
+ * (User)实体类
+ *
+ * @author makejava
+ * @since 2024-11-19 15:44:01
  */
-public class User implements AftUser{
-    private String id;
+public class User implements  AftUser{
+    private static final long serialVersionUID = 703046321551159676L;
 
+    private String id;
+    /**
+     * 手机号
+     */
     private String mobile;
-
+    /**
+     * 密码,md5+salt
+     */
     private String password;
-
+    /**
+     * 用户昵称
+     */
     private String nickname;
-
+    /**
+     * 用户邮箱
+     */
     private String email;
-
+    /**
+     * 注册时间
+     */
     private Date createTime;
-
+    /**
+     * 用户编号
+     */
     private Long number;
-
+    /**
+     * 会员等级
+     */
     private Integer lvl;
-
+    /**
+     * 个人/单位,默认0-个人账号,1-组织账号
+     */
     private Integer type;
-
+    /**
+     * 管理员ID
+     */
     private String aid;
-
+    /**
+     * 客户经理ID
+     */
     private String mid;
-
+    /**
+     * 账户状态 0-有效 1-失效 2-锁定
+     */
     private Integer status;
-
+    /**
+     * 用户来源 0 注册 1 录入 2 领取 3 转交
+     */
     private Integer source;
-
+    /**
+     * 更新时间
+     */
     private Date updateTime;
-
+    /**
+     * 公司LOGO
+     */
     private String companyLogoUrl;
-
+    /**
+     * 个人头像
+     */
     private String headPortraitUrl;
-
+    /**
+     * 社会属性标签
+     */
     private String societyTag;
-
+    /**
+     * 简介
+     */
     private String introduction;
-
+    /**
+     * 增值属性标签
+     */
     private String valueAddedTag;
-
+    /**
+     * 所属单位用户ID
+     */
     private String organizationId;
-
+    /**
+     * 共享类型 0=私有 1=公共 2=签单 3=外联 4=渠道
+     */
     private Integer shareType;
-
+    /**
+     * 客户认证名称
+     */
     private String identifyName;
-
+    /**
+     * 专家详情背景图
+     */
     private String backgroundUrl;
-
+    /**
+     * 客户审核状态 0-待审核 ,1-审核通过,2-审核拒绝
+     */
     private Integer auditStatus;
-
+    /**
+     * 审核意见
+     */
     private String auditOpinion;
-
+    /**
+     * 客户转换时间
+     */
     private Date transferTime;
-
+    /**
+     * 资料维护人
+     */
     private String informationMaintainer;
-
+    /**
+     * 核心技术
+     */
     private String coreTechnology;
-
+    /**
+     * 客户已完成项目情况
+     */
     private String accomplishSituation;
-
+    /**
+     * 已有知识产权情况
+     */
     private String intellectualProperty;
-
+    /**
+     * 信用等级 1 A级优质,2 B级正常,3 C级失信
+     */
     private Integer creditRating;
-
+    /**
+     * 用户等级 0 一般客户 1 意向客户 2 重点客户
+     */
     private Integer level;
-
+    /**
+     * 0-未认证,1-已认证
+     */
     private Integer authentication;
-
+    /**
+     * 用户注册名
+     */
     private String username;
-
+    /**
+     * 完整度
+     */
     private Double integrity;
-
+    /**
+     * 邀请码
+     */
     private String toInviteCode;
-
+    /**
+     * 受邀请码
+     */
     private String beInviteCode;
-
+    /**
+     * 指导 0无 1有
+     */
     private Integer guidance;
-
+    /**
+     * 签单标记 0未签单 1已签单
+     */
     private Integer signBills;
-
+    /**
+     * 外联客户 0否 1是
+     */
     private Integer channel;
-
+    /**
+     * 渠道客户 0否 1是
+     */
     private Integer newChannel;
-
+    /**
+     * 签单时间(最近)
+     */
     private Date signTime;
+    /**
+     * 外呼状态 0=未呼叫,1=呼叫中
+     */
+    private Integer callStatus;
 
-    private static final long serialVersionUID = 1L;
 
     public String getId() {
         return id;
@@ -427,4 +518,5 @@ public class User implements AftUser{
     public void setSignTime(Date signTime) {
         this.signTime = signTime;
     }
-}
+}
+

+ 8 - 6
src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java

@@ -1,9 +1,5 @@
 package com.goafanti.contract.service.impl;
-import java.util.Calendar;
-import java.util.List;
-import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+
 import com.goafanti.common.dao.ContractLogMapper;
 import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -16,6 +12,12 @@ import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
 import com.goafanti.contract.bo.InputContactLog;
 import com.goafanti.contract.service.ContractLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.UUID;
 
 @Service
 public class ContractLogServiceImpl implements ContractLogService {
@@ -75,7 +77,7 @@ public class ContractLogServiceImpl implements ContractLogService {
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
-		User u = userMapper.selectByPrimaryKey(info.getUid());
+		User u = userMapper.queryById(info.getUid());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}

+ 7 - 20
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -1,25 +1,7 @@
 package com.goafanti.contract.service.impl;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.ContractLogMapper;
-import com.goafanti.common.dao.ContractMapper;
-import com.goafanti.common.dao.CopyrightInfoMapper;
-import com.goafanti.common.dao.OrgCognizanceMapper;
-import com.goafanti.common.dao.PatentInfoMapper;
-import com.goafanti.common.dao.TechProjectMapper;
-import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.ContractStatus;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
@@ -39,6 +21,11 @@ import com.goafanti.contract.service.ContractService;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.*;
 
 @Service
 public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implements ContractService {
@@ -294,7 +281,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
-		User u = userMapper.selectByPrimaryKey(c.getUid());
+		User u = userMapper.queryById(c.getUid());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}

+ 10 - 23
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -1,21 +1,5 @@
 package com.goafanti.copyright.service.impl;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
-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.CopyrightInfoMapper;
 import com.goafanti.common.dao.CopyrightLogMapper;
@@ -25,12 +9,7 @@ import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.model.Contract;
-import com.goafanti.common.model.CopyrightInfo;
-import com.goafanti.common.model.CopyrightLog;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrgIntellectualProperty;
-import com.goafanti.common.model.User;
+import com.goafanti.common.model.*;
 import com.goafanti.copyright.bo.CopyrightContractListBo;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.bo.CopyrightInfoSummary;
@@ -39,6 +18,14 @@ import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.*;
 
 @Service
 public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper> implements CopyrightInfoService {
@@ -334,7 +321,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
-		User u = userMapper.selectByPrimaryKey(c.getUid());
+		User u = userMapper.queryById(c.getUid());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}

+ 7 - 6
src/main/java/com/goafanti/customer/service/impl/AdminOrgAnnualReportServiceImpl.java

@@ -1,10 +1,5 @@
 package com.goafanti.customer.service.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.goafanti.common.dao.OrganizationAnnualReportMapper;
 import com.goafanti.common.dao.OrganizationYearProjectMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -17,6 +12,12 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
 import com.goafanti.customer.service.AdminOrgAnnualReportService;
 import com.goafanti.customer.service.CustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 @Service
 public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<OrganizationAnnualReportMapper> implements AdminOrgAnnualReportService {
 	@Autowired
@@ -43,7 +44,7 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 		CustomerOrganizationDetailBo bo=userMapper.findOrganizationCustomerDetail(uid);
 		u.setId(uid);
 		u.setIntegrity(customerService.countIntegrity(bo));
-		userMapper.updateByPrimaryKeySelective(u);
+		userMapper.update(u);
 	}
 
 	@Override

+ 23 - 23
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -594,7 +594,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			}
 		}
 		organizationIdentityMapper.updateByPrimaryKeySelective(oi);
-		userMapper.updateByPrimaryKeySelective(user);
+		userMapper.update(user);
 		return 1;
 	}
 
@@ -693,7 +693,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			e.printStackTrace();
 		}
 		userIdentityMapper.updateByPrimaryKeySelective(ui);
-		userMapper.updateByPrimaryKeySelective(user);
+		userMapper.update(user);
 		return 1;
 	}
 
@@ -744,7 +744,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public int updateUserAccount(User user) {
-		return userMapper.updateByPrimaryKeySelective(user);
+		return userMapper.update(user);
 	}
 
 	@Override
@@ -790,7 +790,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			UserMid um =new UserMid();
 			um.setUid(userFollow.getUid());
 			//检查客户,修改小程序打卡,如果负责人和跟进人是同一个,则刷新最后跟进时间
-			User user = userMapper.selectByPrimaryKey(fbb.getUid());
+			User user = userMapper.queryById(fbb.getUid());
 			if (aid.equals(user.getAid())){
 				um.setLastFollowTime(userFollow.getCreateTime());
 			}
@@ -1382,7 +1382,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				|| AFTConstants.CHANNEL_USER_TRANSFER_TO_OTHER.equals(operatorType);
 		//领取
 		if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
-			User use = userMapper.selectByPrimaryKey(uid);
+			User use = userMapper.queryById(uid);
 			user.setAid(TokenManager.getAdminId());
 			if (use.getSignBills()==0){
 				user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
@@ -1420,7 +1420,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				}
 				updateUserMid(aid,uid,0,null);
 				//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
-				User use = userMapper.selectByPrimaryKey(uid);
+				User use = userMapper.queryById(uid);
 				useList.add(use);
 				User newUser=new User();
 				newUser.setAid(aid);
@@ -1439,7 +1439,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 						updateOrderHandOver(uid,aid,oldAid);
 					}
 					//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
-					User use = userMapper.selectByPrimaryKey(us);
+					User use = userMapper.queryById(us);
 					useList.add(use);
 					User newUser=new User();
 					newUser.setAid(aid);
@@ -1472,7 +1472,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				userMapper.updateList(aid, null, 3, null, null, uList,data);
 			}
 		} else {
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 		}
 		//处理用户客户统计
 		if (AFTConstants.USER_RECEIVE.equals(operatorType)){
@@ -1576,7 +1576,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 
 	private void informationMaintainerHandOver(String uid, String aid, String oldAid,  List<String> errors) {
-		User useUser = userMapper.selectByPrimaryKey(uid);
+		User useUser = userMapper.queryById(uid);
 		if (useUser.getInformationMaintainer().equals(oldAid)){
 			organizationContactBookMapper.updateAdmin(uid, aid);
 		}else {
@@ -1588,7 +1588,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public Integer receiveEveryDay(String uid) {
 		Integer signBills =null;
 		if (uid !=null ){
-			User u=userMapper.selectByPrimaryKey(uid);
+			User u=userMapper.queryById(uid);
 			signBills = u.getSignBills();
 			if (u.getShareType()!=1)return -1;
 			if (u.getNewChannel()==1)return 0;
@@ -1603,7 +1603,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public int pushReceiveAsChannel(String uid) {
 		Date date = new Date();
-		User use=userMapper.selectByPrimaryKey(uid);
+		User use=userMapper.queryById(uid);
 		User u =new User();
 		String aid=TokenManager.getAdminId();
 		u.setId(uid);
@@ -1617,7 +1617,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		addUserLock(uid,aid, date, null); // 指定用户锁定客户
 		updateUserMid(aid,uid,0,null);
 		addUserTransferLog(uid, aid,null, 15, null, date, null);
-		userMapper.updateByPrimaryKeySelective(u);
+		userMapper.update(u);
 		updateAdminUserCount(use.getAid(),use.getTransferTime());
 		return 1;
 	}
@@ -2061,7 +2061,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		} catch (InvocationTargetException | IllegalAccessException e) {
 			e.printStackTrace();
 		}
-		userMapper.updateByPrimaryKeySelective(user);
+		userMapper.update(user);
 		return 1;
 	}
 
@@ -2115,7 +2115,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public int updateRefusedCustomer(String id, String nickname, String mobile, String societyTag) {
-		User u = userMapper.selectByPrimaryKey(id);
+		User u = userMapper.queryById(id);
 		u.setNickname(nickname);
 		u.setMobile(mobile);
 		u.setSocietyTag(societyTag);
@@ -2291,7 +2291,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		User u = new User();
 		u.setId(id);
 		u.setInformationMaintainer(aid);
-		return userMapper.updateByPrimaryKeySelective(u);
+		return userMapper.update(u);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -2350,7 +2350,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public int updateUserLevel(User u) {
 		if (!u.getId().contains(",")) {
-			userMapper.updateByPrimaryKeySelective(u);
+			userMapper.update(u);
 		} else {
 			List<String> ulist = Arrays.asList(u.getId().split(","));
 			userMapper.updateList(null, u.getLevel(), null, null, null, ulist,null);
@@ -2451,14 +2451,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		String aid = TokenManager.getAdminId();
 		if (!id.contains(",")) {
 
-			User u = userMapper.selectByPrimaryKey(id);
+			User u = userMapper.queryById(id);
 			if (!u.getAid().equals(aid)) {
 				throw new BuilderException("客户归属错误!");
 			}
 			UserTransferLog utl = new UserTransferLog();
 			u.setTransferTime(date);
 			u.setShareType(1);
-			userMapper.updateByPrimaryKeySelective(u);
+			userMapper.update(u);
 			utl.setAid(aid);
 			utl.setCreateTime(date);
 			utl.setType(6);
@@ -2473,7 +2473,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			List<UserTransferLog> ulList = new ArrayList<UserTransferLog>();
 			List<User> userList=new ArrayList<>();
 			for (String str : list) {
-				User u = userMapper.selectByPrimaryKey(str);
+				User u = userMapper.queryById(str);
 				if (!u.getAid().equals(TokenManager.getAdminId())) {
 					throw new BuilderException("客户归属错误!");
 				}
@@ -2555,7 +2555,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		rpCount=rpCount==null?0:rpCount;
 		i=i+rpCount;
 		if (uid !=null){
-			User user =userMapper.selectByPrimaryKey(uid);
+			User user =userMapper.queryById(uid);
 			if (user.getNewChannel()==1){
 				return false;
 			}
@@ -2879,7 +2879,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public boolean checkData(String uid, String aid) {
 		List<String> list=Arrays.asList(uid.split(","));
 		for (String s : list) {
-			User u=userMapper.selectByPrimaryKey(s);
+			User u=userMapper.queryById(s);
 			if (!u.getInformationMaintainer().equals(aid)){
 				return true;
 			}
@@ -2910,7 +2910,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			User user=new User();
 			user.setId(in.getUid());
 			user.setIntroduction(in.getIntroduction());
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 		}
 		if (in.getChannelType() !=null){
 			UserMid um =new UserMid();
@@ -3124,7 +3124,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
     @Override
     public Object getPublicReleaseList(String id) {
 		Map<String, Object> map=new HashMap<>();
-		User user = userMapper.selectByPrimaryKey(id);
+		User user = userMapper.queryById(id);
 		map.put("user",user);
 		if (user.getAid().equals(TokenManager.getAdminId())){
 			map.put("myUser",1);

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -71,7 +71,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     @Override
     public Object queryByUidAll(String id) {
         UserArchivesDetails user = customerService.selectUserByUid(id);
-        User u = userMapper.selectByPrimaryKey(id);
+        User u = userMapper.queryById(id);
         if (u.getAid().equals(TokenManager.getAdminId())){
             user.setMyUser(1);
         }else {
@@ -96,7 +96,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
 
     @Override
     public boolean checkPermission(String id) {
-        User user = userMapper.selectByPrimaryKey(id);
+        User user = userMapper.queryById(id);
         if (user.getAid().equals(TokenManager.getAdminId())){
             return false;
         }

+ 14 - 69
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -1,81 +1,26 @@
 package com.goafanti.demand.service.impl;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.achievement.bo.AchievementDemandListBo;
-
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AchievementDemandCountMapper;
-import com.goafanti.common.dao.AchievementDemandMapper;
-
-import com.goafanti.common.dao.AchievementKeywordMapper;
-import com.goafanti.common.dao.AchievementMapper;
-import com.goafanti.common.dao.DemandFollowDetailMapper;
-import com.goafanti.common.dao.DemandInterestMapper;
-import com.goafanti.common.dao.DemandKeywordMapper;
-import com.goafanti.common.dao.DemandMapper;
-
-import com.goafanti.common.dao.FieldGlossoryMapper;
-import com.goafanti.common.dao.NewsInterestMapper;
-
-import com.goafanti.common.dao.OrganizationIdentityMapper;
-import com.goafanti.common.dao.ProjectInterestMapper;
-import com.goafanti.common.dao.UserIdentityMapper;
-import com.goafanti.common.dao.UserInterestMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.dao.UserRoleMapper;
-import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.DemandAuditStatus;
-import com.goafanti.common.enums.DemandInfoSourceStatus;
-import com.goafanti.common.enums.DemandPortalSearchSignType;
-import com.goafanti.common.enums.DemandReleaseStatus;
-import com.goafanti.common.enums.DemandStatus;
-import com.goafanti.common.enums.DemandSwitchSign;
-import com.goafanti.common.enums.InterestType;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.common.model.AchievementDemand;
-import com.goafanti.common.model.AchievementDemandCount;
-import com.goafanti.common.model.Demand;
-import com.goafanti.common.model.DemandKeyword;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.User;
-import com.goafanti.common.model.UserIdentity;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.demand.bo.DemandImportBo;
-
-import com.goafanti.demand.bo.DemandListBo;
-import com.goafanti.demand.bo.DemandManageDetailBo;
-import com.goafanti.demand.bo.DemandManageListBo;
-import com.goafanti.demand.bo.DemandPartnerListBo;
-import com.goafanti.demand.bo.ObjectInterestListBo;
+import com.goafanti.demand.bo.*;
 import com.goafanti.demand.service.DemandService;
+import com.goafanti.portal.bo.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import com.goafanti.portal.bo.BoutiqueListBo;
-import com.goafanti.portal.bo.DemandPortalDetailBo;
-import com.goafanti.portal.bo.DemandPortalSimilarListBo;
-import com.goafanti.portal.bo.DemandSearchDetailBo;
-import com.goafanti.portal.bo.DemandSearchListBo;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.*;
 
 
 @Service
@@ -688,7 +633,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 		n.setRid(d.getId());
-		User u = userMapper.selectByPrimaryKey(d.getEmployerId());
+		User u = userMapper.queryById(d.getEmployerId());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}
@@ -974,7 +919,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		d.setInfoSources(1);
 		if (null!=TokenManager.getUserId()) {
 			d.setEmployerId(TokenManager.getUserId());
-			User u=userMapper.selectByPrimaryKey(TokenManager.getUserId());
+			User u=userMapper.queryById(TokenManager.getUserId());
 			if (null!=u.getType()) {
 				d.setDataCategory(u.getType());
 			}

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1490,7 +1490,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
                 StringBuffer sb = new StringBuffer();
                 for (PublicReleaseDetails e2 : list) {
-                    User user = userMapper.selectByPrimaryKey(e2.getUid());
+                    User user = userMapper.queryById(e2.getUid());
                     List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getUidNotCountAmount(e2.getUid());
                     BigDecimal countAmount = orderNoNotCountAmount.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                     sb.append("[").append(user.getNickname()).append("]未归集:").append(countAmount.stripTrailingZeros().toPlainString()).append("元,");

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -192,7 +192,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (other!=null ) {
 			t.setOther(other);
 		}
-		User u=userMapper.selectByPrimaryKey(uid);
+		User u=userMapper.queryById(uid);
 		if(u.getShareType()!=null&&u.getShareType()==2){
 			t.setNewUser(1);
 		}else {
@@ -1018,7 +1018,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
-		User u=userMapper.selectByPrimaryKey(t.getBuyerId());
+		User u=userMapper.queryById(t.getBuyerId());
 		if (tm==null) {
 			tm=new TOrderMid();
 		}

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -316,7 +316,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 */
 	private void pushUser(TOrderTask t, TOrderNew tn, Date date) {
 		if (userMapper.checkLock(tn.getBuyerId())<1) {
-			User user = userMapper.selectByPrimaryKey(tn.getBuyerId());
+			User user = userMapper.queryById(tn.getBuyerId());
 			//新增如果不是渠道才转换时间和改成签单
 			if (user!=null&&user.getNewChannel()!=1){
 				//签单改成刷新客户跟进时间
@@ -379,7 +379,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		User u=new User();
 		u.setId(tn.getBuyerId());
 		u.setSignTime(lastSigningTime);
-		userMapper.updateByPrimaryKeySelective(u);
+		userMapper.update(u);
 	}
 
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -964,7 +964,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 
 	private String getSalesmanIdByUid(String uid){
-		User u = userMapper.selectByPrimaryKey(uid);
+		User u = userMapper.queryById(uid);
 		if(u!=null&&StringUtils.isBlank(u.getAid())){
 			return u.getAid();
 		}else{

+ 11 - 44
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -1,55 +1,22 @@
 package com.goafanti.patent.service.impl;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-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.OrgIntellectualPropertyMapper;
-import com.goafanti.common.dao.OrganizationIdentityMapper;
-import com.goafanti.common.dao.PatentCostMapper;
-import com.goafanti.common.dao.PatentInfoMapper;
-import com.goafanti.common.dao.PatentLogMapper;
-import com.goafanti.common.dao.PatentRegistrationMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.IntellectualPropertyType;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.PatentInfoStatus;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Contract;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrgIntellectualProperty;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.PatentCost;
-import com.goafanti.common.model.PatentInfo;
-import com.goafanti.common.model.PatentLog;
-import com.goafanti.common.model.PatentRegistration;
-import com.goafanti.common.model.User;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.DateUtils;
 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.patent.bo.PatentAnnualFeeTaskBo;
-import com.goafanti.patent.bo.PatentContractListBo;
-import com.goafanti.patent.bo.PatentExpireBo;
-import com.goafanti.patent.bo.PatentInfoDetailBo;
-import com.goafanti.patent.bo.PatentManageListBo;
-import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
-import com.goafanti.patent.bo.PatentPendingBo;
+import com.goafanti.patent.bo.*;
 import com.goafanti.patent.service.PatentInfoService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.*;
 
 @Service
 public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> implements PatentInfoService {
@@ -622,7 +589,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
-		User u = userMapper.selectByPrimaryKey(p.getUid());
+		User u = userMapper.queryById(p.getUid());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}

+ 1 - 1
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -283,7 +283,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		n.setCreateTime(now.getTime());
 		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
-		User u = userMapper.selectByPrimaryKey(t.getUid());
+		User u = userMapper.queryById(t.getUid());
 		if (null != u) {
 			n.setPid(u.getAid());
 		}

+ 22 - 48
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -1,52 +1,26 @@
 package com.goafanti.user.service.impl;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.dao.OrgHumanResourceMapper;
-import com.goafanti.common.dao.OrgRatepayMapper;
-import com.goafanti.common.dao.OrganizationIdentityMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.dao.UserRoleMapper;
-import com.goafanti.common.enums.CertifySubmitType;
-import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.IdentityAuditStatus;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.UserLevel;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.OrgHumanResource;
-import com.goafanti.common.model.OrgRatepay;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.User;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.portal.bo.OrgSubscriberListBo;
-import com.goafanti.user.bo.AuditorOrgIdentityDetailBo;
-import com.goafanti.user.bo.OrgBasicInfoBo;
-import com.goafanti.user.bo.OrgIdentityBo;
-import com.goafanti.user.bo.OrgIdentityDetailAdmin;
-import com.goafanti.user.bo.OrgIdentityDetailBo;
-import com.goafanti.user.bo.OrgUnitNames;
-import com.goafanti.user.bo.OrganizationIndentityUserBo;
+import com.goafanti.user.bo.*;
 import com.goafanti.user.service.OrganizationIdentityService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class OrganizationIdentityServiceImpl extends BaseMybatisDao<OrganizationIdentityMapper>
@@ -135,7 +109,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				User u = new User();
 				u.setId(uid);
 				u.setLvl(UserLevel.CERTIFIED.getCode());
-				userMapper.updateByPrimaryKeySelective(u);
+				userMapper.update(u);
 			}
 			return organizationIdentityMapper.updateByPrimaryKeySelective(o);
 		}
@@ -146,9 +120,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		if (StringUtils.isNotBlank(orgIdentity.getLastYearTaxReportUrl())) {
 			disposeRatePay(orgIdentity, orgIdentity.getUid());
 		}
-		User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
+		User user = userMapper.queryById(orgIdentity.getUid());
 		user.setLvl(level);
-		userMapper.updateByPrimaryKeySelective(user);
+		userMapper.update(user);
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			createAuditorNotice(user);
 		}
@@ -158,10 +132,10 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public int updateOrgDetailByAuditAdmin(OrganizationIdentity oi, String aid, String mid, Integer level) {
-		User user = userMapper.selectByPrimaryKey(oi.getUid());
+		User user = userMapper.queryById(oi.getUid());
 		if (!IdentityAuditStatus.PASSED.getCode().equals(oi.getAuditStatus())) {
 			user.setLvl(UserLevel.GENERAL.getCode());
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 			createNotice(user, oi.getAuditStatus());
 		} else {
 			/*
@@ -171,7 +145,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			user.setLvl(UserLevel.CERTIFIED.getCode());
 			user.setAid(aid);
 			user.setMid(mid);
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 			// disposeRatePay(oi, oi.getUid());
 			createNotice(user, oi.getAuditStatus());
 		}
@@ -335,7 +309,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	@Override
 	public OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid) {
 		OrganizationIdentity o = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
-		User u = userMapper.selectByPrimaryKey(uid);
+		User u = userMapper.queryById(uid);
 		OrgIdentityDetailAdmin bo = new OrgIdentityDetailAdmin();
 		BeanUtils.copyProperties(o, bo);
 		bo.setLevel(u.getLvl().toString());
@@ -368,9 +342,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	public void save(OrgIdentityBo orgIdentityBo) {
 		OrganizationIdentity oi = new OrganizationIdentity();
 		BeanUtils.copyProperties(orgIdentityBo, oi);
-		User u = userMapper.selectByPrimaryKey(TokenManager.getUserId());
+		User u = userMapper.queryById(TokenManager.getUserId());
 		u.setEmail(orgIdentityBo.getEmail());
-		userMapper.updateByPrimaryKeySelective(u);
+		userMapper.update(u);
 		OrganizationIdentity o = organizationIdentityMapper.selectOrgIdentityByUserId(TokenManager.getUserId());
 		if (null == o && StringUtils.isBlank(oi.getId())) {
 			oi.setId(UUID.randomUUID().toString());

+ 20 - 36
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -1,36 +1,11 @@
 package com.goafanti.user.service.impl;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.stereotype.Service;
-
-
 import com.goafanti.app.bo.consultantListBo;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.DistrictGlossoryMapper;
-import com.goafanti.common.dao.IndustryCategoryMapper;
-import com.goafanti.common.dao.UserIdentityMapper;
-import com.goafanti.common.dao.UserInterestMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.dao.UserRoleMapper;
-import com.goafanti.common.enums.CertifySubmitType;
-import com.goafanti.common.enums.IdentityAuditStatus;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.UserLevel;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserIdentity;
@@ -45,6 +20,15 @@ import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityDetailAdminBo;
 import com.goafanti.user.service.UserIdentityService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper> implements UserIdentityService {
@@ -106,7 +90,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				User u = new User();
 				u.setId(userIdentity.getUid());
 				u.setLvl(1);
-				userMapper.updateByPrimaryKeySelective(u);
+				userMapper.update(u);
 			}
 			return userIdentityMapper.updateByPrimaryKeySelective(userIdentity);
 		}
@@ -114,11 +98,11 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@Override
 	public int updateUserDetail(UserIdentity u, String saveSign, Integer level) {
-		User user = userMapper.selectByPrimaryKey(u.getUid());
+		User user = userMapper.queryById(u.getUid());
 		if (!UserLevel.GENERAL.getCode().equals(user.getLvl())
 				&& !CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			user.setLvl(level);
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 		}
 		if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			createAuditorNotice(user);
@@ -131,10 +115,10 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Override
 	public int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level) {
 		// 审核员UPDATE_USER_DETAIL
-		User user = userMapper.selectByPrimaryKey(ui.getUid());
+		User user = userMapper.queryById(ui.getUid());
 		if (!IdentityAuditStatus.PASSED.getCode().equals(ui.getAuditStatus())) {
 			user.setLvl(UserLevel.GENERAL.getCode());
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 			createNotice(user, ui.getAuditStatus());
 		}
 		if (IdentityAuditStatus.PASSED.getCode().equals(ui.getAuditStatus())) {
@@ -145,7 +129,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 			user.setLvl(UserLevel.CERTIFIED.getCode());
 			user.setAid(aid);
 			user.setMid(mid);
-			userMapper.updateByPrimaryKeySelective(user);
+			userMapper.update(user);
 			createNotice(user, ui.getAuditStatus());
 		}
 		return userIdentityMapper.updateByPrimaryKeySelective(ui);
@@ -154,11 +138,11 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Override
 	public UserIdentity insertByAdmin(UserIdentity ui, String saveSign) {
 		userIdentityMapper.insert(ui);
-		User u = userMapper.selectByPrimaryKey(ui.getUid());
+		User u = userMapper.queryById(ui.getUid());
 		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
 				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			u.setAid(TokenManager.getAdminId());
-			userMapper.updateByPrimaryKeySelective(u);
+			userMapper.update(u);
 			createAuditorNotice(u);
 		}
 		return ui;
@@ -291,7 +275,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Override
 	public UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid) {
 		UserIdentity ui = userIdentityMapper.selectUserIdentityByUserId(uid);
-		User u = userMapper.selectByPrimaryKey(uid);
+		User u = userMapper.queryById(uid);
 		UserIdentityDetailAdminBo bo = new UserIdentityDetailAdminBo();
 		if (ui != null) {
 			BeanUtils.copyProperties(ui, bo);

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -83,12 +83,12 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 
 	@Override
 	public User selectByPrimaryKey(String id) {
-		return userMapper.selectByPrimaryKey(id);
+		return userMapper.queryById(id);
 	}
 
 	@Override
 	public int updateByPrimaryKeySelective(User u) {
-		return userMapper.updateByPrimaryKeySelective(u);
+		return userMapper.update(u);
 	}
 
 	@Override

+ 5 - 5
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -158,7 +158,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			//获取非已企业公出需要的审核人员
 			for (String s : split) {
 				PublicReleaseDetails prd=new PublicReleaseDetails();
-				User u=userMapper.selectByPrimaryKey(s);
+				User u=userMapper.queryById(s);
 					users.add(u);
 				str.append(u.getNickname()).append(",");
 				if (u!=null&&u.getShareType()==2){
@@ -636,7 +636,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Double duration= in.getDuration();
  		double d = durationSum(duration,userCount );
 		for (String s : split) {
-			User u=userMapper.selectByPrimaryKey(s);
+			User u=userMapper.queryById(s);
 			users.add(u);
 			boolean flag=true;
 			Integer id=null;
@@ -1176,7 +1176,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public int pushLimitUser(String uid, Integer hours) {
-		User user = userMapper.selectByPrimaryKey(uid);
+		User user = userMapper.queryById(uid);
 		if (!user.getAid().equals(TokenManager.getAdminId())){
 			return 0;
 		}
@@ -1199,7 +1199,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public boolean checkUserArchives(String uid) {
-		User user = userMapper.selectByPrimaryKey(uid);
+		User user = userMapper.queryById(uid);
 		UserArchives userArchives = userArchivesMapper.queryByUid(uid);
 		if (user.getNewChannel()==0){
 			if (userArchives==null||
@@ -1985,7 +1985,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(out.getId());
 					boolean myExamine = false;
 					for (OutPublicReleaseDetails ord : outPublicReleaseDetails) {
-						User user = userMapper.selectByPrimaryKey(ord.getUid());
+						User user = userMapper.queryById(ord.getUid());
 						if (user.getAid().equals(aid)){
 							flag=true;
 							if (out.getTechStartProcess()==1)myExamine=true;