1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -2497,7 +2497,13 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         Double amountIngPayableTotal = 0d;//应收合计
         for (int i = 0; i < dataList.size(); i++) {
             PaymentManagement paymentManagement1 = dataList.get(i);
-
+            String taskId = "";
+            // 只有待审核状态才有taskId
+            if (StringUtils.isNotBlank(paymentManagement1.getWorkflowId())) {
+                JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(paymentManagement1.getWorkflowId()), paymentManagement1.getId());
+                taskId = jsonObject.getString("taskId");
+                paymentManagement1.setTaskId(taskId);
+            }
             //水分累计和
             waterContentTotal = waterContentTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getWaterContent()!=null?paymentManagement1.getWaterContent():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
             impurityTotal = impurityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getImpurity()!=null?paymentManagement1.getImpurity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -286,6 +286,7 @@
         a.payment_no as paymentNo,
         a.customer_name as customerName,
         a.customer_number_card as customerNumberCard,
+        a.workflow_id as workflowId,
         q.bin_number as binNumber,
         i.supplier,
         q.quality_inspector as qualityInspector,