|
@@ -81,22 +81,23 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
|
|
|
/**
|
|
|
* 合并两个文件路径到集合
|
|
|
*/
|
|
|
- List<String> fileList=new ArrayList<>();
|
|
|
- for(Payment item: paymentList){
|
|
|
- String[] str=item.getNoteImgUrl().split(",");
|
|
|
- for(String item2:str){
|
|
|
- fileList.add(item2);
|
|
|
+ List<String> fileList = new ArrayList<>();
|
|
|
+ for (Payment item : paymentList) {
|
|
|
+ if (item.getNoteImgUrl() != null) {
|
|
|
+ String[] str = item.getNoteImgUrl().split(",");
|
|
|
+ for (String item2 : str) {
|
|
|
+ fileList.add(item2);
|
|
|
+ }
|
|
|
+ item.setFileList(fileList);
|
|
|
}
|
|
|
- item.setFileList(fileList);
|
|
|
+ continue;
|
|
|
}
|
|
|
-
|
|
|
response.setDetail(detail);
|
|
|
response.setPaymentList(paymentList);
|
|
|
return response;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* @param request 付款详情查询条件
|
|
|
* @return RestResponse 付款详情
|
|
@@ -131,7 +132,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
|
|
|
return saveBatch(payments);
|
|
|
}
|
|
|
|
|
|
- private String formatPaymentContent(Payment payment){
|
|
|
+ private String formatPaymentContent(Payment payment) {
|
|
|
return String.format("应收:%.2f, 实收:%.2f, 开票:%.2f", payment.getPlanMoney(), payment.getWorkMoney(), payment.getAmountInvoice());
|
|
|
}
|
|
|
|
|
@@ -241,14 +242,14 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
|
|
|
*/
|
|
|
List<Payment> paymentList = request.getPaymentList();
|
|
|
|
|
|
- String tempUrl="";
|
|
|
- for(Payment item:paymentList){
|
|
|
- List<String> fields=item.getFileList();
|
|
|
- for(int i=0;i<=fields.size()-1;i++){
|
|
|
- if(i==fields.size()-1){
|
|
|
- tempUrl=tempUrl+fields.get(i);
|
|
|
- }else{
|
|
|
- tempUrl=tempUrl+fields.get(i)+",";
|
|
|
+ String tempUrl = "";
|
|
|
+ for (Payment item : paymentList) {
|
|
|
+ List<String> fields = item.getFileList();
|
|
|
+ for (int i = 0; i <= fields.size() - 1; i++) {
|
|
|
+ if (i == fields.size() - 1) {
|
|
|
+ tempUrl = tempUrl + fields.get(i);
|
|
|
+ } else {
|
|
|
+ tempUrl = tempUrl + fields.get(i) + ",";
|
|
|
}
|
|
|
item.setNoteImgUrl(tempUrl);
|
|
|
}
|