|
@@ -116,23 +116,22 @@ public class CostModelListController extends JeecgController<CostModelList, ICos
|
|
String wxfUrl1 = dto.getWxfurl().get(0).getFilePath();
|
|
String wxfUrl1 = dto.getWxfurl().get(0).getFilePath();
|
|
costModelList.setClfUrl(clfUrl1);
|
|
costModelList.setClfUrl(clfUrl1);
|
|
costModelList.setWxfUrl(wxfUrl1);
|
|
costModelList.setWxfUrl(wxfUrl1);
|
|
|
|
+
|
|
String clfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+ clfUrl1;
|
|
String clfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+ clfUrl1;
|
|
String wxfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+ wxfUrl1;
|
|
String wxfUrl = jeecgBaseConfig.getPath().getUpload() + "/"+ wxfUrl1;
|
|
|
|
|
|
- if(!Objects.equals(dto.getClfurl(),costModelList1.getClfUrl())){
|
|
|
|
|
|
+ if(!Objects.equals(clfUrl1,costModelList1.getClfUrl())){
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
columnMap.put("xiangmu_id",xmId);
|
|
columnMap.put("xiangmu_id",xmId);
|
|
clService.removeByMap(columnMap);
|
|
clService.removeByMap(columnMap);
|
|
-
|
|
|
|
//计算并导入数据
|
|
//计算并导入数据
|
|
Result<CostModelList> result1 = clService.importExcel1(xmId, xmName, clfUrl, CostModelXmxqCl.class);
|
|
Result<CostModelList> result1 = clService.importExcel1(xmId, xmName, clfUrl, CostModelXmxqCl.class);
|
|
}
|
|
}
|
|
|
|
|
|
- if(!Objects.equals(dto.getWxfurl(),costModelList1.getWxfUrl())){
|
|
|
|
|
|
+ if(!Objects.equals(wxfUrl1,costModelList1.getWxfUrl())){
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
columnMap.put("xiangmu_id",xmId);
|
|
columnMap.put("xiangmu_id",xmId);
|
|
wxService.removeByMap(columnMap);
|
|
wxService.removeByMap(columnMap);
|
|
-
|
|
|
|
//计算并导入数据
|
|
//计算并导入数据
|
|
Result<CostModelList> result2 = wxService.importExcel1(xmId, xmName, wxfUrl, CostModelXmxqWx.class);
|
|
Result<CostModelList> result2 = wxService.importExcel1(xmId, xmName, wxfUrl, CostModelXmxqWx.class);
|
|
}
|
|
}
|