历史付款记录

hx-service/storage/src/main/java/com/fjhx/purchase/controller/PurchaseContractController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -48,5 +49,16 @@ public class PurchaseContractController {
         return R.success(data);
     }
 
+    /**
+     * 合同历史付款记录
+     * @return
+     */
+    @GetMapping("history/list")
+    public R newPur(){
+        List<Map<String,Object>> data = purchaseContractService.historyPayList();
+        return R.success(data);
+    }
+
+
 }
 

hx-service/storage/src/main/java/com/fjhx/purchase/mapper/PurchaseContractMapper.java

@@ -4,6 +4,9 @@ import com.fjhx.entity.purchase.PurchaseContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 采购合同 Mapper 接口
@@ -21,4 +24,11 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      */
     @TenantIgnore
     PurchaseContract getNewDataByMaterialCode(String materialCode);
+
+    /**
+     * 合同历史付款记录
+     * @return
+     */
+    @TenantIgnore
+    List<Map<String,Object>> historyPayList();
 }

hx-service/storage/src/main/java/com/fjhx/purchase/mapper/PurchaseContractMapper.xml

@@ -18,4 +18,29 @@
             t2.CreatedTime
             LIMIT 1
     </select>
+
+    <select id="historyPayList" resultType="java.util.Map">
+        SELECT
+            fac.LinkId AS payBillId,
+            IFNULL(ur.`Name`,'') AS roleName,
+            IF
+                ( fac.CheckState = 0, '已驳回', '' ) AS state
+        FROM
+            (
+                SELECT
+                    LinkId,
+                    NodeId,
+                    CheckState,
+                    ROW_NUMBER() over ( PARTITION BY LinkId ORDER BY CreatedTime DESC ) AS seq
+                FROM
+                    flow_applycheck
+                WHERE
+                    1 = 1
+                  AND FlowId = '18349246d2a940bbaf5011508e3b0b70'
+            ) fac
+                LEFT JOIN flow_node fn ON fn.id = fac.NodeId
+                LEFT JOIN u_role ur ON fn.RoleKey = ur.`Key`
+        WHERE
+            fac.seq = 1
+    </select>
 </mapper>

hx-service/storage/src/main/java/com/fjhx/purchase/service/PurchaseContractService.java

@@ -3,6 +3,9 @@ package com.fjhx.purchase.service;
 import com.fjhx.entity.purchase.PurchaseContract;
 import com.fjhx.base.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 采购合同 服务类
@@ -26,4 +29,10 @@ public interface PurchaseContractService extends BaseService<PurchaseContract> {
      * @return
      */
     PurchaseContract newPur(String materialCode);
+
+    /**
+     * 合同历史付款记录
+     * @return
+     */
+    List<Map<String,Object>> historyPayList();
 }

hx-service/storage/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -10,6 +10,7 @@ import com.fjhx.purchase.service.PurchaseContractService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,4 +47,13 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
     public PurchaseContract newPur(String materialCode) {
         return baseMapper.getNewDataByMaterialCode(materialCode);
     }
+
+    /**
+     * 合同历史付款记录
+     * @return
+     */
+    @Override
+    public List<Map<String,Object>> historyPayList() {
+        return baseMapper.historyPayList();
+    }
 }

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @since 2022-07-04
  */
 @RestController
-@RequestMapping("/cloudApi/stockWater")
+@RequestMapping("/stockWater")
 public class StockWaterController {
 
     @Autowired