锅炉部件添加检验项目调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -1202,7 +1202,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         Map<String, BoilerTaskOrderItemDO> itemDOMap = orderItemDOS.stream()
                 .collect(Collectors.toMap(BoilerTaskOrderItemDO::getId, Function.identity()));
 
-        addReportVo(orderItemEnterVO,orderItemDOS,itemDOMap,orderItemEnterVO.getItemPartId());
+        addReportVo(orderItemEnterVO,orderItemDOS,itemDOMap,orderItemEnterVO.getPartType());
         this.updateOrderFee(orderItemDOS.get(0).getOrderId());
 
     }
@@ -2411,14 +2411,14 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
             BoilerTaskOrderDO boilerTaskOrderDO = boilerTaskOrderMapper.selectById(id);
             // 免征
-            boolean isExempt = 300 == boilerTaskOrderDO.getFeeNature();
+//            boolean isExempt = 300 == boilerTaskOrderDO.getFeeNature();
             BigDecimal orderFee = new BigDecimal(0);
             for (BoilerTaskOrderItemReportDO reportDO : reportDOList) {
                 if (reportDO.getFee() != null) {
                     // 免征不收法定收费
-                    if (isExempt && "1".equals(reportDO.getFeeType())) {
-                        continue;
-                    }
+//                    if (isExempt && "1".equals(reportDO.getFeeType())) {
+//                        continue;
+//                    }
                     orderFee = orderFee.add(reportDO.getFee());
                 }
             }