luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导出

Browse Source
release
yishiqihuasheng 2 years ago
parent 122c5fba5a
commit c8533a9816
8 changed files with 41 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java
  2. 4
      dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java
  3. 4
      dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java
  4. 1
      dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java
  5. 5
      dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
  6. 11
      dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java
  7. 22
      dxhy-core/src/main/resources/mapper/QstjbMapper.xml
  8. 21
      dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml

1
dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java
Unescape View File

@ -192,7 +192,6 @@ public class TDxInvoice implements Serializable {
private String imageId;
private String accountPeriod;
private String compCode;
private String inaccountStatus;
private String bzdh;
private String bzr;
private String inAccountStatus;

4
dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java
Unescape View File

@ -39,10 +39,10 @@ public class CustomsCollectVO {
private String snVoucherNumber;
private String postingTime;
private String imageId;
private String imageNumber;
private String accountPeriod;
private String compCode;
private String inaccountStatus;
private String inAccountStatus;
private String bzdh;
private String bzr;

4
dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java
Unescape View File

@ -107,10 +107,10 @@ public class QstjbRespVO implements Serializable {
private String snVoucherNumber;
private String postingTime;
private String imageId;
private String imageNumber;
private String accountPeriod;
private String compCode;
private String inaccountStatus;
private String inAccountStatus;
private String bzdh;
private String bzr;

1
dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java
Unescape View File

@ -43,7 +43,6 @@ public class SignQueryVO {
private String imageId;
private String accountPeriod;
private String compCode;
private String inaccountStatus;
private String bzdh;
private String bzr;
private String inAccountStatus;

5
dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
Unescape View File

@ -226,6 +226,11 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
vo.setCheckStatus(dictdetaServcice.queryDictName(DictConstant.CHECK_STATUS, vo.getCheckStatus()));
vo.setEntryDiscrepancy(
dictdetaServcice.queryDictName(DictConstant.ENTRY_DISCREPANCY, vo.getEntryDiscrepancy()));
if ("1".equals(vo.getInAccountStatus())){
vo.setInAccountStatus("已入账");
}else {
vo.setInAccountStatus("未入账");
}
i++;
}
}

11
dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QstjbServiceImpl.java
Unescape View File

@ -68,10 +68,10 @@ public class QstjbServiceImpl extends MpBaseServiceImpl<QstjbDao, QstjbRespVO> i
if (resultList.get(i).getSe() != null && !"".equals(resultList.get(i).getSe())) {
resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
}
if ("1".equals(resultList.get(i).getInaccountStatus())){
resultList.get(i).setInaccountStatus("已入账");
if ("1".equals(resultList.get(i).getInAccountStatus())){
resultList.get(i).setInAccountStatus("已入账");
}else {
resultList.get(i).setInaccountStatus("未入账");
resultList.get(i).setInAccountStatus("未入账");
}
}
}
@ -105,6 +105,11 @@ public class QstjbServiceImpl extends MpBaseServiceImpl<QstjbDao, QstjbRespVO> i
resultList.get(i).setJe(AmountFormatUtil.fmtMicrometer(resultList.get(i).getJe()));
resultList.get(i).setSe(AmountFormatUtil.fmtMicrometer(resultList.get(i).getSe()));
if ("1".equals(resultList.get(i).getInAccountStatus())){
resultList.get(i).setInAccountStatus("已入账");
}else {
resultList.get(i).setInAccountStatus("未入账");
}
}
}

22
dxhy-core/src/main/resources/mapper/QstjbMapper.xml
Unescape View File

@ -20,10 +20,10 @@
<result column="je" property="je"/>
<result column="se" property="se"/>
<result column="deptName" property="businessName"/>
<result column="inaccount_status" property="inaccountStatus"/>
<result column="inaccount_status" property="inAccountStatus"/>
<result column="sn_voucher_number" property="snVoucherNumber"/>
<result column="posting_time" property="postingTime"/>
<result column="image_id" property="imageId"/>
<result column="image_id" property="imageNumber"/>
<result column="account_period" property="accountPeriod"/>
<result column="bzdh" property="bzdh"/>
<result column="bzr" property="bzr"/>
@ -141,23 +141,23 @@
select t.id id,t.uuid uuid,date_format(t.qs_date,'%Y-%m-%d') qsrq,t.qs_status qszt,t.qs_type qsfs,t.qs_name qsr,
t.invoice_code fpdm,t.invoice_no fphm,t.invoice_type invoiceType,date_format(t.invoice_date,'%Y-%m-%d')
kprq,t.gf_tax_no gfsh,t.gf_name gfmc,
t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName,t.sn_voucher_number as snVoucherNumber,
t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName,t.sn_voucher_number,
t.posting_time as postingTime,
t.image_id as imageId,
t.account_period as account_period,
t.image_id,
t.account_period,
t.bzdh,
t.bzr,
t.inaccount_status as inaccountStatus,
t.comp_code as compCode
t.inaccount_status,
t.comp_code
from t_dx_record_invoice t
where t.qs_status = '1'
and t.rzh_yesorno = '0'
and t.invoice_type in ('01','03','08','14')
and t.invoice_type in ('01','03','08','14','31')
and t.qs_date between #{qsrqq} and #{qsrqz}
and t.gf_tax_no = #{gfsh}
<if test="companyCode != null and companyCode != '' and companyCode != 'null' ">
and t.comp_code = #{companyCode}
</if>
and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
<if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
and t.qs_type = #{qsfs}
</if>

21
dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
Unescape View File

@ -906,20 +906,25 @@
t.audit_status as auditStatus,
t.apply_check as applyCheck,
t.check_status as checkStatus,
t.entry_discrepancy as entryDiscrepancy
t.entry_discrepancy as entryDiscrepancy,
t.sn_voucher_number as snVoucherNumber,
t.posting_time as postingTime,
t.image_id as imageNumber,
t.account_period as account_period,
t.bzdh,
t.bzr,
t.inaccount_status as inAccountStatus,
t.comp_code as compCode
FROM
t_dx_customs_record t
where t.qs_status = '0'
and t.export_mark = '0'
and (t.data_sources = '0' or (t.data_sources != '0' and t.collect_upload_status = '2'))
<if test="queryParams.gfTaxNoList!=null and queryParams.gfTaxNoList.size>0">
and t.gf_tax_no in
<foreach item="item" index="index" collection="queryParams.gfTaxNoList" open="(" separator="," close=")">
#{item,jdbcType=VARCHAR}
</foreach>
<if test="gfsh!=null">
and t.gf_tax_no = #{gfsh}
</if>
<if test="queryParams.gfTaxNo!=null and queryParams.gfTaxNo!='' and queryParams.gfTaxNo!='99'">
and t.gf_tax_no = #{queryParams.gfTaxNo}
<if test="companyCode!=null">
and t.comp_code = #{companyCode}
</if>
<if test="queryParams.fillInDateBegin!=null and queryParams.fillInDateBegin!=''">
and t.fill_in_date &gt;= #{queryParams.fillInDateBegin}

Write Preview
Loading…
Cancel
Save