@ -74,6 +74,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
int total = 0 ;
int total = 0 ;
int receiptoutNum = 0 ;
int receiptoutNum = 0 ;
QueryWrapper < ReceiptoutEntity > receiptoutQueryWrapper = new QueryWrapper < > ( ) ;
QueryWrapper < ReceiptoutEntity > receiptoutQueryWrapper = new QueryWrapper < > ( ) ;
receiptoutQueryWrapper . eq ( "a.delete_mark" , "0" ) ;
int receiptout_item0Num = 0 ;
int receiptout_item0Num = 0 ;
QueryWrapper < Receiptout_item0Entity > receiptout_item0QueryWrapper = new QueryWrapper < > ( ) ;
QueryWrapper < Receiptout_item0Entity > receiptout_item0QueryWrapper = new QueryWrapper < > ( ) ;
boolean pcPermission = true ;
boolean pcPermission = true ;
@ -81,7 +82,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
boolean isPc = ServletUtil . getHeader ( "jnpf-origin" ) . equals ( "pc" ) ;
boolean isPc = ServletUtil . getHeader ( "jnpf-origin" ) . equals ( "pc" ) ;
if ( isPc & & pcPermission ) {
if ( isPc & & pcPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
Object receiptoutObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutQueryWrapper , receiptoutPagination . getMenuId ( ) , "jg_receiptout" ) ) ;
Object receiptoutObj = authorizeService . getCondition 2 ( new AuthorizeConditionModel ( receiptoutQueryWrapper , receiptoutPagination . getMenuId ( ) , "jg_receiptout" ) ) ;
if ( ObjectUtil . isEmpty ( receiptoutObj ) ) {
if ( ObjectUtil . isEmpty ( receiptoutObj ) ) {
return new ArrayList < > ( ) ;
return new ArrayList < > ( ) ;
} else {
} else {
@ -99,7 +100,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
}
if ( ! isPc & & appPermission ) {
if ( ! isPc & & appPermission ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
if ( ! userProvider . get ( ) . getIsAdministrator ( ) ) {
Object receiptoutObj = authorizeService . getCondition ( new AuthorizeConditionModel ( receiptoutQueryWrapper , receiptoutPagination . getMenuId ( ) , "jg_receiptout" ) ) ;
Object receiptoutObj = authorizeService . getCondition 2 ( new AuthorizeConditionModel ( receiptoutQueryWrapper , receiptoutPagination . getMenuId ( ) , "jg_receiptout" ) ) ;
if ( ObjectUtil . isEmpty ( receiptoutObj ) ) {
if ( ObjectUtil . isEmpty ( receiptoutObj ) ) {
return new ArrayList < > ( ) ;
return new ArrayList < > ( ) ;
} else {
} else {
@ -119,7 +120,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
}
}
}
if ( StringUtil . isNotEmpty ( receiptoutPagination . getDocumentNo ( ) ) ) {
/ * if ( StringUtil . isNotEmpty ( receiptoutPagination . getDocumentNo ( ) ) ) {
receiptoutNum + + ;
receiptoutNum + + ;
receiptoutQueryWrapper . lambda ( ) . like ( ReceiptoutEntity : : getDocumentNo , receiptoutPagination . getDocumentNo ( ) ) ;
receiptoutQueryWrapper . lambda ( ) . like ( ReceiptoutEntity : : getDocumentNo , receiptoutPagination . getDocumentNo ( ) ) ;
}
}
@ -134,7 +135,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
Long sec = Long . valueOf ( creatorTime . get ( 1 ) ) ;
Long sec = Long . valueOf ( creatorTime . get ( 1 ) ) ;
receiptoutPagination . setStartDate ( new Date ( fir ) ) ;
receiptoutPagination . setStartDate ( new Date ( fir ) ) ;
receiptoutPagination . setEndDate ( DateUtil . stringToDate ( DateUtil . daFormatYmd ( sec ) + " 23:59:59" ) ) ;
receiptoutPagination . setEndDate ( DateUtil . stringToDate ( DateUtil . daFormatYmd ( sec ) + " 23:59:59" ) ) ;
}
} * /
if ( AllIdList . size ( ) > 0 ) {
if ( AllIdList . size ( ) > 0 ) {
receiptoutQueryWrapper . lambda ( ) . in ( ReceiptoutEntity : : getId , AllIdList ) ;
receiptoutQueryWrapper . lambda ( ) . in ( ReceiptoutEntity : : getId , AllIdList ) ;
@ -176,7 +177,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
if ( StringUtil . isNotNull ( detpartment ) ) {
if ( StringUtil . isNotNull ( detpartment ) ) {
receiptoutPagination . setDepartmentId ( detpartment ) ;
receiptoutPagination . setDepartmentId ( detpartment ) ;
}
}
IPage < ReceiptoutEntity > userIPage = receiptoutMapper . queryReceiptout ( page , receiptoutPagination );
IPage < ReceiptoutEntity > userIPage = receiptoutMapper . queryReceiptout ( page , receiptoutPagination , receiptoutQueryWrapper );
return receiptoutPagination . setData ( userIPage . getRecords ( ) , userIPage . getTotal ( ) ) ;
return receiptoutPagination . setData ( userIPage . getRecords ( ) , userIPage . getTotal ( ) ) ;
}
}
@Override
@Override