|
|
@@ -49,7 +49,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
public boolean checkAmount(TOrderInvoice t) {
|
|
|
TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
|
|
|
|
|
|
- int i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
|
|
|
+ Double i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
|
|
|
int flag=t.getAmount().add(new BigDecimal(i)).compareTo(tn.getTotalAmount());
|
|
|
if (flag>0) {
|
|
|
return true;
|
|
|
@@ -59,16 +59,21 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, String type,Integer pageNo,
|
|
|
+ public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, Integer type,Integer pageNo,
|
|
|
Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
- if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
+ if(type==0 &&(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN))) {
|
|
|
params.put("financeId", TokenManager.getAdminId());
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
|
|
|
- if(StringUtils.isNotBlank(type))params.put("type", type);
|
|
|
+ if(type!=null)params.put("type", type);
|
|
|
+ if (type ==1) {
|
|
|
+ //如果是省外则直接查本部门
|
|
|
+ Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ params.put("aDep", a.getDepartmentId());
|
|
|
+ }
|
|
|
if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
|
|
|
if(StringUtils.isNotBlank(name))params.put("name", name);
|
|
|
return (Pagination<TOrderInvoiceBo>)findPage("financeOrderInvoiceList", "financeOrderInvoiceCount", params, pageNo, pageSize);
|