|
@@ -717,7 +717,7 @@ public class KwcContractTradeService {
|
|
|
List<KwcContractTrade> kwcContractTradeList = kwcContractTradeMapper.selectBatchIds(contractIdList);
|
|
List<KwcContractTrade> kwcContractTradeList = kwcContractTradeMapper.selectBatchIds(contractIdList);
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
|
kwcContractTradeList.forEach(item -> {
|
|
kwcContractTradeList.forEach(item -> {
|
|
|
- if (item.getStatus().equals(ContractStatusEnum.SAVE.getCode())) {
|
|
|
|
|
|
|
+ if (!item.getStatus().equals(ContractStatusEnum.SAVE.getCode())) {
|
|
|
throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_022);
|
|
throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_022);
|
|
|
}
|
|
}
|
|
|
item.setDelFlag(Global.YES);
|
|
item.setDelFlag(Global.YES);
|
|
@@ -759,8 +759,8 @@ public class KwcContractTradeService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<QueryListResVo> list = getQueryListResVos(queryListResDtos);
|
|
List<QueryListResVo> list = getQueryListResVos(queryListResDtos);
|
|
|
- List<LogisticsListExport> dataList = BeanUtils.copyToList(list, LogisticsListExport.class);
|
|
|
|
|
- ExcelUtil.downData(response, LogisticsListExport.class, dataList);
|
|
|
|
|
|
|
+ List<TradeListExport> dataList = BeanUtils.copyToList(list, TradeListExport.class);
|
|
|
|
|
+ ExcelUtil.downData(response, TradeListExport.class, dataList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|