liuchang/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dfhz' into 'sim'

Browse Source 
Master dfhz

See merge request eshop/biz_service_ebtp_extend!60
This commit is contained in:
付庆吉
2021-08-27 11:05:25 +08:00
parent 525b100dc8 8f69b8edbe
commit 414fe6fef8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployment-master.yaml
View File

@ -57,7 +57,7 @@ spec:
containers: containers:
- name: biz-service-ebtp-extend - name: biz-service-ebtp-extend
image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-extend:latest image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-extend:latest
args: ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)","-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"] args: ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)","-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE)", "-jar", "/app.jar"]
volumeMounts: volumeMounts:
- name: log - name: log
mountPath: /log mountPath: /log

4
src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java
View File

@ -218,9 +218,11 @@ public class DfhzExportServiceImpl implements ExportService {
BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getId())).findFirst().orElseGet(BidEvalDetailSummaryVO::new); BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getId())).findFirst().orElseGet(BidEvalDetailSummaryVO::new);
Map<String, BidEvalDetailJudgesSummaryVO> memberScoreMap = detailSummary.getScoreMap(); Map<String, BidEvalDetailJudgesSummaryVO> memberScoreMap = detailSummary.getScoreMap();
for (JuryPrintVO memberVO : memberAll) { for (JuryPrintVO memberVO : memberAll) {
if (memberScoreMap.containsKey(memberVO.getUserId())) { if (memberScoreMap != null && memberScoreMap.containsKey(memberVO.getUserId())) {
BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore();
this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score)); this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score));
}else {
this.createCell(row, cellIndex++, cellStyle, "");
} }
} }
} }