From 9b23af5cecdcea86540738dd04f4431cd03efbf8 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 22 Jan 2018 11:32:25 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 4c25ca1..83484e0 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -9,6 +9,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -23,8 +24,12 @@
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
+import com.moral.common.util.Crypto;
+import com.moral.common.util.ResourceUtil;
import com.moral.entity.Account;
+import com.moral.entity.Organization;
import com.moral.mapper.AccountMapper;
+import com.moral.mapper.OrganizationMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
@@ -40,6 +45,9 @@
@Resource
private OrganizationService organizationService;
+ @Resource
+ private OrganizationMapper organizationMapper;
+
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
@@ -93,14 +101,40 @@
public PageBean<Account> getAccountListByPage(Map<String, Object> parameters) {
Example example = new Example(Account.class);
Criteria criteria = example.createCriteria();
- if (parameters.containsKey("name")) {
- criteria.andLike("name", "%" + (String) parameters.get("name") + "%");
+ if (parameters.containsKey("accountName")) {
+ criteria.andLike("accountName", "%" + (String) parameters.get("accountName") + "%");
}
if (parameters.containsKey("mobile")) {
criteria.andLike("mobile", "%" + (String) parameters.get("mobile") + "%");
}
+ if (parameters.containsKey("isDelete")) {
+ criteria.andEqualTo("isDelete", parameters.get("isDelete"));
+ }
+ if (parameters.containsKey("sorter")) {
+ example.setOrderByClause((String) parameters.get("sorter"));
+ }
PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
List<Account> accounts = accountMapper.selectByExample(example);
+ Set<Integer> organizationIds = new HashSet<Integer>();
+ for (Account account : accounts) {
+ if (!ObjectUtils.isEmpty(account.getOrganizationId())) {
+ organizationIds.add(account.getOrganizationId());
+ }
+ }
+ if(!ObjectUtils.isEmpty(organizationIds)){
+ example = new Example(Organization.class);
+ example.or().andIn("id", organizationIds);
+ List<Organization> organizations = organizationMapper.selectByExample(example);
+ for (Account account : accounts) {
+ for (Organization organization : organizations) {
+ if (account.getOrganizationId() == organization.getId()) {
+ account.setOrganization(organization);
+ break;
+ }
+ }
+ }
+ }
+
return new PageBean<Account>(accounts);
}
@@ -110,10 +144,28 @@
if (ObjectUtils.isEmpty(account.getId())) {
account.setIsDelete(Constants.IS_DELETE_FALSE);
account.setCreateTime(new Date());
+ account.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
return accountMapper.insertSelective(account);
- }else {
+ } else {
return accountMapper.updateByPrimaryKeySelective(account);
}
}
+ @Override
+ @Transactional
+ public Integer deleteAccountsByLogic(List<Integer> ids) {
+ Account account = new Account();
+ account.setIsDelete(Constants.IS_DELETE_TRUE);
+ Example example = new Example(Account.class);
+ example.or().andIn("id", ids);
+ return accountMapper.updateByExampleSelective(account, example);
+ }
+
+ @Override
+ public Integer getAccountCountByAccountName(String accountName) {
+ Account account = new Account();
+ account.setAccountName(accountName);
+ return accountMapper.selectCount(account);
+ }
+
}
--
Gitblit v1.8.0