From b7a35203b0ee82c50559c084ef4caa9554a5925e Mon Sep 17 00:00:00 2001 From: niuyan Date: Fri, 21 Nov 2025 16:34:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/ConPurchaseMediaVo.java | 6 ++- .../service/impl/ConPurchaseServiceImpl.java | 40 ++++++++++++++--- .../service/impl/ConSaleServiceImpl.java | 45 ++++++++++++++++++- 3 files changed, 83 insertions(+), 8 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseMediaVo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseMediaVo.java index cda3db7..47f682b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseMediaVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseMediaVo.java @@ -138,7 +138,11 @@ public class ConPurchaseMediaVo { @ExcelProperty(value = "媒体费") private Double mediaFee; - + /** + * 单位 + */ + @ExcelProperty(value = "媒体费单位") + private String mediaFeeUnit; /** * 制作费 diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java index 8a64a9c..4b9cbdd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java @@ -2255,6 +2255,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getPrintPrice())); fieldIndex = fieldIndex + 1; } + if (mediaFieldName.contains("printPriceUnit")){ +// 刊例价 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getPrintPriceUnit())); + fieldIndex = fieldIndex + 1; + } if (mediaFieldName.contains("discount")){ // 折扣 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getDiscount())); @@ -2265,6 +2270,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getMediaFee())); fieldIndex = fieldIndex + 1; } + if (mediaFieldName.contains("mediaFeeUnit")){ +// 媒体费 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getMediaFeeUnit())); + fieldIndex = fieldIndex + 1; + } if (mediaFieldName.contains("productFee")){ // 制作费 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchaseMedia.getProductFee())); @@ -2424,6 +2434,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getPrintPrice())); inner = inner + 1; } + if (mediaFieldName.contains("printPriceUnit")){ +// 刊例价 + writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getPrintPriceUnit())); + inner = inner + 1; + } if (mediaFieldName.contains("discount")){ // 折扣 writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getDiscount())); @@ -2434,6 +2449,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getMediaFee())); inner = inner + 1; } + if (mediaFieldName.contains("mediaFeeUnit")){ +// 媒体费 + writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getMediaFeeUnit())); + inner = inner + 1; + } if (mediaFieldName.contains("productFee")){ // 制作费 writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conPurchaseMediaList.get(i1).getProductFee())); @@ -2556,7 +2576,7 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { } if (fieldNameExtend.contains("projNumber")){ // 项目编号 - result.add("优客项目编号"); + result.add("项目编号"); } if (fieldNameExtend.contains("contractNumber")){ // 合同编号 @@ -2572,11 +2592,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { } if (mediaFieldName.contains("upTime")){ // 上刊时间 - result.add("发布开始时间"); + result.add("上刊时间"); } if (mediaFieldName.contains("downTime")){ // 下刊时间 - result.add("发布结束时间"); + result.add("下刊时间"); } if (mediaFieldName.contains("period")){ // 周期 @@ -2592,23 +2612,31 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { } if (mediaFieldName.contains("accountNumber")){ // 数量 - result.add("数量"); + result.add("采购数量"); } if (mediaFieldName.contains("releaseFrequency")){ // 发布频次 - result.add("频次"); + result.add("发布频次"); } if (mediaFieldName.contains("printPrice")){ // 刊例价 result.add("刊例价"); } + if (mediaFieldName.contains("printPriceUnit")){ +// 刊例价 + result.add("刊例价单位"); + } if (mediaFieldName.contains("discount")){ // 折扣 result.add("折扣"); } if (mediaFieldName.contains("mediaFee")){ // 媒体费 - result.add("净价"); + result.add("媒体费"); + } + if (mediaFieldName.contains("mediaFeeUnit")){ +// 媒体费 + result.add("媒体费单位"); } if (mediaFieldName.contains("productFee")){ // 制作费 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 7e4adbd..5757801 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 @@ -2419,6 +2419,12 @@ public class ConSaleServiceImpl implements IConSaleService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getPrintPrice())); fieldIndex = fieldIndex + 1; } + + if (mediaFieldName.contains("printPriceUnit")){ +//刊例价单位 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getPrintPriceUnit())); + fieldIndex = fieldIndex + 1; + } if (mediaFieldName.contains("discount")){ //折扣 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getDiscount())); @@ -2464,6 +2470,16 @@ public class ConSaleServiceImpl implements IConSaleService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getOtherReverMoney())); fieldIndex = fieldIndex + 1; } + if(mediaFieldName.contains("otherReverPoit2")){ +//其他返点 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getOtherReverPoit2())); + fieldIndex = fieldIndex + 1; + } + if(mediaFieldName.contains("otherReverMoney2")){ +//其他返点金额 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSaleMediaChild.getOtherReverMoney2())); + fieldIndex = fieldIndex + 1; + } if(fieldName.contains("billingTime")){ //开票时间 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conSale.getBillingTime())); @@ -2585,6 +2601,11 @@ public class ConSaleServiceImpl implements IConSaleService { writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPrintPrice())); inner = inner + 1; } + if (mediaFieldName.contains("printPriceUnit")){ +//刊例价 + writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getPrintPriceUnit())); + inner = inner + 1; + } if (mediaFieldName.contains("discount")){ //折扣 writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getDiscount())); @@ -2638,6 +2659,16 @@ public class ConSaleServiceImpl implements IConSaleService { writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getOtherReverMoney())); inner = inner + 1; } + if(mediaFieldName.contains("otherReverPoit2")){ +//其他返点 + writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getOtherReverPoit2())); + inner = inner + 1; + } + if(mediaFieldName.contains("otherReverMoney2")){ +//其他返点金额 + writer.writeCellValue(fieldIndex + inner,i + indexStart + i1,FieldCompare.getStringAll(conSaleMedia.get(i1).getOtherReverMoney2())); + inner = inner + 1; + } //将列更换一次(跳过子项列) if (i1 + 1 == conSaleMedia.size()){ fieldIndex = fieldIndex + inner; @@ -2722,7 +2753,7 @@ public class ConSaleServiceImpl implements IConSaleService { } if (fieldName.contains("contractNumber")){ // 项目编号 - result.add("优客项目编号"); + result.add("项目编号"); } if (fieldName.contains("projNumber")){ //订单编号 @@ -2769,6 +2800,10 @@ public class ConSaleServiceImpl implements IConSaleService { //刊例价 result.add("刊例价"); } + if (mediaFieldName.contains("printPriceUnit")){ +//刊例价 + result.add("刊例价单位"); + } if (mediaFieldName.contains("discount")){ //折扣 result.add("折扣"); @@ -2805,6 +2840,14 @@ public class ConSaleServiceImpl implements IConSaleService { //其他返点金额 result.add("其他返点金额1"); } + if(mediaFieldName.contains("otherReverPoit2")){ +//其他返点 + result.add("其他返点2"); + } + if(mediaFieldName.contains("otherReverMoney2")){ +//其他返点金额 + result.add("其他返点金额2"); + } if(fieldName.contains("billingTime")){ //开票时间 result.add("开票时间"); From 83c6d09d2c24730236d980e45893c9647b56f8ea Mon Sep 17 00:00:00 2001 From: niuyan Date: Fri, 21 Nov 2025 16:39:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ConPurchaseServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java index 4b9cbdd..06f693c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java @@ -2326,6 +2326,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getContractAccess())); fieldIndex = fieldIndex + 1; } + if (fieldNameExtend.contains("detectPicAttr")){ +// 合同附件 + writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getDetectPicAttr())); + fieldIndex = fieldIndex + 1; + } if (fieldNameExtend.contains("upPrint")){ // 上刊 writer.writeCellValue(fieldIndex,i + indexStart,FieldCompare.getStringAll(conPurchase.getUpPrint())); @@ -2521,6 +2526,12 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getContractAccess()),false); fieldIndex = fieldIndex + 1; } + if (fieldNameExtend.contains("detectPicAttr")){ +// 合同附件 + writer.merge(i + indexStart ,i + indexStart + mergeint - 1, + fieldIndex,fieldIndex,FieldCompare.getStringAll(conPurchase.getDetectPicAttr()),false); + fieldIndex = fieldIndex + 1; + } if (fieldNameExtend.contains("upPrint")){ // 上刊 writer.merge(i + indexStart ,i + indexStart + mergeint - 1, @@ -2678,6 +2689,10 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { // 合同附件 result.add("合同附件"); } + if (fieldNameExtend.contains("detectPicAttr")){ +// 合同附件 + result.add("检测照片"); + } if (fieldNameExtend.contains("upPrint")){ // 上刊 result.add("上刊");