|
|
@@ -114,7 +114,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
|
|
|
record.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
}
|
|
|
- addOrderLog(orderNo, OrderLogProcess.CWPD.getCode(),null);
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.CWSH.getCode(),null);
|
|
|
r = tOrderNewMapper.updateByPrimaryKeySelective(record);
|
|
|
}else{
|
|
|
//返回错误标志 提示订单编号或者财务专员选择错误
|
|
|
@@ -166,6 +166,14 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
|
|
|
result.put("pagination", data);
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
+ List<OrderListBo> list = (List<OrderListBo>) data.getList();
|
|
|
+ for (OrderListBo o : list) {
|
|
|
+ int i = tOrderExamineMapper.selectByOrderNoAndAid(o.getOrderNo(), TokenManager.getAdminId());
|
|
|
+ if (i==0) o.setMyExamine(0);
|
|
|
+ else o.setMyExamine(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids,listDep);
|
|
|
result.put("count", count);
|
|
|
return result;
|
|
|
@@ -493,7 +501,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
tl.setAid(TokenManager.getAdminId());
|
|
|
tl.setOrderNo(t.getOrderNo());
|
|
|
if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
- tl.setProcess(OrderLogProcess.CWPD.getCode());
|
|
|
+ tl.setProcess(OrderLogProcess.CWSH.getCode());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
|
|
|
tl.setProcess(OrderLogProcess.XMZJSH.getCode());
|
|
|
}
|