release
yishiqihuasheng 2 years ago
parent c8533a9816
commit 5d93944a78
  1. 5
      dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
  2. 6
      dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml

@ -431,6 +431,11 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
vo.setAuditStatus(AuditStatusEnum.getVal(vo.getAuditStatus()));
vo.setApplyCheck(ApplyCheckEnum.getVal(vo.getApplyCheck()));
vo.setCheckStatus(CheckStatusEnum.getVal(vo.getCheckStatus()));
if ("1".equals(vo.getInAccountStatus())){
vo.setInAccountStatus("未入账");
}else {
vo.setInAccountStatus("未入账");
}
i++;
}
}

@ -1030,7 +1030,7 @@
t.remark,
t.scan_id AS scanId,
t.data_sources as dataSources,
t.dept_name as deptName
t.dept_name as deptName,
r.sn_voucher_number as snVoucherNumber,
r.posting_time as postingTime,
r.image_id as imageId,
@ -1114,14 +1114,14 @@
t.remark,
t.scan_id AS scanId,
t.data_sources as dataSources,
t.dept_name as deptName
t.dept_name as deptName,
r.sn_voucher_number as snVoucherNumber,
r.posting_time as postingTime,
r.image_id as imageId,
r.account_period as account_period,
r.bzdh,
r.bzr,
r.inaccount_status as inaccountStatus,
r.inaccount_status as inAccountStatus,
r.comp_code as compCode
FROM
t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code

Loading…
Cancel
Save