|
@@ -75,7 +75,7 @@ public class CostModelXmxqWxServiceImpl extends ServiceImpl<CostModelXmxqWxMappe
|
|
|
List<CostModelMsg> modelMsgList = new ArrayList<>();//导入提示信息列表
|
|
|
int num1 = 0; //导入的外协费在价格库找不到对应数据的条数
|
|
|
int num2 = 0; //导入的外协费缺少必填的条数
|
|
|
- String msg ="";
|
|
|
+ String msg =""; //最终返回的提示信息
|
|
|
String msg2 ="";
|
|
|
for(CostModelXmxqWx wx:list){
|
|
|
if(wx.getNumber()!=null && wx.getWxProject()!=null && wx.getUnit()!=null &&wx.getWxCompany()!=null){
|
|
@@ -108,6 +108,7 @@ public class CostModelXmxqWxServiceImpl extends ServiceImpl<CostModelXmxqWxMappe
|
|
|
modelMsgList.add(costModelMsg);
|
|
|
|
|
|
if(num1>0) msg = "外协价格库中有"+num1+"条数据未找到!"+msg2;
|
|
|
+ else msg = msg2;
|
|
|
|
|
|
costModel.setMaxWxf(wxfMax.toString());
|
|
|
costModel.setMinWxf(wxfMin.toString());
|