Browse Source

发送邮件新增处理

anderx 8 months ago
parent
commit
b29944d4ed

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

@@ -2447,7 +2447,6 @@ inner join(
     <select id="selectUser" resultType="com.goafanti.customer.bo.UserArchivesDetails">
 		select a.id               uid,
 			   b.industry        ,
-			   c.name             industryName,
 			   b.org_code         orgCode,
 			   b.business_scope   businessScope,
 			   b.intended_project intendedProject,
@@ -2456,7 +2455,6 @@ inner join(
 			   d.channel_type    channelType
 		from `user` a
 				 left join organization_identity b on a.id = b.uid
-				 left join industry_category c  on b.industry =c.id
 				left join user_mid d on a.id=d.uid
 		where a.type = 1
 		  and a.id = #{id}

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 public class UserArchivesDetails extends UserArchives {
     private String industryName;
-    private Integer industry;
+    private String industry;
     private String orgCode;
     private String businessScope;
     private String intendedProject;
@@ -126,11 +126,11 @@ public class UserArchivesDetails extends UserArchives {
 
     List<OrganizationContactBook> contactList;
 
-    public Integer getIndustry() {
+    public String getIndustry() {
         return industry;
     }
 
-    public void setIndustry(Integer industry) {
+    public void setIndustry(String industry) {
         this.industry = industry;
     }
 

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

@@ -52,6 +52,9 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     private DistrictGlossoryMapper districtGlossoryMapper;
     @Resource
     private UserInterviewProjectMapper userInterviewProjectMapper;
+    @Resource
+    private  IndustryCategoryMapper industryCategoryMapper;
+
 
 
 
@@ -84,7 +87,6 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         }
         UserArchivesDetails user = customerService.selectUserByUid(id);
         User u = userMapper.queryById(id);
-
         OrganizationIdentity ori = organizationIdentityMapper.selectOrgIdentityByUserId(id);
         pushProvincePlus(ori, user);
 
@@ -142,6 +144,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         user.setLocationProvince(ori.getLocationProvince());
         user.setLocationCity(ori.getLocationCity());
         user.setLocationArea(ori.getLocationArea());
+//        user.setIndustryName(ori.getin());
         List<DistrictGlossory> all = districtGlossoryMapper.getAll();
         if (ori.getLocationProvince()!=null){
             all.stream().filter(e -> e.getLevel()==1).collect(Collectors.toList()).forEach(e -> {