canrd-outside / order-erp · Commits

Commit 070465c7b9cf06d4edf66ef9f4de9663aa6c35e2

Authored by 谢茂盛
1 parent ee55aab9
build: skipped

feat: 问题修复项 

1、设计师权重导出
Inline Side-by-side
Showing 2 changed files with 14 additions and 6 deletions
src/main/java/com/order/erp/domain/vo/OrderReportAnalysisExportVo.java
  View file @070465c
@@ -20,7 +20,6 @@ import java.math.BigDecimal; @@ -20,7 +20,6 @@ import java.math.BigDecimal;
20 @Data 20 @Data
21 @AllArgsConstructor 21 @AllArgsConstructor
22 @NoArgsConstructor 22 @NoArgsConstructor
23 -@SuperBuilder  
24 @ToString 23 @ToString
25 public class OrderReportAnalysisExportVo implements Serializable { 24 public class OrderReportAnalysisExportVo implements Serializable {
26 25
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
  View file @070465c
@@ -137,10 +137,7 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl<OrderCompletio @@ -137,10 +137,7 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl<OrderCompletio
137 * @param exportVoMap 137 * @param exportVoMap
138 */ 138 */
139 private void handlerExportMap(Integer type, OrderCompletionReportDO reportDO, Map<String, OrderReportAnalysisExportVo> exportVoMap) { 139 private void handlerExportMap(Integer type, OrderCompletionReportDO reportDO, Map<String, OrderReportAnalysisExportVo> exportVoMap) {
140 - OrderReportAnalysisExportVo exportVo = OrderReportAnalysisExportVo.builder()  
141 - .ideaSourceRate(new BigDecimal(0))  
142 - .manualPreform1Rate(new BigDecimal(0))  
143 - .manualPreform2Rate(new BigDecimal(0)).build(); 140 +
144 String key = null; 141 String key = null;
145 if (type == 0) { 142 if (type == 0) {
146 key = reportDO.getIdeaSource(); 143 key = reportDO.getIdeaSource();
@@ -152,7 +149,19 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio @@ -152,7 +149,19 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
152 if (type == 2) { 149 if (type == 2) {
153 key = reportDO.getManualPreform2(); 150 key = reportDO.getManualPreform2();
154 } 151 }
155 - exportVo = exportVoMap.get(key); 152 + OrderReportAnalysisExportVo exportVo = exportVoMap.get(key);
  153 + if (Objects.isNull(exportVo)) {
  154 + exportVo = new OrderReportAnalysisExportVo();
  155 + }
  156 + if (Objects.isNull(exportVo.getIdeaSourceRate())) {
  157 + exportVo.setIdeaSourceRate(new BigDecimal(0));
  158 + }
  159 + if (Objects.isNull(exportVo.getManualPreform1Rate())) {
  160 + exportVo.setManualPreform1Rate(new BigDecimal(0));
  161 + }
  162 + if (Objects.isNull(exportVo.getManualPreform2Rate())) {
  163 + exportVo.setManualPreform2Rate(new BigDecimal(0));
  164 + }
156 if (Objects.nonNull(reportDO.getIdeaSourceRate())) { 165 if (Objects.nonNull(reportDO.getIdeaSourceRate())) {
157 exportVo.setIdeaSourceRate(new BigDecimal(reportDO.getIdeaSourceRate()).add(exportVo.getIdeaSourceRate())); 166 exportVo.setIdeaSourceRate(new BigDecimal(reportDO.getIdeaSourceRate()).add(exportVo.getIdeaSourceRate()));
158 } 167 }