|
|
|
@ -477,23 +477,25 @@ public class CollectionController {
|
|
|
|
|
//子表数据转换
|
|
|
|
|
List<Collection_item0Entity> jg_collection_item0List = collectionService.GetCollection_item0List(id);
|
|
|
|
|
List<Collection_item0Model> jg_collection_item0ModelList = JsonUtil.getJsonToList(jg_collection_item0List,Collection_item0Model.class);
|
|
|
|
|
for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList){
|
|
|
|
|
for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList) {
|
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,jg_collection_item0Model.getSalesorderId());
|
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId, jg_collection_item0Model.getSalesorderId());
|
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
|
|
|
|
|
jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
|
|
|
|
|
jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
|
|
|
|
|
jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
|
|
|
|
|
jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
|
|
|
|
|
jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
|
|
|
|
|
jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
|
|
|
|
|
jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate()));
|
|
|
|
|
jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice()));
|
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
|
jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
|
|
|
|
|
jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
|
|
|
|
|
jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
|
|
|
|
|
jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
|
|
|
|
|
jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
|
|
|
|
|
jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
|
|
|
|
|
jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate()));
|
|
|
|
|
jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice()));
|
|
|
|
|
// Map<String,Object> salesorderIdMap = new HashMap<>();
|
|
|
|
|
// jg_collection_item0Model.setSalesorderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",jg_collection_item0Model.getSalesorderId(),salesorderIdMap));
|
|
|
|
|
Map<String,Object> deleteTimeMap = new HashMap<>();
|
|
|
|
|
jg_collection_item0Model.setContractId(generaterSwapUtil.getPopupSelectValue("398848549678332037","id","contract_code",jg_collection_item0Model.getContractId(),deleteTimeMap));
|
|
|
|
|
}
|
|
|
|
|
Map<String, Object> deleteTimeMap = new HashMap<>();
|
|
|
|
|
jg_collection_item0Model.setContractId(generaterSwapUtil.getPopupSelectValue("398848549678332037", "id", "contract_code", jg_collection_item0Model.getContractId(), deleteTimeMap));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
vo.setCollection_item0List(jg_collection_item0ModelList);
|
|
|
|
|
|
|
|
|
|
//附表数据转换
|
|
|
|
|