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

Merge branch 'release' of http://192.168.12.182/invoice/pt into 0725export

Browse Source
release
yishiqihuasheng 2 years ago
parent 8594b27d96 7d7c1ef685
commit 2d6eb94b45
2 changed files with 22 additions and 21 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-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
  2. 40
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java

3
dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java
Unescape View File

@ -657,8 +657,9 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutD
QueryWrapper<BaseTDxOutReason> query = new QueryWrapper<>(); QueryWrapper<BaseTDxOutReason> query = new QueryWrapper<>();
query.eq("reason_code", record.getOutReason()); query.eq("reason_code", record.getOutReason());
BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query); BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query);
if (StringUtils.isNotEmpty(reason.getOutReason())) if (reason != null && StringUtils.isNotEmpty(reason.getOutReason())) {
vo.setReason(reason.getOutReason()); vo.setReason(reason.getOutReason());
}
// 认证日期 string类型的长日期转为string类型的短日期 // 认证日期 string类型的长日期转为string类型的短日期
String certDate = record.getCertDate(); String certDate = record.getCertDate();
Date date = new Date(); Date date = new Date();

40
dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
Unescape View File

@ -57,15 +57,15 @@ public class ExtInvoicePoolController extends AbstractController {
pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("dbName", getUserInfo().getDbName());
List<String> gfshList = new ArrayList<>(); List<String> gfshList = new ArrayList<>();
// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
// gfshList.add(pramsMap.get("gfsh").toString()); gfshList.add(pramsMap.get("gfsh").toString());
// } else { } else {
// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
// if (gfshList.size() == 0) { if (gfshList.size() == 0) {
// return ResponseEntity.ok(R.ok().put("data", "")); return ResponseEntity.ok(R.ok().put("data", ""));
// } }
// } }
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); // gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
boolean flag = checkList(gfshList); boolean flag = checkList(gfshList);
if (flag){ if (flag){
pramsMap.put("sign","88"); pramsMap.put("sign","88");
@ -113,13 +113,13 @@ public class ExtInvoicePoolController extends AbstractController {
if(StringUtils.isNotEmpty(companyCode) && !"99".equals(companyCode) && !"88".equals(companyCode)) { if(StringUtils.isNotEmpty(companyCode) && !"99".equals(companyCode) && !"88".equals(companyCode)) {
pramsMap.put("companyCode", companyCode); pramsMap.put("companyCode", companyCode);
companyCodes.add(companyCode); companyCodes.add(companyCode);
gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); // gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes);
pramsMap.put("gfsh", gfshList); pramsMap.put("gfsh", gfshList);
}else if(StringUtils.isNotEmpty(companyCode) && "99".equals(companyCode)){ }else if(StringUtils.isNotEmpty(companyCode) && "99".equals(companyCode)){
pramsMap.put("companyCode", companyCode); pramsMap.put("companyCode", companyCode);
companyCodes = getUserInfo().getCompanyCodes(); companyCodes = getUserInfo().getCompanyCodes();
pramsMap.put("companyCodes", companyCodes); pramsMap.put("companyCodes", companyCodes);
gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes); // gfshList = extInvoicePoolService.getGfshList(gfshList,companyCodes);
pramsMap.put("gfsh", gfshList); pramsMap.put("gfsh", gfshList);
log.info("组织机构====>{}", companyCodes); log.info("组织机构====>{}", companyCodes);
}else if(StringUtils.isNotEmpty(companyCode) && "88".equals(companyCode)){ }else if(StringUtils.isNotEmpty(companyCode) && "88".equals(companyCode)){
@ -230,16 +230,16 @@ public class ExtInvoicePoolController extends AbstractController {
pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("dbName", getUserInfo().getDbName());
List<String> gfshList = new ArrayList<>(); List<String> gfshList = new ArrayList<>();
// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
// gfshList.add(pramsMap.get("gfsh").toString()); gfshList.add(pramsMap.get("gfsh").toString());
// } else { } else {
// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
// if (gfshList.size() == 0) { if (gfshList.size() == 0) {
// return ResponseEntity.ok(R.ok().put("data", "")); return ResponseEntity.ok(R.ok().put("data", ""));
// } }
// } }
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); // gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
boolean flag = checkList(gfshList); boolean flag = checkList(gfshList);
if (flag){ if (flag){
pramsMap.put("sign","88"); pramsMap.put("sign","88");

Write Preview
Loading…
Cancel
Save