Commit 0790718a authored by zhkwei's avatar zhkwei

CIT日记账预览bug修改

parent d72fbba6
......@@ -286,9 +286,9 @@ public class CitImportExcelServiceImpl extends BaseService {
}
citJournal.setAttribute3(CitCommonUtil.getValue(rowData.getCell(38)).toString());
citJournal.setAttribute4(CitCommonUtil.getValue(rowData.getCell(39)).toString());
citJournal.setAttribute5(CitCommonUtil.getValue(rowData.getCell(40)).toString());
citJournal.setAttribute6(CitCommonUtil.getValue(rowData.getCell(41)).toString());
citJournal.setAttribute7(CitCommonUtil.getValue(rowData.getCell(42)).toString());
citJournal.setAttribute5(CitCommonUtil.getValue(rowData.getCell(40)).toString().replace(".0",""));
citJournal.setAttribute6(CitCommonUtil.getValue(rowData.getCell(41)).toString().replace(".0",""));
citJournal.setAttribute7(CitCommonUtil.getValue(rowData.getCell(42)).toString().replace(".0",""));
citJournal.setAttribute8(CitCommonUtil.getValue(rowData.getCell(43)).toString());
citJournal.setAttribute9(CitCommonUtil.getValue(rowData.getCell(44)).toString());
citJournal.setAttribute10(CitCommonUtil.getValue(rowData.getCell(45)).toString());
......
......@@ -418,7 +418,7 @@
attribute16,
created_by, created_date, late_updated_by,
late_updated_date, create_time, update_time,is_select
from cit_journal_entry_adjust where period like #{record.period}
from cit_journal_entry_adjust where period like CONCAT('%' ,#{record.period},'%')
<if test="orgList != null and orgList.size > 0">
AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
......@@ -450,7 +450,7 @@
accounted_dr, accounted_cr, entered_dr, entered_cr, cf_item, attribute1, attribute2, attribute3, attribute4, attribute5,
attribute6, attribute7, attribute8, attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15,
attribute16, created_by, created_date, late_updated_by, late_updated_date, create_time, update_time, is_select
from journal_entry where tms_period like #{record.period}
from journal_entry where tms_period like CONCAT('%' ,#{record.period},'%')
<if test="orgList != null and orgList.size > 0">
AND organization_id in
<foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment