Skip to content

T
traffic-front
Commit 6b2dadc1 authored by zhkwei's avatar zhkwei
Browse files
Options

CIT模板配置

parent 3fd60ed7
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 13 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ 6b2dadc1
...@@ -397,10 +397,11 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -397,10 +397,11 @@ public class TemplateGroupServiceImpl extends AbstractService {
config.setUpdateTime(now); config.setUpdateTime(now);
config.setUpdateBy(authUserHelper.getCurrentUserId()); config.setUpdateBy(authUserHelper.getCurrentUserId());
cellTemplateConfigList.add(config); cellTemplateConfigList.add(config);
if (allowManual) { //只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei start
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList); // if (allowManual) {
} // addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
// }
//只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei end
PeriodDataSource pds = new PeriodDataSource(); PeriodDataSource pds = new PeriodDataSource();
pds.setAmount(BigDecimal.ZERO); pds.setAmount(BigDecimal.ZERO);
pds.setUpdateBy("Admin"); pds.setUpdateBy("Admin");
...@@ -556,9 +557,11 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -556,9 +557,11 @@ public class TemplateGroupServiceImpl extends AbstractService {
config.setUpdateBy(authUserHelper.getCurrentUserId()); config.setUpdateBy(authUserHelper.getCurrentUserId());
cellTemplateConfigList.add(config); cellTemplateConfigList.add(config);
//noinspection Duplicates //noinspection Duplicates
if (allowManual) { //只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei start
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList); // if (allowManual) {
} // addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
// }
//只允许单元格内容为${KeyIn}的才允许手工收入，所以此处注释 update by zhikai.z.wei end
PeriodDataSource pds = new PeriodDataSource(); PeriodDataSource pds = new PeriodDataSource();
pds.setAmount(BigDecimal.ZERO); pds.setAmount(BigDecimal.ZERO);
pds.setUpdateBy("Admin"); pds.setUpdateBy("Admin");
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml
View file @ 6b2dadc1
...@@ -364,12 +364,12 @@ ...@@ -364,12 +364,12 @@
<if test="subjectName != null and subjectName != ''"> <if test="subjectName != null and subjectName != ''">
and subject_name LIKE CONCAT('%' ,#{subjectName},'%') and subject_name LIKE CONCAT('%' ,#{subjectName},'%')
</if> </if>
<!--<if test="periodStart!=null">--> <if test="periodStart!=null">
<!--AND account_period &gt;= #{periodStart,jdbcType=INTEGER}--> AND account_period >= #{periodStart,jdbcType=INTEGER}
<!--</if>--> </if>
<!--<if test="periodEnd!=null">--> <if test="periodEnd!=null">
<!--AND account_period &lt;= #{periodEnd,jdbcType=INTEGER}--> AND account_period <= #{periodEnd,jdbcType=INTEGER}
<!--</if>--> </if>
UNION ALL UNION ALL
select select
id, organization_id, project_id, tms_period as period ,date,source, ledger_id, ledger_name, currency_code, id, organization_id, project_id, tms_period as period ,date,source, ledger_id, ledger_name, currency_code,
......
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