提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/contract/mapper/ContractMapper.java

@@ -309,17 +309,17 @@ public interface ContractMapper extends BladeMapper<Contract> {
      * 查询总条数
      */
     @TenantIgnore
-    List<Contract> getDailyContract(@RequestParam("tenantId") String tenantId,
-                                    @RequestParam("dataType") Integer dataType,
-                                    @RequestParam("createUser") String createUser);
+    List<Contract> getDailyContract(@Param("tenantId") String tenantId,
+                                    @Param("dataType") Integer dataType,
+                                    @Param("createUser") String createUser);
 
     /**
      * 查询总条数
      */
     @TenantIgnore
-    Integer getDailyContractCount(@RequestParam("tenantId") String tenantId,
-                                  @RequestParam("dataType") Integer dataType,
-                                  @RequestParam("createUser") String createUser);
+    Integer getDailyContractCount(@Param("tenantId") String tenantId,
+                                  @Param("dataType") Integer dataType,
+                                  @Param("createUser") String createUser);
 
     /**
      * 查询总条数
@@ -332,15 +332,15 @@ public interface ContractMapper extends BladeMapper<Contract> {
      * 总览-订单跟踪-统计总额
      */
     @TenantIgnore
-    List<Contract> getOrderTailAfterSum(@RequestParam("tenantId") String tenantId,
-                                        @RequestParam("userId") String userId);
+    List<Contract> getOrderTailAfterSum(@Param("tenantId") String tenantId,
+                                        @Param("userId") String userId);
 
     /**
      * 总览-订单跟踪-统计总额
      */
     @TenantIgnore
-    List<Contract> getOrderTailAfterSumStaus(@RequestParam("tenantId") String tenantId,
-                                             @RequestParam("userId") String userId);
+    List<Contract> getOrderTailAfterSumStaus(@Param("tenantId") String tenantId,
+                                             @Param("userId") String userId);
 
     /**
      * 根据用户ID查询
@@ -351,7 +351,7 @@ public interface ContractMapper extends BladeMapper<Contract> {
      * @return
      */
     @TenantIgnore
-    List<Contract> getByUserIds(@RequestParam("userIds") List<String> userIds, @RequestParam("year") String year, @RequestParam("dataType") int dataType);
+    List<Contract> getByUserIds(@Param("userIds") List<String> userIds, @Param("year") String year, @Param("dataType") int dataType);
 
     /**
      * 根据用户ID查询
@@ -362,7 +362,7 @@ public interface ContractMapper extends BladeMapper<Contract> {
      * @return
      */
     @TenantIgnore
-    List<Contract> getByUserIdsJoin(@RequestParam("userIds") List<String> userIds, @RequestParam("year") String year, @RequestParam("dataType") int dataType);
+    List<Contract> getByUserIdsJoin(@Param("userIds") List<String> userIds, @Param("year") String year, @Param("dataType") int dataType);
 
     /**
      * 根据子编号前缀代码统计
@@ -378,13 +378,13 @@ public interface ContractMapper extends BladeMapper<Contract> {
      */
     @TenantIgnore
     Integer getCount(
-            @RequestParam("prefixCode") int prefixCode,
-            @RequestParam("countryId") String countryId,
-            @RequestParam("customerId") String customerId,
-            @RequestParam("productId") String productId,
-            @RequestParam("tenantId") String tenantId,
-            @RequestParam("userId") String userId,
-            @RequestParam("dataType") int dataType
+            @Param("prefixCode") int prefixCode,
+            @Param("countryId") String countryId,
+            @Param("customerId") String customerId,
+            @Param("productId") String productId,
+            @Param("tenantId") String tenantId,
+            @Param("userId") String userId,
+            @Param("dataType") int dataType
     );
 
     /**

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/funds/v2/controller/RequestFundsV2Controller.java

@@ -100,7 +100,8 @@ public class RequestFundsV2Controller extends BladeController {
      */
     @PostMapping(value = "/details")
     public R details(@RequestBody RequestFundsV2 entity) {
-        return R.details(requestFundsV2Service.getById(entity.getId()));
+        RequestFundsV2 requestFundsV2 = requestFundsV2Service.details(entity.getId());
+        return R.details(requestFundsV2);
     }
 
     /**

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/funds/v2/service/IRequestFundsV2Service.java

@@ -128,4 +128,10 @@ public interface IRequestFundsV2Service extends IService<RequestFundsV2> {
      * @return
      */
     List<Contract> contractSelect();
+
+    /**
+     * 详情
+     */
+    RequestFundsV2 details(String id);
+
 }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/funds/v2/service/impl/RequestFundsV2ServiceImpl.java

@@ -77,13 +77,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -923,4 +917,26 @@ public class RequestFundsV2ServiceImpl extends BasicsServiceImpl<RequestFundsV2M
                 .lt(Contract::getStatus, ContractStatusEnum.INVALID.getKey())
                 .list();
     }
+
+    @Override
+    public RequestFundsV2 details(String id) {
+
+        RequestFundsV2 requestFundsV2 = getById(id);
+
+        // 获取部门
+        String deptId = requestFundsV2.getDeptId();
+        Map<String, Dept> deptMap = iSysClient.getDeptByIdsToMap(Collections.singletonList(deptId));
+        Dept dept = deptMap.get(deptId);
+        if (dept != null) {
+            requestFundsV2.setDeptName(dept.getDeptName());
+        }
+
+        // 查询公司信息
+        Company company = iCompanyService.getById(requestFundsV2.getCompanyId());
+        if (company != null) {
+            requestFundsV2.setCompanyName(company.getNameChinese());
+        }
+
+        return requestFundsV2;
+    }
 }