1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PurchaseClosingReportController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseClosingReport;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.service.IPurchaseClosingReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -79,5 +80,12 @@ public class PurchaseClosingReportController {
     public List<ContractManagementInfo> selectContractNoList(String compId) {
         return purchaseClosingReportService.selectContractNoList(compId);
     }
+    /**
+     * 查看
+     */
+    @GetMapping("/getInfo")
+    public PurchaseClosingReport getInfo(@RequestParam String id) {
+        return purchaseClosingReportService.getInfo(id);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PurchaseReceiptReportController.java

@@ -116,6 +116,13 @@ public class PurchaseReceiptReportController {
     public List<PurchaseReceiptReport> selectContractNo(String customerName,String contractNo) {
         return purchaseReceiptReportService.selectContractNo(customerName,contractNo);
     }
+    /**
+     * 查看
+     */
+    @GetMapping("/getInfo")
+    public PurchaseReceiptReport getInfo(@RequestParam String id) {
+        return purchaseReceiptReportService.getInfo(id);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalesClosingReportController.java

@@ -4,6 +4,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseClosingReport;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.entity.SalesClosingReport;
 import com.yh.saas.plugin.yiliangyiyun.service.ISalesClosingReportService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +81,13 @@ public class SalesClosingReportController {
     public List<ContractManagementInfo> selectContractNoList(String compId) {
         return salesClosingReportService.selectContractNoList(compId);
     }
+    /**
+     * 查看
+     */
+    @GetMapping("/getInfo")
+    public SalesClosingReport getInfo(@RequestParam String id) {
+        return salesClosingReportService.getInfo(id);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalesDeliveryReportController.java

@@ -95,5 +95,12 @@ public class SalesDeliveryReportController {
     public SaleOrder selectOrder(SalesDeliveryReport salesDeliveryReport){
         return salesDeliveryReportService.selectOrder(salesDeliveryReport);
     }
+    /**
+     * 查看
+     */
+    @GetMapping("/getInfo")
+    public SalesDeliveryReport getInfo(@RequestParam String id) {
+        return salesDeliveryReportService.getInfo(id);
+    }
 }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseClosingReport;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport;
 
 import java.util.List;
 
@@ -56,4 +57,9 @@ public interface IPurchaseClosingReportService extends IService<PurchaseClosingR
      * @param compId
      */
     List<ContractManagementInfo> selectContractNoList(String compId);
+    /**
+     * 查看
+     * @param
+     */
+    PurchaseClosingReport getInfo(String id);
 }

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

@@ -75,4 +75,10 @@ public interface IPurchaseReceiptReportService extends IService<PurchaseReceiptR
      * @param customerName
      */
     List<PurchaseReceiptReport> selectContractNo(String customerName,String contractNo);
+
+    /**
+     * 查看
+     * @param
+     */
+    PurchaseReceiptReport getInfo(String id);
 }

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

@@ -50,5 +50,10 @@ public interface ISalesClosingReportService extends IService<SalesClosingReport>
 
 
     String editSalesCloseReport(SalesClosingReport salesClosingReport);
+    /**
+     * 查看
+     * @param
+     */
+    SalesClosingReport getInfo(String id);
 
 }

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

@@ -59,5 +59,10 @@ public interface ISalesDeliveryReportService extends IService<SalesDeliveryRepor
      * @param salesDeliveryReport
      */
     SaleOrder selectOrder(SalesDeliveryReport salesDeliveryReport);
+    /**
+     * 查看
+     * @param
+     */
+    SalesDeliveryReport getInfo(String id);
 
 }

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

@@ -335,4 +335,22 @@ public class PurchaseClosingReportServiceImpl extends ServiceImpl<PurchaseClosin
         }
         return contractManagementInfoList;
     }
+
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    @Override
+    public PurchaseClosingReport getInfo(String id) {
+        PurchaseClosingReport purchaseClosingReport=this.selectById(id);
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(purchaseClosingReport.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(purchaseClosingReport.getWorkflowId()), purchaseClosingReport.getId());
+            taskId = jsonObject.getString("taskId");
+            purchaseClosingReport.setTaskId(taskId);
+        }
+        return purchaseClosingReport;
+    }
 }

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

@@ -412,4 +412,22 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         return purchaseReceiptReportList;
     }
 
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    @Override
+    public PurchaseReceiptReport getInfo(String id) {
+        PurchaseReceiptReport purchaseReceiptReport=this.selectById(id);
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(purchaseReceiptReport.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(purchaseReceiptReport.getWorkflowId()), purchaseReceiptReport.getId());
+            taskId = jsonObject.getString("taskId");
+            purchaseReceiptReport.setTaskId(taskId);
+        }
+        return purchaseReceiptReport;
+    }
+
 }

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

@@ -151,6 +151,24 @@ public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingRepor
         }
     }
 
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    @Override
+    public SalesClosingReport getInfo(String id) {
+        SalesClosingReport salesClosingReport=this.selectById(id);
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(salesClosingReport.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(salesClosingReport.getWorkflowId()), salesClosingReport.getId());
+            taskId = jsonObject.getString("taskId");
+            salesClosingReport.setTaskId(taskId);
+        }
+        return salesClosingReport;
+    }
+
 
     /**
      * 出纳付款

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

@@ -335,4 +335,22 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
         }
         return saleOrder;
     }
+
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    @Override
+    public SalesDeliveryReport getInfo(String id) {
+        SalesDeliveryReport salesDeliveryReport=this.selectById(id);
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(salesDeliveryReport.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(salesDeliveryReport.getWorkflowId()), salesDeliveryReport.getId());
+            taskId = jsonObject.getString("taskId");
+            salesDeliveryReport.setTaskId(taskId);
+        }
+        return salesDeliveryReport;
+    }
 }