|
|
@@ -1,7 +1,6 @@
|
|
|
package com.goafanti.customer.service.impl;
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
-import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
@@ -11,24 +10,22 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
import java.util.UUID;
|
|
|
-
|
|
|
import javax.annotation.Resource;
|
|
|
-
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
-import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
import com.goafanti.common.dao.BusinessGlossoryMapper;
|
|
|
import com.goafanti.common.dao.BusinessProjectMapper;
|
|
|
+import com.goafanti.common.dao.OrganizationAnnualReportMapper;
|
|
|
import com.goafanti.common.dao.OrganizationApplicationInfoMapper;
|
|
|
import com.goafanti.common.dao.OrganizationContactBookMapper;
|
|
|
import com.goafanti.common.dao.OrganizationIdentityMapper;
|
|
|
+import com.goafanti.common.dao.OrganizationYearProjectMapper;
|
|
|
import com.goafanti.common.dao.UserBusinessMapper;
|
|
|
import com.goafanti.common.dao.UserFollowBusinessMapper;
|
|
|
import com.goafanti.common.dao.UserFollowMapper;
|
|
|
@@ -101,6 +98,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
private AdminMapper adminMapper;
|
|
|
@Resource
|
|
|
private OrganizationApplicationInfoMapper organizationApplicationInfoMapper;
|
|
|
+ @Resource
|
|
|
+ private OrganizationAnnualReportMapper organizationAnnualReportMapper;
|
|
|
+ @Resource
|
|
|
+ private OrganizationYearProjectMapper organizationYearProjectMapper;
|
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -360,9 +361,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private Float countIntegrity(CustomerOrganizationDetailBo bo) {
|
|
|
+ public Float countIntegrity(CustomerOrganizationDetailBo bo) {
|
|
|
//完整资料总数
|
|
|
- int max=12;
|
|
|
+ int max=10;
|
|
|
int number=0;
|
|
|
if(bo.getIndustry()!=null)number+=1;
|
|
|
if(bo.getLocationProvince()!=null)number+=1;
|
|
|
@@ -370,11 +371,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
if(bo.getRegisteredCapital()!=null)number+=1;
|
|
|
if(StringUtils.isNotBlank(bo.getCooperationSituation()))number+=1;
|
|
|
if(StringUtils.isNotBlank(bo.getQualification()))number+=1;
|
|
|
- if(bo.getAssets()!=null)number+=1;
|
|
|
- if(bo.getLastYearResearchAmount()!=null)number+=1;
|
|
|
- if(bo.getYearSalesAmount()!=null)number+=1;
|
|
|
+// if(bo.getAssets()!=null)number+=1;
|
|
|
+// if(bo.getLastYearResearchAmount()!=null)number+=1;
|
|
|
+// if(bo.getYearSalesAmount()!=null)number+=1;
|
|
|
+// if(StringUtils.isNotBlank(bo.getAccomplishSituation()))number+=1;
|
|
|
+ if (organizationAnnualReportMapper.selectOrgAnnualCount(bo.getUid())>0)number+=1;
|
|
|
+ if (organizationAnnualReportMapper.selectOrgYearProjectCount(bo.getUid())>0)number+=1;
|
|
|
if(StringUtils.isNotBlank(bo.getCoreTechnology()))number+=1;
|
|
|
- if(StringUtils.isNotBlank(bo.getAccomplishSituation()))number+=1;
|
|
|
if(bo.getCreditRating()!=null)number+=1;
|
|
|
float f= (float)number/max;
|
|
|
return f;
|