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

ariesy 所属组织为维度导出查询条件修改

Browse Source
release
yefei 2 years ago
parent f9e8656916
commit 98aafdd355
28 changed files with 501 additions and 568 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. 3
      dxhy-core/src/main/java/com/dxhy/core/model/CautionAbnormalReqVO.java
  2. 117
      dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
  3. 11
      dxhy-core/src/main/java/com/dxhy/core/thread/CustomsCollectThread.java
  4. 10
      dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java
  5. 11
      dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java
  6. 13
      dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java
  7. 12
      dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java
  8. 10
      dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java
  9. 2
      dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java
  10. 11
      dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java
  11. 13
      dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java
  12. 4
      dxhy-core/src/main/java/com/dxhy/core/thread/FpqsExportThread.java
  13. 9
      dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java
  14. 12
      dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java
  15. 11
      dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java
  16. 11
      dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java
  17. 9
      dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java
  18. 5
      dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java
  19. 11
      dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java
  20. 3
      dxhy-core/src/main/resources/mapper/FpZhMapper.xml
  21. 9
      dxhy-core/src/main/resources/mapper/QssbMapper.xml
  22. 18
      dxhy-core/src/main/resources/mapper/QstjbMapper.xml
  23. 5
      dxhy-core/src/main/resources/mapper/QsxxMapper.xml
  24. 6
      dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
  25. 9
      dxhy-core/src/main/resources/mapper/SgqsMapper.xml
  26. 69
      dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
  27. 21
      dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
  28. 14
      dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml

3
dxhy-core/src/main/java/com/dxhy/core/model/CautionAbnormalReqVO.java
Unescape View File

@ -16,6 +16,9 @@ public class CautionAbnormalReqVO extends BaseExportVO {
* 购方税号
*/
private String gfsh;
private String companyCode;
/**
* 发票号码
*/

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

@ -60,15 +60,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryCollect(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("number", "0");
json.put("taxAmountSum", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<CustomsCollectVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 合计信息,仅第一页时需要统计，减少数据库压力
if (curr == 1) {
@ -85,7 +76,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
List<CustomsCollectVO> pageList = super.baseMapper.queryCollect(pramsMap);
PageInfo<CustomsCollectVO> pageInfo = new PageInfo<>(pageList);
@ -109,7 +99,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -119,7 +109,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
List<String> gfTaxNoList = (List<String>) pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
@ -147,7 +137,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
PageHelper.startPage(curr, size);
List<CustomsCollectVO> pageList = super.baseMapper.queryInsertCustoms(pramsMap);
log.info("pageList=======>{}",pageList);
log.info("pageList=======>{}", pageList);
PageInfo<CustomsCollectVO> pageInfo = new PageInfo<>(pageList);
json.put("hasNext", pageInfo.isHasNextPage());
json.put("nextPage", pageInfo.getNextPage());
@ -177,7 +167,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
json.put("datalist", resultList);
}
log.info("json=====>{}",json);
log.info("json=====>{}", json);
return json;
}
@ -186,14 +176,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryManualSign(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("taxAmountSum", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<CustomsCollectVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 合计信息,仅第一页时需要统计，减少数据库压力
if (curr == 1) {
@ -248,7 +230,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -257,21 +239,12 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryRzcxByPage(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNo");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("number", "0");
json.put("taxAmountSum", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<CustomsRzcxVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
List<CustomsRzcxVO> pageList = super.baseMapper.queryRzcxByPage(pramsMap);
log.info("pageList={}",pageList.size());
log.info("pageList={}", pageList.size());
PageInfo<CustomsRzcxVO> pageInfo = new PageInfo<>(pageList);
json.put("hasNext", pageInfo.isHasNextPage());
json.put("nextPage", pageInfo.getNextPage());
@ -279,14 +252,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
// 用于页面展示
List<CustomsRzcxVO> resultList = pageInfo.getList();
if (resultList != null && resultList.size() > 0) {
// List<DictdetaModel> lyModels = dictdetaServcice.selectDictdeta("jksSources");
// List<DictdetaModel> qsztModels = dictdetaServcice.selectDictdeta("qsStatus");
// List<DictdetaModel> qsfsModels = dictdetaServcice.selectDictdeta("qsType");
// List<DictdetaModel> glztModels = dictdetaServcice.selectDictdeta("GLZT");
// List<DictdetaModel> rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno");
// List<DictdetaModel> rzclztModels = dictdetaServcice.selectDictdeta("authStatus");
// List<DictdetaModel> rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS");
// List<DictdetaModel> cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS");
int i = 1;
for (CustomsRzcxVO vo : resultList) {
vo.setXh(String.valueOf((curr - 1) * size + i));
@ -295,13 +260,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
// 字典值转换
vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt()));
vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources()));
// if (lyModels!=null){
// for (DictdetaModel model : lyModels){
// if (model.getDictcode().equals(vo.getDataSources())){
// vo.setDataSources(model.getDictname());
// }
// }
// }
vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, vo.getQsStatus()));
String qsType = vo.getQsType();
vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
@ -314,7 +272,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -323,15 +281,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryVatRzcx(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNo");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("number", "0");
json.put("taxAmountSum", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<ExportInvoiceRzcxVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
@ -369,7 +318,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -378,15 +327,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryCustomsRzcx(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNo");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("number", "0");
json.put("taxAmountSum", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<ExportCustomsRzcxVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
@ -433,7 +373,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -442,14 +382,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject querySign(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("taxAmountSum", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<CustomsCollectVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
@ -486,7 +418,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
@ -496,12 +428,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryCustomsRefundConfirmList(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
json.put("hjse", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<String[]>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
if (curr == 1) {
@ -546,7 +472,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -555,15 +481,6 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryExportInvoiceList(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("hjsl", "0");
json.put("hjje", "0");
json.put("hjse", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<ExportInvoiceRzcxVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
@ -600,7 +517,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}
@ -609,15 +526,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
public JSONObject queryExportCustomsList(Map<String, Object> pramsMap, int curr, int size) {
JSONObject json = new JSONObject();
List<String> gfTaxNoList = (List<String>)pramsMap.get("gfTaxNoList");
if (gfTaxNoList.size() == 0) {
// 未从getUserInfo()获取到购方税号信息
json.put("hjsl", "0");
json.put("hjse", "0");
json.put("total", "0");
json.put("datalist", new ArrayList<ExportCustomsRzcxVO>());
} else {
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
// 查询发票上的购方信息
PageHelper.startPage(curr, size);
@ -652,7 +561,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
}
}
json.put("datalist", resultList);
}
return json;
}

11
dxhy-core/src/main/java/com/dxhy/core/thread/CustomsCollectThread.java
Unescape View File

@ -123,6 +123,7 @@ public class CustomsCollectThread extends BaseThread {
JSONObject prams = JSONObject.parseObject(condition);
String gfTaxNo = prams.getString("gfTaxNo");
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String createDateBegin = prams.getString("createDateBegin");
String createDateEnd = prams.getString("createDateEnd");
int ycpbz = prams.getIntValue("ycpbz");
@ -134,13 +135,13 @@ public class CustomsCollectThread extends BaseThread {
pramsMap.put("dbName", dbName);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
pramsMap.put("gfTaxNoList", gfTaxNoList);
} else {
pramsMap.put("gfTaxNoList", gfTaxNoList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
pramsMap.put("createDateBegin", DateUtils.getMorning(DateUtils.strToDate(createDateBegin)));
pramsMap.put("createDateEnd", DateUtils.getNight(DateUtils.strToDate(createDateEnd)));
if (ycpbz == 1) {

10
dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java
Unescape View File

@ -128,6 +128,7 @@ public class CustomsManualSignThread extends BaseThread {
JSONObject prams = JSONObject.parseObject(condition);
String gfTaxNo = prams.getString("gfTaxNo");
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String createDateBegin = prams.getString("createDateBegin");
String createDateEnd = prams.getString("createDateEnd");
String company = prams.getString("company");
@ -139,11 +140,12 @@ public class CustomsManualSignThread extends BaseThread {
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
prams.put("gfTaxNoList", gfTaxNoList);
} else {
prams.put("gfTaxNoList", gfTaxNoList);
prams.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
prams.put("companyCode", companyCode);
}
if (StringUtils.isNotBlank(createDateBegin)) {
prams.put("createDateBegin", DateUtils.getMorning(DateUtils.strToDate(createDateBegin)));
}

11
dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java
Unescape View File

@ -130,6 +130,7 @@ public class CustomsRefundVeriThread extends BaseThread {
String gfTaxNo = prams.getString("gfTaxNo");
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String signStatus = prams.getString("signStatus");
String authStatus = prams.getString("authStatus");
String manageStatus = prams.getString("manageStatus");
@ -137,12 +138,12 @@ public class CustomsRefundVeriThread extends BaseThread {
String company = prams.getString("company");
String menuId = prams.getString("menuId");
JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
prams.put("gfTaxNoList", gfTaxNoList);
} else {
prams.put("gfTaxNoList", gfTaxNoList);
prams.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
prams.put("companyCode", companyCode);
}
if ("99".equals(signStatus)) {

13
dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java
Unescape View File

@ -125,6 +125,7 @@ public class CustomsRzcxExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String customsCode = prams.getString("customsCode");
String fillInDateStart = prams.getString("fillInDateStart");
String fillInDateEnd = prams.getString("fillInDateEnd");
@ -157,13 +158,13 @@ public class CustomsRzcxExportThread extends BaseThread {
pramsMap.put("dbName", dbName);
pramsMap.put("business", businesses);
pramsMap.put("confirmUserList",confirmUserList);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
pramsMap.put("gfTaxNo", gfTaxNoList);
gfsh = null;
} else {
pramsMap.put("gfTaxNo", gfTaxNoList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
if ("99".equals(glzt)) {

12
dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java
Unescape View File

@ -130,6 +130,7 @@ public class CustomsSignQueryThread extends BaseThread {
JSONObject prams = JSONObject.parseObject(condition);
String gfTaxNo = prams.getString("gfTaxNo");
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String fillInDateBegin = prams.getString("fillInDateBegin");
String fillInDateEnd = prams.getString("fillInDateEnd");
String qsStatus = prams.getString("qsStatus");
@ -141,13 +142,14 @@ public class CustomsSignQueryThread extends BaseThread {
prams.put("dbName", dbName);
prams.put("userAccount", userid);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
prams.put("gfTaxNoList", gfTaxNoList);
} else {
prams.put("gfTaxNoList", gfTaxNoList);
prams.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
prams.put("companyCode", companyCode);
}
if (StringUtils.isNotBlank(fillInDateBegin)) {
prams.put("fillInDateBegin", DateUtils.getMorning(DateUtils.strToDate(fillInDateBegin)));
}

10
dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java
Unescape View File

@ -131,6 +131,7 @@ public class ExportCustomsQueryThread extends BaseThread {
String gfTaxNo = prams.getString("gfTaxNo");
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String bdkStatus = prams.getString("bdkStatus");
String authStatus = prams.getString("authStatus");
String rzhYesorno = prams.getString("rzhYesorno");
@ -140,14 +141,13 @@ public class ExportCustomsQueryThread extends BaseThread {
String company = prams.getString("company");
String menuId = prams.getString("menuId");
JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
prams.put("gfTaxNoList", gfTaxNoList);
} else {
prams.put("gfTaxNoList", gfTaxNoList);
prams.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
prams.put("companyCode", companyCode);
}
if ("99".equals(bdkStatus)) {
prams.put("bdkStatus", "");
}

2
dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java
Unescape View File

@ -123,6 +123,7 @@ public class ExportCustomsRzcxExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String customsCode = prams.getString("customsCode");
String fillInDateStart = prams.getString("fillInDateStart");
String fillInDateEnd = prams.getString("fillInDateEnd");
@ -177,6 +178,7 @@ public class ExportCustomsRzcxExportThread extends BaseThread {
}
pramsMap.put("gfsh", gfsh);
pramsMap.put("companyCode", companyCode);
pramsMap.put("customsCode", customsCode);
pramsMap.put("fillInDateStart", DateUtils.getMorning(DateUtils.strToDate(fillInDateStart)));
pramsMap.put("fillInDateEnd", DateUtils.getNight(DateUtils.strToDate(fillInDateEnd)));

11
dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java
Unescape View File

@ -132,6 +132,7 @@ public class ExportInvoiceQueryThread extends BaseThread {
String gfTaxNo = prams.getString("gfTaxNo");
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String invoiceType = prams.getString("invoiceType");
String invoiceSource = prams.getString("invoiceSource");
String invoiceStatus = prams.getString("invoiceStatus");
@ -141,12 +142,12 @@ public class ExportInvoiceQueryThread extends BaseThread {
String company = prams.getString("company");
String menuId = prams.getString("menuId");
JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
prams.put("gfTaxNoList", gfTaxNoList);
} else {
prams.put("gfTaxNoList", gfTaxNoList);
prams.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
prams.put("companyCode", companyCode);
}
if ("99".equals(invoiceType)) {

13
dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java
Unescape View File

@ -123,6 +123,7 @@ public class ExportInvoiceRzcxExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String xfName = prams.getString("xfName");
String invoiceDateStart = prams.getString("invoiceDateStart");
String invoiceDateEnd = prams.getString("invoiceDateEnd");
@ -147,13 +148,12 @@ public class ExportInvoiceRzcxExportThread extends BaseThread {
pramsMap.put("dbName", dbName);
List<String> gfTaxNoList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfTaxNoList = StringHelper.stringToList(gfsh);
pramsMap.put("gfTaxNo", gfTaxNoList);
gfsh = null;
} else {
pramsMap.put("gfTaxNo", gfTaxNoList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
if ("99".equals(invoiceStatus)) {
@ -183,6 +183,7 @@ public class ExportInvoiceRzcxExportThread extends BaseThread {
}
pramsMap.put("gfsh", gfsh);
pramsMap.put("companyCode", companyCode);
pramsMap.put("invoiceDateStart", DateUtils.getMorning(DateUtils.strToDate(invoiceDateStart)));
pramsMap.put("invoiceDateEnd", DateUtils.getNight(DateUtils.strToDate(invoiceDateEnd)));
pramsMap.put("xfName", xfName);

4
dxhy-core/src/main/java/com/dxhy/core/thread/FpqsExportThread.java
Unescape View File

@ -62,7 +62,7 @@ public class FpqsExportThread extends BaseThread {
* 导出excel的列名
*/
private final String[] titleColumns = {"序号", "签收描述", "签收日期", "签收状态", "签收人", "签收方式", "发票代码", "发票号码", "发票类型", "开票日期",
"购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额", "价税合计", "扫描时间", "备注", "业务单元"};
"购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额", "价税合计", "扫描时间", "备注", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
private final IExcelExportlogService exportLogService;
@ -116,6 +116,7 @@ public class FpqsExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String businessCode = prams.getString("businessCode");
String qsrqq = prams.getString("qsrqq");
String qsrqz = prams.getString("qsrqz");
@ -146,6 +147,7 @@ public class FpqsExportThread extends BaseThread {
pramsMap.put("gxStatus", gxStatus);
pramsMap.put("businessCode", businessCode);
pramsMap.put("gfsh", gfsh);
pramsMap.put("companyCode", companyCode);
pramsMap.put("gfshFlag", gfshFlag);
pramsMap.put("settlementNo", prams.get("settlementNo"));

9
dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java
Unescape View File

@ -135,6 +135,7 @@ public class InvoiceOutExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String xfName = prams.getString("sellerName");
String invoiceNo = prams.getString("invoiceNo");
String reasonId = prams.getString("reasonId");
@ -156,13 +157,7 @@ public class InvoiceOutExportThread extends BaseThread {
filter.put("orderByClause", "out_date desc");
// 购方税号
List<String> allTaxNo = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
allTaxNo = StringHelper.stringToList(gfsh);
} else {
allTaxNo.add(gfsh);
}
filter.put("gfshList", allTaxNo);
filter.put("gfshList", gfsh);
// 销方名称
filter.put("sellerName", StringHelper.isBlank(xfName) ? null : xfName);

12
dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java
Unescape View File

@ -112,6 +112,7 @@ public class QssbExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String xfmc = prams.getString("xfmc");
String fphm = prams.getString("fphm");
String qsrqq = prams.getString("qsrqq");
@ -123,13 +124,14 @@ public class QssbExportThread extends BaseThread {
// 参数转换为需要的形式
Map<String, Object> pramsMap = new HashMap<>(16);
pramsMap.put("dbName", dbName);
List<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);
pramsMap.put("gfsh", gfshList);
} else {
pramsMap.put("gfsh", gfshList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
pramsMap.put("xfmc", xfmc);
pramsMap.put("qsr", qsr);
pramsMap.put("fphm", fphm);

11
dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java
Unescape View File

@ -112,6 +112,7 @@ public class QstjbExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String qszt = prams.getString("qszt");
String qsfs = prams.getString("qsfs");
String xfmc = prams.getString("xfmc");
@ -131,11 +132,13 @@ public class QstjbExportThread extends BaseThread {
pramsMap.put("businessCode", prams.getString("businessCode"));
List<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);
pramsMap.put("gfsh", gfshList);
} else {
pramsMap.put("gfsh", gfshList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
if (!"99".equals(qszt)) {
pramsMap.put("qszt", qszt);
}

11
dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java
Unescape View File

@ -110,6 +110,7 @@ public class RzjgqdExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String skssq = prams.getString("skssq");
String company = prams.getString("company");
String dklx = prams.getString("dklx");
@ -119,11 +120,13 @@ public class RzjgqdExportThread extends BaseThread {
pramsMap.put("userid", userid);
List<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);
pramsMap.put("gfsh", gfshList);
} else {
pramsMap.put("gfsh", gfshList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
pramsMap.put("skssq", skssq);
pramsMap.put("company", company);
pramsMap.put("dklx", dklx);

9
dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java
Unescape View File

@ -111,6 +111,7 @@ public class SgqsExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String businessCode = prams.getString("businessCode");
String kprqq = prams.getString("kprqq");
String kprqz = prams.getString("kprqz");
@ -126,10 +127,10 @@ public class SgqsExportThread extends BaseThread {
pramsMap.put("dbName", dbName);
List<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);
pramsMap.put("gfsh", gfshList);
} else {
pramsMap.put("gfsh", gfshList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(gfsh)) {
pramsMap.put("companyCode", companyCode);
}
if (!StringHelper.isBlank(businessCode) && !"99".equals(businessCode)) {

5
dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java
Unescape View File

@ -112,6 +112,7 @@ public class TaxRebateAuthenticationThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String company = prams.getString("company");
String menuId = prams.getString("menuId");
JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
@ -135,8 +136,8 @@ public class TaxRebateAuthenticationThread extends BaseThread {
pramsMap.put("authenticationDetailStatus", prams.getString("authenticationDetailStatus"));
pramsMap.put("authenticationPeople", prams.getString("authenticationPeople"));
pramsMap.put("currentPeriod", prams.getString("currentPeriod"));
pramsMap.put("buyerTaxNo",
"99".equals(prams.getString("buyerTaxNo")) ? gfsh : prams.getString("buyerTaxNo"));
pramsMap.put("buyerTaxNo",gfsh);
pramsMap.put("companyCode",companyCode);
pramsMap.put("company", prams.getString("company"));
pramsMap.put("authenticationEndTime", prams.getString("authenticationEndTime"));
pramsMap.put("authenticationStartTime", prams.getString("authenticationStartTime"));

11
dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java
Unescape View File

@ -112,6 +112,7 @@ public class YqswrzExportThread extends BaseThread {
// 应该保存的参数
JSONObject prams = JSONObject.parseObject(condition);
String gfsh = prams.getString("gfsh");
String companyCode = prams.getString("companyCode");
String qsfs = prams.getString("qsfs");
String xfmc = prams.getString("xfmc");
String fphm = prams.getString("fphm");
@ -128,12 +129,12 @@ public class YqswrzExportThread extends BaseThread {
pramsMap.put("userid", userid);
pramsMap.put("business", businesses);
pramsMap.put("businessCode", prams.getString("businessCode"));
List<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);
pramsMap.put("gfsh", gfshList);
} else {
pramsMap.put("gfsh", gfshList);
pramsMap.put("gfsh", gfsh);
}
if (!StringHelper.isBlank(companyCode)) {
pramsMap.put("companyCode", companyCode);
}
if (!"99".equals(qsfs)) {
pramsMap.put("qsfs", qsfs);

3
dxhy-core/src/main/resources/mapper/FpZhMapper.xml
Unescape View File

@ -384,6 +384,9 @@
<foreach collection="taxNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<if test="companyCode != null and companyCode != ''">
and t.comp_code = #{companyCode}
</if>
<if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
and t.invoice_no = #{invoiceNo}
</if>

9
dxhy-core/src/main/resources/mapper/QssbMapper.xml
Unescape View File

@ -33,11 +33,10 @@
from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
where t.qs_status = '0'
and t.qs_date between #{qsrqq} and #{qsrqz}
and t.gf_tax_no in
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and t.gf_tax_no = #{gfsh}
<if test="companyCode != null and companyCode != '' and companyCode != 'null' ">
and t.comp_code = #{companyCode}
</if>
<if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
and t.xf_name like CONCAT(#{xfmc},'%')
</if>

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

@ -33,11 +33,10 @@
where
t.qs_date between #{qsrqq} and #{qsrqz}
and t.valid = '1'
and t.gf_tax_no in
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and t.gf_tax_no = #{gfsh}
<if test="companyCode != null and companyCode != '' and companyCode != 'null'">
and t.comp_code = #{companyCode}
</if>
<if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99' ">
and t.qs_status = #{qszt}
</if>
@ -147,11 +146,10 @@
and t.rzh_yesorno = '0'
and t.invoice_type in ('01','03','08','14')
and t.qs_date between #{qsrqq} and #{qsrqz}
and t.gf_tax_no in
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and t.gf_tax_no = #{gfsh}
<if test="companyCode != null and companyCode != '' and companyCode != 'null' ">
and t.comp_code = #{companyCode}
</if>
<if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
and t.qs_type = #{qsfs}
</if>

5
dxhy-core/src/main/resources/mapper/QsxxMapper.xml
Unescape View File

@ -29,8 +29,9 @@
resultMap="BaseResultMap" databaseId="mysql">
SELECT
t.id,t.notes,t.qs_type,t.gf_name,t.xf_name,t.qs_status,t.qs_date,t.user_name,t.invoice_code,t.invoice_no
,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number
FROM t_dx_invoice t
,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name
,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code
from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
WHERE t.valid = '1'
<if test="qsNameFlag == null">
and t.user_account = #{userid}

6
dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
Unescape View File

@ -34,10 +34,8 @@
t.comp_code as compCode
from t_dx_record_invoice t
where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' <!--and rzh_yesorno='1'-->
and t.gf_tax_no in
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and t.gf_tax_no = #{gfsh}
and t.comp_code = #{companyCode}
<if test="skssq != null and skssq != '' and skssq != 'null' ">
and t.rzh_belong_date = #{skssq}
</if>

9
dxhy-core/src/main/resources/mapper/SgqsMapper.xml
Unescape View File

@ -28,11 +28,10 @@
from t_dx_record_invoice t
where
qs_status = '0' and source_system='0'
and
t.gf_tax_no in
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and t.gf_tax_no = #{gfsh}
<if test="companyCode != null and companyCode != '' and companyCode != 'null' and businessCode != '99' ">
and comp_code = #{companyCode}
</if>
<if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
and invoice_type = #{invoiceType}
</if>

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

@ -859,11 +859,11 @@
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="companyCode!=null">
and t.comp_code = #{companyCode}
</if>
<if test="queryParams.gfTaxNo!=null and queryParams.gfTaxNo!='' and queryParams.gfTaxNo!='99'">
and t.gf_tax_no = #{queryParams.gfTaxNo}
@ -1033,15 +1033,11 @@
FROM
t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
where t.user_account = #{queryParams.userAccount}
<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.qsDateBegin!=null and queryParams.qsDateBegin!=''">
@ -1092,14 +1088,14 @@
SELECT
t.id,
t.notes,
date_format(t.qs_date,'%Y-%m-%d') AS qsDate,
to_char(t.qs_date,'yyyy-MM-dd') AS qsDate,
t.qs_status AS qsStatus,
t.user_name AS userName,
t.qs_type AS qsType,
t.xxly,
t.glzt,
t.customs_code AS customsCode,
date_format(t.fill_in_date,'%Y-%m-%d') AS fillInDate,
to_char(t.fill_in_date,'yyyy-MM-dd') AS fillInDate,
t.gf_tax_no AS gfTaxNo,
t.gf_name AS gfName,
t.tax_amount AS taxAmount,
@ -1110,31 +1106,37 @@
t.scan_id AS scanId,
t.data_sources as dataSources,
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.comp_code as compCode
FROM
t_dx_customs t
t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
where t.user_account = #{queryParams.userAccount}
<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.qsDateBegin!=null and queryParams.qsDateBegin!=''">
and t.qs_date &gt;= #{queryParams.qsDateBegin}
and to_char(t.qs_date,'yyyy-MM-dd hh24:mi:ss') &gt;= #{queryParams.qsDateBegin}
</if>
<if test="queryParams.qsDateEnd!=null and queryParams.qsDateEnd!=''">
and t.qs_date &lt;= CONCAT(substring(#{queryParams.qsDateEnd},1,10),' 23:59:59')
and to_char(t.qs_date,'yyyy-MM-dd hh24:mi:ss') &lt;= CONCAT(substr(#{queryParams.qsDateEnd},1,10),'
23:59:59')
</if>
<if test="queryParams.fillInDateBegin!=null and queryParams.fillInDateBegin!=''">
and t.fill_in_date &gt;= #{queryParams.fillInDateBegin}
and to_char(t.fill_in_date,'yyyy-MM-dd hh24:mi:ss') &gt;= #{queryParams.fillInDateBegin}
</if>
<if test="queryParams.fillInDateEnd!=null and queryParams.fillInDateEnd!=''">
and t.fill_in_date &lt;= CONCAT(substring(#{queryParams.fillInDateEnd},1,10),' 23:59:59')
and to_char(t.fill_in_date,'yyyy-MM-dd hh24:mi:ss') &lt;= CONCAT(substr(#{queryParams.fillInDateEnd},1,10),'
23:59:59')
</if>
<if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
and t.customs_code = #{queryParams.customsCode}
@ -1212,11 +1214,12 @@
</select>
<sql id="queryCustomsRefundConfirm_sql">
auth_status != '0' and (rzlx = '2' or rzlx = '3')
<if test="queryParams.gfTaxNoList!=null and queryParams.gfTaxNoList.size>0">
and gf_tax_no in
<foreach item="item" index="index" collection="queryParams.gfTaxNoList" open="(" separator="," close=")">
#{item,jdbcType=VARCHAR}
</foreach>
<if test="gfsh!=null">
and gf_tax_no = #{gfsh}
</if>
<if test="companyCode!=null">
and comp_code = #{companyCode}
</if>
<if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
and customs_code = #{queryParams.customsCode}

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

@ -184,17 +184,14 @@
t_dx_export_customs p
where
p.auth_status !='0'
<if test="queryParams.gfTaxNo!=null and queryParams.gfTaxNo.size>0">
and p.gf_tax_no in
<foreach item="item" index="index" collection="queryParams.gfTaxNo" open="(" separator="," close=")">
#{item,jdbcType=VARCHAR}
</foreach>
</if>
<if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
and p.gf_tax_no = #{queryParams.gfsh}
</if>
<if test="queryParams.companyCode!=null and queryParams.companyCode!=''">
and p.comp_code = #{queryParams.companyCode}
</if>
<if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
and p.customs_code = #{queryParams.customsCode}
</if>
@ -423,11 +420,11 @@
<include refid="queryExportCustoms_sql"/>
</select>
<sql id="queryExportCustoms_sql">
<if test="queryParams.gfTaxNoList!=null and queryParams.gfTaxNoList.size>0">
and p.gf_tax_no in
<foreach item="item" index="index" collection="queryParams.gfTaxNoList" open="(" separator="," close=")">
#{item,jdbcType=VARCHAR}
</foreach>
<if test="queryParams.gfsh!=null ">
and p.gf_tax_no = #{gfsh}
</if>
<if test="queryParams.companyCode!=null ">
and p.comp_code = #{companyCode}
</if>
<if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
and p.customs_code = #{queryParams.customsCode}

14
dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
Unescape View File

@ -98,6 +98,10 @@
and p.gf_tax_no = #{queryParams.gfsh}
</if>
<if test="queryParams.companyCode!=null and queryParams.companyCode!=''">
and p.comp_code = #{queryParams.companyCode}
</if>
<if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
and p.rzh_yesorno = #{queryParams.rzhYesorno}
</if>
@ -421,11 +425,11 @@
<include refid="queryExportInvoice_sql"/>
</select>
<sql id="queryExportInvoice_sql">
<if test="queryParams.gfTaxNoList!=null and queryParams.gfTaxNoList.size>0">
and p.gf_tax_no in
<foreach item="item" index="index" collection="queryParams.gfTaxNoList" open="(" separator="," close=")">
#{item,jdbcType=VARCHAR}
</foreach>
<if test="queryParams.gfsh!=null">
and p.gf_tax_no = #{gfsh}
</if>
<if test="queryParams.companyCode!=null">
and p.comp_code = #{companyCode}
</if>
<if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
and p.rzh_yesorno = #{queryParams.rzhYesorno}

Write Preview
Loading…
Cancel
Save