成本模型导入提示（未完）

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqWx/service/impl/CostModelXmxqWxServiceImpl.java

@@ -62,14 +62,22 @@ public class CostModelXmxqWxServiceImpl extends ServiceImpl<CostModelXmxqWxMappe
             BigDecimal wxfMin = new BigDecimal(0);
             BigDecimal wxfAve = new BigDecimal(0);
             for(CostModelXmxqWx wx:list){
-                wx.setXiangmuId(xmId);
-                wx.setXiangmuName(xmName);
-                CostModelXmxqWx wxxq = costModelwXPriceService.selectWxPriceValue(wx);
-                if(wxxq!=null){
-                    list1.add(wxxq);
-                    wxfMax = wxfMax.add(new BigDecimal(Optional.ofNullable(wxxq.getMaxPrice()).orElse("0")));
-                    wxfMin = wxfMin.add(new BigDecimal(Optional.ofNullable(wxxq.getMinPrice()).orElse("0")));
-                    wxfAve = wxfAve.add(new BigDecimal(Optional.ofNullable(wxxq.getAvePrice()).orElse("0")));
+                if(wx.getNumber()!=null && wx.getWxProject()!=null && wx.getUnit()!=null &&wx.getWxCompany()!=null){
+                    wx.setXiangmuId(xmId);
+                    wx.setXiangmuName(xmName);
+                    CostModelXmxqWx wxxq = costModelwXPriceService.selectWxPriceValue(wx);
+                    if(wxxq!=null){
+                        list1.add(wxxq);
+                        wxfMax = wxfMax.add(new BigDecimal(wxxq.getMaxPrice()));
+                        wxfMin = wxfMin.add(new BigDecimal(wxxq.getMinPrice()));
+                        wxfAve = wxfAve.add(new BigDecimal(wxxq.getAvePrice()));
+                    }else {
+                        // todo 找不到对应的外协费 提示先去维护外协价格库
+                        String msg = "外协价格库内找不到外协项目为"+wx.getWxProject()+"，外协单位为："+wx.getWxCompany()+"，计量单位为："+wx.getUnit()+"的数据，先维护外协价格库！";
+                    }
+                }else {
+                    // todo 导入的数据不全 提示他该条数据不全
+                    String msg1 = "导入的外协Excel表中缺少必填填数据！";
                 }
             }
             costModel.setMaxWxf(wxfMax.toString());