|
@@ -176,7 +176,9 @@ public class BizFinancialKeepAccountController extends BaseController {
|
|
|
}else {
|
|
|
detail=details.get(0);
|
|
|
BizFinancialReportTaxDetail financialReportTaxDetail = financialReportTaxDetailService.query().eq("company_id", l.getCompanyId()).le("year", detail.getYear()).le("month", detail.getMonth()).orderByDesc("year").orderByDesc("month").last("limit 1").one();
|
|
|
- l.setPreviousAnnualLosses(financialReportTaxDetail.getPreviousAnnualLosses());
|
|
|
+ if(null != financialReportTaxDetail){
|
|
|
+ l.setPreviousAnnualLosses(financialReportTaxDetail.getPreviousAnnualLosses());
|
|
|
+ }
|
|
|
List<BizWorkOrderRecord> records = bizWorkOrderRecordService.query().eq("work_order_id", l.getWorkOrderId()).eq("year", conditions.getYear()).eq("month", conditions.getMonth()).eq("from_id", 0).list();
|
|
|
if(records.size()>0){
|
|
|
SysUser sysUser = sysUserMapper.selectUserById(records.get(0).getRecorderId());
|