yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年6月26日 修复身份未正常拼接的问题

This commit is contained in:
bai 2023-06-26 22:41:48 +08:00
parent 72cbc34461
commit b292010a63
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
View File

@ -171,8 +171,8 @@ public class TingKeStatisticsController {
KcTksfrzb currentData = tksfMap.get(x.getGh()); KcTksfrzb currentData = tksfMap.get(x.getGh());
String currentZwmc = currentData.getZwmc(); String currentZwmc = currentData.getZwmc();
String currentTkyq = currentData.getTkyq(); String currentTkyq = currentData.getTkyq();
if(StringUtils.isNotBlank(currentTkyq)){ if(StringUtils.isNotBlank(currentZwmc)){
int tkyq = Integer.parseInt(currentTkyq); int tkyq = Integer.parseInt(StringUtils.defaultString(currentTkyq,"0"));
int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0")); int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0"));
x.setZwmc(currentZwmc + "、" + x.getZwmc()); x.setZwmc(currentZwmc + "、" + x.getZwmc());
if(tkyq > xtkyq){ if(tkyq > xtkyq){
@ -306,8 +306,8 @@ public class TingKeStatisticsController {
KcTksfrzb currentData = tksfMap.get(x.getGh()); KcTksfrzb currentData = tksfMap.get(x.getGh());
String currentZwmc = currentData.getZwmc(); String currentZwmc = currentData.getZwmc();
String currentTkyq = currentData.getTkyq(); String currentTkyq = currentData.getTkyq();
if(StringUtils.isNotBlank(currentTkyq)){ if(StringUtils.isNotBlank(currentZwmc)){
int tkyq = Integer.parseInt(currentTkyq); int tkyq = Integer.parseInt(StringUtils.defaultString(currentTkyq,"0"));
int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0")); int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0"));
x.setZwmc(currentZwmc + "、" + x.getZwmc()); x.setZwmc(currentZwmc + "、" + x.getZwmc());
if(tkyq > xtkyq){ if(tkyq > xtkyq){