修复BUG

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java

@@ -372,6 +372,7 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
         List<Map<String, Object>> paymentDocNodeInfo = paymentdocMapper.getPaymentDocNodeInfo(id);
         String templateFilePath = configValueUtil.getTemplateFilePath() ;
         HashMap<String, Object> map = new HashMap<>();
+        map.put("reportList",paymentDocNodeInfo);
         byte[] bytes = null;
         ByteArrayOutputStream out = null;
         ExportPdf exportPdf = new ExportPdf();

SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml

@@ -7,7 +7,7 @@
         CONCAT( b.F_Account, '/', b.F_RealName ) realName,
         a.F_NodeName nodeName,
         a.F_HandleOpinion handleOpinion,
-        a.F_HandleTime handleTime
+        DATE_FORMAT(a.F_HandleTime, '%Y-%m-%d %T') handleTime
     FROM
         `flow_taskoperatorrecord` a
             LEFT JOIN base_user b ON a.F_HandleId = b.F_Account

SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml

@@ -47,7 +47,7 @@
                     ROUND(IFNULL( SUM( 	CASE b.unit WHEN 0 THEN b.net_weight ELSE b.net_weight / 1000 END ), 0),6) weightSum,-- 总净重
                     ROUND(IFNULL( SUM(CASE b.unit WHEN 0 THEN b.buckle_weight ELSE b.buckle_weight / 1000 END ), 0),6) buckleWeightSum,-- 总扣重
                     ROUND(IFNULL( SUM(  CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END), 0),6) grossWeightSum,-- 供货量
-                    ROUND(IFNULL( SUM(  CASE b.is_collection WHEN 0 THEN b.settlement*b.sales_price ELSE 0 END ), 0 ),6) salesPriceSum-- 总额
+                    ROUND(IFNULL( SUM(  CASE b.is_collection WHEN 0 THEN b.settlement*b.purchase_price ELSE 0 END ), 0 ),6) salesPriceSum-- 总额
                 FROM
                     jg_supplier a
                         LEFT JOIN jg_poundlist b ON a.id = b.supplier_id and b.delete_mark='0'