|
|
@@ -22,6 +22,7 @@ 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.OrganizationContactBookMapper;
|
|
|
@@ -93,6 +94,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
private BusinessProjectMapper businessProjectMapper;
|
|
|
@Resource
|
|
|
private UserLockReleaseMapper userLockReleaseMapper;
|
|
|
+ @Resource
|
|
|
+ private AdminMapper adminMapper;
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<CustomerListOut> listPrivatePersonalCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
|
|
|
@@ -163,7 +166,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
public Pagination<CustomerListOut> listAllOrganizationCustomer(CustomerListIn cli, Integer pageNo,Integer pageSize) {
|
|
|
cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
|
|
|
Map<String,Object> params = disposeParams(cli);
|
|
|
- return (Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList","selectOrganizationCustomerCount",params,pageNo,pageSize);
|
|
|
+ Pagination<CustomerListOut> p=(Pagination<CustomerListOut>) findPage("selectOrganizationCustomerList","selectOrganizationCustomerCount",params,pageNo,pageSize);
|
|
|
+ List<CustomerListOut> l=(List<CustomerListOut>) p.getList();
|
|
|
+ for (CustomerListOut c : l) {
|
|
|
+ if (null!=c) {
|
|
|
+ if(null!=c.getAid())c.setAdminName(adminMapper.selectNameByid(c.getAid()));
|
|
|
+ if (null!=c.getShareType()&&c.getShareType().equals("1"))c.setAdminName("暂无");
|
|
|
+ if(null!=c.getMid())c.setInformationMaintainer(adminMapper.selectNameByid(c.getMid()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return p;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1177,9 +1189,18 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
Long l1,l2;
|
|
|
int diff1,diff2;
|
|
|
for(CustomerListOut clo: tmpList){
|
|
|
- s1 = StringUtils.isBlank(clo.getLastFollowTime()) ? clo.getTransferTime() : clo.getLastFollowTime();
|
|
|
- s2 = StringUtils.isBlank(clo.getLastSignTime()) ? clo.getTransferTime() : clo.getLastSignTime();
|
|
|
+ //s1 = StringUtils.isBlank(clo.getLastFollowTime()) ? clo.getTransferTime() : clo.getLastFollowTime();
|
|
|
try {
|
|
|
+ if (StringUtils.isNotBlank(clo.getLastFollowTime())){
|
|
|
+ if(DateUtils.parseDate(clo.getLastFollowTime(), AFTConstants.YYYYMMDDHHMMSS).getTime()>DateUtils.parseDate(clo.getTransferTime(), AFTConstants.YYYYMMDDHHMMSS).getTime()) {
|
|
|
+ s1=clo.getLastFollowTime();
|
|
|
+ }else {
|
|
|
+ s1=clo.getTransferTime();
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ s1=clo.getTransferTime();
|
|
|
+ }
|
|
|
+ s2 = StringUtils.isBlank(clo.getLastSignTime()) ? clo.getTransferTime() : clo.getLastSignTime();
|
|
|
l1 = DateUtils.parseDate(s1, AFTConstants.YYYYMMDDHHMMSS).getTime();
|
|
|
l2 = DateUtils.parseDate(s2, AFTConstants.YYYYMMDDHHMMSS).getTime();
|
|
|
diff1 = (int)((l1 + AFTConstants.USER_FOLLOW_LIMIT_MS - now.getTime())/(24*3600*1000));
|