From 76d6a5afb29c13ee14dc3551b066e69cd5015f75 Mon Sep 17 00:00:00 2001 From: niuyan Date: Fri, 21 Nov 2025 10:46:58 +0800 Subject: [PATCH] 1 --- .../service/impl/ConSaleServiceImpl.java | 142 +++++++++--------- 1 file changed, 72 insertions(+), 70 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java index 69e017f..7e4adbd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java @@ -2351,24 +2351,24 @@ public class ConSaleServiceImpl implements IConSaleService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(i + 1)); fieldIndex = fieldIndex + 1; } + if (fieldName.contains("clientId")){ +//客户名称 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getClientName())); + fieldIndex = fieldIndex + 1; + } if (fieldName.contains("contractNumber")){ // 项目编号 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getContractNumber())); fieldIndex = fieldIndex + 1; } - if (fieldName.contains("projName")){ -// 项目名称 - writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjName())); - fieldIndex = fieldIndex + 1; - } if (fieldName.contains("projNumber")){ //订单编号 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjNumber())); fieldIndex = fieldIndex + 1; } - if (fieldName.contains("clientId")){ -//客户名称 - writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getClientName())); + if (fieldName.contains("projName")){ +// 项目名称 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getProjName())); fieldIndex = fieldIndex + 1; } //一开始的媒体字段 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())); 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")){ //媒体类型 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())); 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")){ //刊例价 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); 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")){ // 项目编号 writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getContractNumber()),false); 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")){ //订单编号 writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getProjNumber()),false); fieldIndex = fieldIndex + 1; } - if (fieldName.contains("clientId")){ -//客户名称 - writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getClientName()),false); + if (fieldName.contains("projName")){ +// 项目名称 + writer.merge(i + indexStart ,i + indexStart + mergeint - 1,fieldIndex,fieldIndex,FieldCompare.getStringAll(conSale.getProjName()),false); fieldIndex = fieldIndex + 1; } //一开始的媒体字段 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())); 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")){ //媒体类型 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())); 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")){ //刊例价 writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPrintPrice())); @@ -2714,27 +2716,39 @@ public class ConSaleServiceImpl implements IConSaleService { private List orderFieldName(String fieldName,String mediaFieldName,String collectFieldName) { List result = new ArrayList<>(); result.add("序号"); + if (fieldName.contains("clientId")){ +//客户名称 + result.add("客户名称"); + } if (fieldName.contains("contractNumber")){ // 项目编号 - result.add("项目编号"); - } - if (fieldName.contains("projName")){ -// 项目名称 - result.add("项目名称"); + result.add("优客项目编号"); } if (fieldName.contains("projNumber")){ //订单编号 result.add("订单编号"); } - if (fieldName.contains("clientId")){ -//客户名称 - result.add("客户名称"); + if (fieldName.contains("projName")){ +// 项目名称 + result.add("项目名称"); } //一开始的媒体字段 cityId,mediaId,mediaPosition,accountNumber,releaseFrequency,upTime,downTime,period,printPrice,discount,mediaFee,productFee if (mediaFieldName.contains("cityId")){ //城市 result.add("城市"); } + if (mediaFieldName.contains("upTime")){ +//上刊时间 + result.add("上刊时间"); + } + if (mediaFieldName.contains("downTime")){ +//下刊时间 + result.add("下刊时间"); + } + if (mediaFieldName.contains("period")){ +//周期 + result.add("周期"); + } if (mediaFieldName.contains("mediaId")){ //媒体类型 result.add("媒体类型"); @@ -2751,18 +2765,6 @@ public class ConSaleServiceImpl implements IConSaleService { //发布频次 result.add("发布频次"); } - if (mediaFieldName.contains("upTime")){ -//上刊时间 - result.add("上刊时间"); - } - if (mediaFieldName.contains("downTime")){ -//下刊时间 - result.add("下刊时间"); - } - if (mediaFieldName.contains("period")){ -//周期 - result.add("周期"); - } if (mediaFieldName.contains("printPrice")){ //刊例价 result.add("刊例价"); @@ -2773,11 +2775,11 @@ public class ConSaleServiceImpl implements IConSaleService { } if (mediaFieldName.contains("mediaFee")){ //媒体费 - result.add("媒体费"); + result.add("订单发布费"); } if (mediaFieldName.contains("productFee")){ //制作费 - result.add("制作费"); + result.add("订单制作费"); } if (fieldName.contains("contractMoney")){ //合同金额 @@ -2797,11 +2799,11 @@ public class ConSaleServiceImpl implements IConSaleService { } if(mediaFieldName.contains("otherReverPoit")){ //其他返点 - result.add("其他返点"); + result.add("其他返点1"); } if(mediaFieldName.contains("otherReverMoney")){ //其他返点金额 - result.add("其他返点金额"); + result.add("其他返点金额1"); } if(fieldName.contains("billingTime")){ //开票时间