wangchengming/Contract-Manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
niuyan 2025-11-21 10:46:58 +08:00
parent bc78c1ffb3
commit 76d6a5afb2
1 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
View File

@ -2351,24 +2351,24 @@ public class ConSaleServiceImpl implements IConSaleService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(i + 1)); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(i + 1));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldName.contains("clientId")){
//客户名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getClientName()));
fieldIndex = fieldIndex + 1;
}
if (fieldName.contains("contractNumber")){ if (fieldName.contains("contractNumber")){
// 项目编号 // 项目编号
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getContractNumber())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getContractNumber()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldName.contains("projName")){
// 项目名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjName()));
fieldIndex = fieldIndex + 1;
}
if (fieldName.contains("projNumber")){ if (fieldName.contains("projNumber")){
//订单编号 //订单编号
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjNumber())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjNumber()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldName.contains("clientId")){ if (fieldName.contains("projName")){
//客户名称 // 项目名称
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getClientName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjName()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
//一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee //一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee
@ -2377,6 +2377,22 @@ public class ConSaleServiceImpl implements IConSaleService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getCityName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getCityName()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (mediaFieldName.contains("upTime")){
//上刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getUpTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("downTime")){
//下刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getDownTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("period")){
//周期
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getPeriod()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("mediaId")){ if (mediaFieldName.contains("mediaId")){
//媒体类型 //媒体类型
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getMediaName())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getMediaName()));
@ -2397,21 +2413,7 @@ public class ConSaleServiceImpl implements IConSaleService {
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getReleaseFrequency())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getReleaseFrequency()));
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (mediaFieldName.contains("upTime")){
//上刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getUpTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("downTime")){
//下刊时间
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getDownTime()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("period")){
//周期
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getPeriod()));
fieldIndex = fieldIndex + 1;
}
if (mediaFieldName.contains("printPrice")){ if (mediaFieldName.contains("printPrice")){
//刊例价 //刊例价
writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getPrintPrice())); writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getPrintPrice()));
@ -2515,24 +2517,24 @@ public class ConSaleServiceImpl implements IConSaleService {
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(i + 1),false); writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(i + 1),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldName.contains("clientId")){
//客户名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getClientName()),false);
fieldIndex = fieldIndex + 1;
}
if (fieldName.contains("contractNumber")){ if (fieldName.contains("contractNumber")){
// 项目编号 // 项目编号
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getContractNumber()),false); writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getContractNumber()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldName.contains("projName")){
// 项目名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getProjName()),false);
fieldIndex = fieldIndex + 1;
}
if (fieldName.contains("projNumber")){ if (fieldName.contains("projNumber")){
//订单编号 //订单编号
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getProjNumber()),false); writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getProjNumber()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
if (fieldName.contains("clientId")){ if (fieldName.contains("projName")){
//客户名称 // 项目名称
writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getClientName()),false); writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getProjName()),false);
fieldIndex = fieldIndex + 1; fieldIndex = fieldIndex + 1;
} }
//一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee //一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee
@ -2543,6 +2545,21 @@ public class ConSaleServiceImpl implements IConSaleService {
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getCityName())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getCityName()));
inner = inner + 1; inner = inner + 1;
} }
if (mediaFieldName.contains("upTime")){
//上刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getUpTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("downTime")){
//下刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getDownTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("period")){
//周期
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPeriod()));
inner = inner + 1;
}
if (mediaFieldName.contains("mediaId")){ if (mediaFieldName.contains("mediaId")){
//媒体类型 //媒体类型
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getMediaName())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getMediaName()));
@ -2563,21 +2580,6 @@ public class ConSaleServiceImpl implements IConSaleService {
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getReleaseFrequency())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getReleaseFrequency()));
inner = inner + 1; inner = inner + 1;
} }
if (mediaFieldName.contains("upTime")){
//上刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getUpTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("downTime")){
//下刊时间
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getDownTime()));
inner = inner + 1;
}
if (mediaFieldName.contains("period")){
//周期
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPeriod()));
inner = inner + 1;
}
if (mediaFieldName.contains("printPrice")){ if (mediaFieldName.contains("printPrice")){
//刊例价 //刊例价
writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPrintPrice())); writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPrintPrice()));
@ -2714,27 +2716,39 @@ public class ConSaleServiceImpl implements IConSaleService {
private List<String> orderFieldName(String fieldName,String mediaFieldName,String collectFieldName) { private List<String> orderFieldName(String fieldName,String mediaFieldName,String collectFieldName) {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
result.add("序号"); result.add("序号");
if (fieldName.contains("clientId")){
//客户名称
result.add("客户名称");
}
if (fieldName.contains("contractNumber")){ if (fieldName.contains("contractNumber")){
// 项目编号 // 项目编号
result.add("项目编号"); result.add("优客项目编号");
}
if (fieldName.contains("projName")){
// 项目名称
result.add("项目名称");
} }
if (fieldName.contains("projNumber")){ if (fieldName.contains("projNumber")){
//订单编号 //订单编号
result.add("订单编号"); result.add("订单编号");
} }
if (fieldName.contains("clientId")){ if (fieldName.contains("projName")){
//客户名称 // 项目名称
result.add("客户名称"); result.add("项目名称");
} }
//一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee //一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee
if (mediaFieldName.contains("cityId")){ if (mediaFieldName.contains("cityId")){
//城市 //城市
result.add("城市"); result.add("城市");
} }
if (mediaFieldName.contains("upTime")){
//上刊时间
result.add("上刊时间");
}
if (mediaFieldName.contains("downTime")){
//下刊时间
result.add("下刊时间");
}
if (mediaFieldName.contains("period")){
//周期
result.add("周期");
}
if (mediaFieldName.contains("mediaId")){ if (mediaFieldName.contains("mediaId")){
//媒体类型 //媒体类型
result.add("媒体类型"); result.add("媒体类型");
@ -2751,18 +2765,6 @@ public class ConSaleServiceImpl implements IConSaleService {
//发布频次 //发布频次
result.add("发布频次"); result.add("发布频次");
} }
if (mediaFieldName.contains("upTime")){
//上刊时间
result.add("上刊时间");
}
if (mediaFieldName.contains("downTime")){
//下刊时间
result.add("下刊时间");
}
if (mediaFieldName.contains("period")){
//周期
result.add("周期");
}
if (mediaFieldName.contains("printPrice")){ if (mediaFieldName.contains("printPrice")){
//刊例价 //刊例价
result.add("刊例价"); result.add("刊例价");
@ -2773,11 +2775,11 @@ public class ConSaleServiceImpl implements IConSaleService {
} }
if (mediaFieldName.contains("mediaFee")){ if (mediaFieldName.contains("mediaFee")){
//媒体费 //媒体费
result.add("媒体费"); result.add("订单发布费");
} }
if (mediaFieldName.contains("productFee")){ if (mediaFieldName.contains("productFee")){
//制作费 //制作费
result.add("制作费"); result.add("订单制作费");
} }
if (fieldName.contains("contractMoney")){ if (fieldName.contains("contractMoney")){
//合同金额 //合同金额
@ -2797,11 +2799,11 @@ public class ConSaleServiceImpl implements IConSaleService {
} }
if(mediaFieldName.contains("otherReverPoit")){ if(mediaFieldName.contains("otherReverPoit")){
//其他返点 //其他返点
result.add("其他返点"); result.add("其他返点1");
} }
if(mediaFieldName.contains("otherReverMoney")){ if(mediaFieldName.contains("otherReverMoney")){
//其他返点金额 //其他返点金额
result.add("其他返点金额"); result.add("其他返点金额1");
} }
if(fieldName.contains("billingTime")){ if(fieldName.contains("billingTime")){
//开票时间 //开票时间