|
|
@@ -11,6 +11,7 @@ import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.*;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
+import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.expenseAccount.Enums.EAProcessStatus;
|
|
|
import com.goafanti.expenseAccount.bo.*;
|
|
|
@@ -522,9 +523,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
public Object pageList(InputPageListBo in) {
|
|
|
Map<String ,Object> param=new HashMap<>();
|
|
|
addParam(in, param);
|
|
|
- return findPagePlus("selectExpenseAccountList",
|
|
|
+ Pagination<?> pagePlus = findPagePlus("selectExpenseAccountList",
|
|
|
"selectExpenseAccountCount",
|
|
|
"selectExpenseAccountTotalAmount", param, in.getPageNo(), in.getPageSize());
|
|
|
+ List<OutExpenseAccountBo> list = (List<OutExpenseAccountBo>) pagePlus.getList();
|
|
|
+ for (OutExpenseAccountBo e : list) {
|
|
|
+ e.setExamine(pushExpenseAccountGetExamine(e.getId(), e.getProcessStatus()));
|
|
|
+ }
|
|
|
+ return pagePlus;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -587,6 +593,28 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 判断角色是否已经审核
|
|
|
+ * @param
|
|
|
+ */
|
|
|
+ private Integer pushExpenseAccountGetExamine(Integer id,Integer processStatus) {
|
|
|
+ List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(id, processStatus);
|
|
|
+ boolean flag=false;
|
|
|
+ for (ExpenseAccountExamine e : list) {
|
|
|
+ if (e.getAuditor().equals(TokenManager.getAdminId())){
|
|
|
+ if (e.getStatus()==0){
|
|
|
+ flag=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (flag){
|
|
|
+ return 1;
|
|
|
+ }else {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public Object updateType(InputExpenseAccount in) {
|
|
|
expenseAccountDetailsMapper.deleteByeaid(in.getId());
|