1

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

@@ -155,6 +155,13 @@ public class FuelFillingInfoServiceImpl extends ServiceImpl<FuelFillingInfoMappe
            List<FillingDetailInfo> fillingDetailInfos = fillingDetailInfoService.selectList(new EntityWrapper<FillingDetailInfo>().eq("filling_id",id));
            fuelFillingInfo.setFillingDetailInfoList(fillingDetailInfos);
         }
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(fuelFillingInfo.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(fuelFillingInfo.getWorkflowId()), fuelFillingInfo.getId());
+            taskId = jsonObject.getString("taskId");
+            fuelFillingInfo.setTaskId(taskId);
+        }
         return fuelFillingInfo;
     }
 

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

@@ -44,27 +44,17 @@
     <select id="getListByCondition" parameterType="Map" resultType="com.yh.saas.plugin.yiliangyiyun.entity.GeneralAuditInfo">
         SELECT
             id,
-            sale_plan_no as salePlanNo,
-            sale_plan_type as salePlanType,
+            audit_business_no as auditBusinessNo,
+            business_type as businessType,
             comp_id as compId,
-            title,
-            goods_name as goodsName,
-            weight,
-            basis_price as basisPrice,
-            unit_price as unitPrice,
-            send_private as sendPrivate,
-            sale_price as salePrice,
-            planned_sale_volume as plannedSaleVolume,
-            send_city as sendCity,
-            send_area as sendArea,
-            send_warehouse as sendWarehouse,
+            remark,
+            address_url as addressUrl,
+            sponsor,
             status,
             status_flag as statusFlag,
-            seller,
-            seller_phone as sellerPhone,
-            pc_flag as pcFlag,
-            show_flag as showFlag,
-            update_date as updateDate
+            approve_status as approveStatus,
+            workflow_id as workflowId,
+            create_date as createDate
         FROM general_audit_info
         WHERE delete_flag = '0'
         <if test="searchKeyWord != null and searchKeyWord != ''">