|
|
|
@ -52,7 +52,7 @@ import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
* @版本: V3.2.0
|
|
|
|
|
* @版权: LINKAGE-BOOT
|
|
|
|
|
* @作者: LINKAGE-BOOT研发团队
|
|
|
|
|
* @日期: 2023-01-05
|
|
|
|
|
* @日期: 2023-01-09
|
|
|
|
|
*/
|
|
|
|
|
@Slf4j
|
|
|
|
|
@RestController
|
|
|
|
@ -87,11 +87,11 @@ public class TradeuploadController {
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
for(TradeuploadEntity entity:list){
|
|
|
|
|
Map<String,Object> materialCodeMap = new HashMap<>();
|
|
|
|
|
entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap));
|
|
|
|
|
Map<String,Object> salesNameMap = new HashMap<>();
|
|
|
|
|
entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap));
|
|
|
|
|
Map<String,Object> licenseNoMap = new HashMap<>();
|
|
|
|
|
entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap));
|
|
|
|
|
entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap));
|
|
|
|
|
Map<String,Object> salesNameMap = new HashMap<>();
|
|
|
|
|
entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap));
|
|
|
|
|
Map<String,Object> licenseNoMap = new HashMap<>();
|
|
|
|
|
entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap));
|
|
|
|
|
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
|
|
|
|
|
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
|
|
|
|
|
}
|
|
|
|
@ -210,8 +210,8 @@ public class TradeuploadController {
|
|
|
|
|
case "transportType" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("运输方式" ,"transportType"));
|
|
|
|
|
break;
|
|
|
|
|
case "departmentId" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("运费" ,"departmentId"));
|
|
|
|
|
case "transportPrice" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("运费" ,"transportPrice"));
|
|
|
|
|
break;
|
|
|
|
|
case "licenseNo" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("车号" ,"licenseNo"));
|
|
|
|
@ -243,8 +243,8 @@ public class TradeuploadController {
|
|
|
|
|
case "vehiclePictures" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures"));
|
|
|
|
|
break;
|
|
|
|
|
case "creatorusername" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("制单人" ,"creatorusername"));
|
|
|
|
|
case "creatorUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|