Browse Source

添加确认单获取合同

hjc 4 months ago
parent
commit
b181eb1d61

+ 8 - 0
src/main/java/com/chinaitop/depot/intelligent/financialSupervision/controller/BusinessFsInConfirmController.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.intelligent.financialSupervision.controller;
3
 
3
 
4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.chinaitop.depot.intelligent.common.ResponseEntity;
5
 import com.chinaitop.depot.intelligent.common.ResponseEntity;
6
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessContract;
6
 import com.chinaitop.depot.intelligent.financialSupervision.param.*;
7
 import com.chinaitop.depot.intelligent.financialSupervision.param.*;
7
 import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsInConfirmService;
8
 import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsInConfirmService;
8
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmDetailVO;
9
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmDetailVO;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.validation.annotation.Validated;
15
 import org.springframework.validation.annotation.Validated;
15
 import org.springframework.web.bind.annotation.*;
16
 import org.springframework.web.bind.annotation.*;
16
 
17
 
18
+import java.util.List;
19
+
17
 /**
20
 /**
18
  * <p>
21
  * <p>
19
  * 财务监管-入库确认单 前端控制器
22
  * 财务监管-入库确认单 前端控制器
@@ -61,7 +64,12 @@ public class BusinessFsInConfirmController {
61
         return ResponseEntity.ok(businessFsInConfirmService.getDataById(id));
64
         return ResponseEntity.ok(businessFsInConfirmService.getDataById(id));
62
     }
65
     }
63
 
66
 
67
+    @GetMapping("/getContractData")
68
+    @ApiOperation(value = "获取采购合同编号", notes = "获取采购合同编号")
69
+    public ResponseEntity<List<BusinessContract>> getContractData(Integer orgId) {
64
 
70
 
71
+        return ResponseEntity.ok(businessFsInConfirmService.getContractData(orgId));
72
+    }
65
     @GetMapping("/getByContractId/{id}")
73
     @GetMapping("/getByContractId/{id}")
66
     @ApiOperation(value = "通过合同id获取带出数据", notes = "通过合同id获取带出数据")
74
     @ApiOperation(value = "通过合同id获取带出数据", notes = "通过合同id获取带出数据")
67
     public ResponseEntity<GetFsConfirmByContractIdVO> getByContractId(@PathVariable("id") String id) {
75
     public ResponseEntity<GetFsConfirmByContractIdVO> getByContractId(@PathVariable("id") String id) {

+ 11 - 0
src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/BusinessFsInConfirmService.java

@@ -1,6 +1,7 @@
1
 package com.chinaitop.depot.intelligent.financialSupervision.service;
1
 package com.chinaitop.depot.intelligent.financialSupervision.service;
2
 
2
 
3
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessContract;
4
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirm;
5
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirm;
5
 import com.baomidou.mybatisplus.extension.service.IService;
6
 import com.baomidou.mybatisplus.extension.service.IService;
6
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmAddParam;
7
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmAddParam;
@@ -10,6 +11,8 @@ import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfi
10
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmPageVO;
11
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmPageVO;
11
 import com.chinaitop.depot.intelligent.financialSupervision.vo.GetFsConfirmByContractIdVO;
12
 import com.chinaitop.depot.intelligent.financialSupervision.vo.GetFsConfirmByContractIdVO;
12
 
13
 
14
+import java.util.List;
15
+
13
 /**
16
 /**
14
  * <p>
17
  * <p>
15
  * 财务监管-入库确认单 服务类
18
  * 财务监管-入库确认单 服务类
@@ -68,4 +71,12 @@ public interface BusinessFsInConfirmService extends IService<BusinessFsInConfirm
68
     *@date 2024/7/4 18:06
71
     *@date 2024/7/4 18:06
69
     */
72
     */
70
     int updateData(BusinessFsInConfirmUpdateParam param);
73
     int updateData(BusinessFsInConfirmUpdateParam param);
74
+
75
+    /**
76
+    *获取采购合同编号
77
+    *
78
+    *@author hjc
79
+    *@date 2024/7/24 17:52
80
+    */
81
+    List<BusinessContract> getContractData(Integer orgId);
71
 }
82
 }

+ 14 - 0
src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsInConfirmServiceImpl.java

@@ -1,6 +1,7 @@
1
 package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
1
 package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
2
 
2
 
3
 import cn.hutool.core.collection.CollectionUtil;
3
 import cn.hutool.core.collection.CollectionUtil;
4
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
5
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
5
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -74,6 +75,19 @@ public class BusinessFsInConfirmServiceImpl extends ServiceImpl<BusinessFsInConf
74
 
75
 
75
     }
76
     }
76
 
77
 
78
+    /**
79
+     *获取采购合同编号
80
+     *
81
+     *@author hjc
82
+     *@date 2024/7/24 17:52
83
+     */
84
+    @Override
85
+    public List<BusinessContract> getContractData(Integer orgId) {
86
+        return businessContractMapper.selectList(new LambdaQueryWrapper<BusinessContract>()
87
+                .eq(BusinessContract::getAuditState, 2)
88
+                .eq(BusinessContract::getContractType, "3147")
89
+                .eq(BusinessContract::getOrgId, orgId));
90
+    }
77
 
91
 
78
     /**
92
     /**
79
      * 通过合同id获取带出数据
93
      * 通过合同id获取带出数据