Merge remote-tracking branch 'origin/main'

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;
 
     /**
      * 制作费

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()));
@@ -2316,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()));
@@ -2424,6 +2439,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 +2454,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()));
@@ -2501,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,
@@ -2556,7 +2587,7 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
         }
         if (fieldNameExtend.contains("projNumber")){
 //            项目编号
-            result.add("优客项目编号");
+            result.add("项目编号");
         }
         if (fieldNameExtend.contains("contractNumber")){
 //            合同编号
@@ -2572,11 +2603,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 +2623,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")){
 //            制作费
@@ -2650,6 +2689,10 @@ public class ConPurchaseServiceImpl implements IConPurchaseService {
 //            合同附件
             result.add("合同附件");
         }
+        if (fieldNameExtend.contains("detectPicAttr")){
+//            合同附件
+            result.add("检测照片");
+        }
         if (fieldNameExtend.contains("upPrint")){
 //            上刊
             result.add("上刊");

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

@@ -2424,6 +2424,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()));
@@ -2469,6 +2475,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()));
@@ -2590,6 +2606,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()));
@@ -2643,6 +2664,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;
@@ -2727,7 +2758,7 @@ public class ConSaleServiceImpl implements IConSaleService {
         }
         if (fieldName.contains("contractNumber")){
 //            项目编号
-            result.add("优客项目编号");
+            result.add("项目编号");
         }
         if (fieldName.contains("projNumber")){
 //订单编号
@@ -2774,6 +2805,10 @@ public class ConSaleServiceImpl implements IConSaleService {
 //刊例价
             result.add("刊例价");
         }
+        if (mediaFieldName.contains("printPriceUnit")){
+//刊例价
+            result.add("刊例价单位");
+        }
         if (mediaFieldName.contains("discount")){
 //折扣
             result.add("折扣");
@@ -2810,6 +2845,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("开票时间");