Bläddra i källkod

用户档案新增与修改

anderx 1 år sedan
förälder
incheckning
98d52195c0

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserArchivesMapper.java

@@ -82,6 +82,6 @@ public interface UserArchivesMapper {
      */
     int deleteById(Integer id);
 
-    UserArchives queryByUid(Integer id);
+    UserArchives queryByUid(String id);
 }
 

+ 1 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -249,4 +249,5 @@ public interface UserMapper {
 
     int getCountRestrictProject(@Param("uid") String uid, @Param("aid") String aid);
 
+    UserArchivesDetails selectUser(String id);
 }

+ 8 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2388,4 +2388,12 @@ inner join(
 		  and a.aid = #{aid}
 		and b.id= #{uid}
 	</select>
+    <select id="selectUser" resultType="com.goafanti.customer.bo.UserArchivesDetails">
+		select a.id uid,c.name industryName,b.org_code orgCode,b.business_scope businessScope ,b.intended_project intendedProject
+		from `user` a
+				 left join organization_identity b on a.id = b.uid
+				 left join industry_category c  on b.industry =c.id
+		where a.type = 1
+		  and a.id = #{id}
+	</select>
 </mapper>

+ 58 - 0
src/main/java/com/goafanti/customer/bo/UserArchivesDetails.java

@@ -0,0 +1,58 @@
+package com.goafanti.customer.bo;
+
+import com.goafanti.common.model.OrganizationContactBook;
+import com.goafanti.common.model.UserArchives;
+
+import java.util.List;
+
+public class UserArchivesDetails extends UserArchives {
+    private String industryName;
+    private String orgCode;
+    private String businessScope;
+    private String intendedProject;
+
+    List<OrganizationContactBook> contactList;
+
+
+
+
+    public String getIndustryName() {
+        return industryName;
+    }
+
+    public void setIndustryName(String industryName) {
+        this.industryName = industryName;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getBusinessScope() {
+        return businessScope;
+    }
+
+    public void setBusinessScope(String businessScope) {
+        this.businessScope = businessScope;
+    }
+
+    public String getIntendedProject() {
+        return intendedProject;
+    }
+
+    public void setIntendedProject(String intendedProject) {
+        this.intendedProject = intendedProject;
+    }
+
+    public List<OrganizationContactBook> getContactList() {
+        return contactList;
+    }
+
+    public void setContactList(List<OrganizationContactBook> contactList) {
+        this.contactList = contactList;
+    }
+}

+ 13 - 1
src/main/java/com/goafanti/customer/controller/UserArchivesController.java

@@ -90,9 +90,21 @@ public class UserArchivesController {
      * @return 单条数据
      */
     @GetMapping("/queryByUid")
-    public Result<UserArchives> queryByUid( Integer id) {
+    public Result<UserArchives> queryByUid( String id) {
         return new Result<>().data(this.userArchivesService.queryByUid(id));
     }
 
+
+    /**
+     * 微信查询查询企业其他信息与档案信息
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/queryByUidAll")
+    public Result queryByUidAll( String id) {
+        return new Result<>().data(this.userArchivesService.queryByUidAll(id));
+    }
+
 }
 

+ 1 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -591,4 +591,5 @@ public interface CustomerService {
 
 	Object getRestrictCustomerByName(String name);
 
+	UserArchivesDetails selectUserByUid(String id);
 }

+ 3 - 1
src/main/java/com/goafanti/customer/service/UserArchivesService.java

@@ -46,5 +46,7 @@ public interface UserArchivesService {
 
     Object list(UserArchives in, Integer pageNo, Integer pageSize);
 
-    Object queryByUid(Integer id);
+    Object queryByUid(String id);
+
+    Object queryByUidAll(String id);
 }

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

@@ -3128,6 +3128,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return userMapper.getRestrictCustomerByName(name,TokenManager.getAdminId());
 	}
 
+	@Override
+	public UserArchivesDetails selectUserByUid(String id) {
+		UserArchivesDetails user = userMapper.selectUser(id);
+		return user;
+	}
 
 
 	private List<InputExcelUser> pushUserName(List<InputExcelUser> list) {

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

@@ -1,14 +1,19 @@
 package com.goafanti.customer.service.impl;
 
 import com.goafanti.common.dao.UserArchivesMapper;
+import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.UserArchives;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.customer.bo.UserArchivesDetails;
+import com.goafanti.customer.service.CustomerService;
 import com.goafanti.customer.service.UserArchivesService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,6 +26,8 @@ import java.util.Map;
 public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper> implements UserArchivesService {
     @Resource
     private UserArchivesMapper userArchivesMapper;
+    @Resource
+    private CustomerService customerService;
     
     
     
@@ -33,12 +40,22 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
 	}
 
     @Override
-    public UserArchives queryByUid(Integer id) {
+    public UserArchives queryByUid(String id) {
         UserArchives userArchives =userArchivesMapper.queryByUid(id);
         if (userArchives==null)userArchives =new UserArchives();
         return userArchives;
     }
 
+    @Override
+    public Object queryByUidAll(String id) {
+        UserArchivesDetails user = customerService.selectUserByUid(id);
+        UserArchives userArchives = queryByUid(id);
+        List<OrganizationContactBook> customerContacts = customerService.findCustomerContacts(id);
+        if (!customerContacts.isEmpty())user.setContactList(customerContacts);
+        BeanUtils.copyProperties(userArchives, user);
+        return user;
+    }
+
     /**
      * 通过ID查询单条数据
      *