|
|
@@ -317,6 +317,36 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
return excelUtil.exportExcel(list,"费用单列表",uploadPath);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Object detailsListExport(InputDetailsListBo in) {
|
|
|
+ List<OutExpenseAccountDetailsList> list = (List<OutExpenseAccountDetailsList>) detailsList(in).getList();
|
|
|
+ for (OutExpenseAccountDetailsList e : list) {
|
|
|
+ if (e.getTargetType()!=null){
|
|
|
+ if (e.getTargetType()==0){
|
|
|
+ e.setTargetName("固定费用");
|
|
|
+ }else {
|
|
|
+ e.setTargetName(e.getContractNo()+"-"+e.getBuyerName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (e.getType()!=0){
|
|
|
+ e.setTypeOther(EAsecondaryTypes.getDescByCode(e.getType()));
|
|
|
+ }else{
|
|
|
+ //如果是其他,又说明显示说明,没有说明显示费用类型
|
|
|
+ if (StringUtils.isBlank(e.getTypeOther())){
|
|
|
+ if (e.getSonType()!=0){
|
|
|
+ e.setTypeOther(EATypes.getDescByCode(e.getSonType()));
|
|
|
+ }else{
|
|
|
+ e.setTypeOther(String.format("其他(%s)",e.getSonTypeOther()));
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ e.setTypeOther(String.format("其他(%s)",e.getTypeOther()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ NewExcelUtil excelUtil=new NewExcelUtil(OutExpenseAccountDetailsList.class);
|
|
|
+ return excelUtil.exportExcel(list,"费用详细列表",uploadPath);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
private void pushResettingDebit(InputExpenseAccount in, Integer debitId) {
|
|
|
ExpenseAccount debit = expenseAccountMapper.selectByPrimaryKey(debitId);
|
|
|
@@ -971,6 +1001,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
expenseAccountLogMapper.updateUseLogByUseId(e.getEaId(),e.getId());
|
|
|
}else {
|
|
|
List<OutExpenseAccountLog> outExpenseAccountLogs = expenseAccountLogMapper.selectByEaid(in.getId());
|
|
|
+ addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
|
|
|
for (int i=0;i<list.size();i++){
|
|
|
ExpenseRelationship e =list.get(0);
|
|
|
for (OutExpenseAccountLog eal : outExpenseAccountLogs) {
|
|
|
@@ -981,7 +1012,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
expenseAccountLogMapper.deleteByeaid(in.getId());
|
|
|
expenseRelationshipMapper.deleteByPrimaryKey(in.getId());
|
|
|
}
|
|
|
- addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
|
|
|
+ expenseAccountMapper.deleteByPrimaryKey(in.getId());
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -1043,7 +1074,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object detailsList(InputDetailsListBo in) {
|
|
|
+ public Pagination<?> detailsList(InputDetailsListBo in) {
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
if(in.getStatus()!=null)params.put("status",in.getStatus());
|
|
|
if(in.getType()!=null)params.put("type",in.getType());
|