Fna接口21

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCustomerController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * customer接口
@@ -57,7 +58,7 @@ public class ApiCustomerController {
     @Operation(summary = "创建客户")
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
-    public Result<String> addCustomer(@RequestBody CustomerAddRequest customerAddRequest, HttpServletRequest request) {
+    public Result<Map<String, Object>> addCustomer(@RequestBody CustomerAddRequest customerAddRequest, HttpServletRequest request) {
         if (customerAddRequest == null) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
         }

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFnaController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * Fna接口
@@ -55,7 +56,7 @@ public class ApiFnaController {
      */
     @PostMapping("/add")
     @Operation(summary = "新建流程")
-    public Result<String> addFna(@RequestBody FnaAddRequest fnaAddRequest, HttpServletRequest request) {
+    public Result<Map<String, Object>> addFna(@RequestBody FnaAddRequest fnaAddRequest, HttpServletRequest request) {
         if (fnaAddRequest == null) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
         }

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFnaFormController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Fna表单接口
@@ -42,7 +44,7 @@ public class ApiFnaFormController {
      * @return
      */
     @PostMapping("/add")
-    public Result<String> addFnaForm(@RequestBody FnaFormAddRequest fnaFormAddRequest, HttpServletRequest request) {
+    public Result<Map<String, Object>> addFnaForm(@RequestBody FnaFormAddRequest fnaFormAddRequest, HttpServletRequest request) {
 
         if (fnaFormAddRequest == null) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
@@ -71,7 +73,9 @@ public class ApiFnaFormController {
 
         // 返回新写入的数据 id
         String newFnaFormId = fnaForm.getFnaFormBizId();
-        return Result.success(newFnaFormId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("fnaFormBizId", newFnaFormId);
+        return Result.success(map);
     }
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/service/CustomerService.java

@@ -11,6 +11,8 @@ import com.yd.csf.service.model.CustomerExpand;
 import com.yd.csf.service.vo.CustomerVO;
 import com.yd.csf.service.vo.FnaVO;
 
+import java.util.Map;
+
 
 /**
 * @author Zhang Jianan
@@ -29,5 +31,5 @@ public interface CustomerService extends IService<Customer> {
 
     Customer getByCustomerBizId(String customerBizId);
 
-    String addCustomer(CustomerAddRequest customerAddRequest);
+    Map<String, Object> addCustomer(CustomerAddRequest customerAddRequest);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/FnaService.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.model.Fna;
 import com.yd.csf.service.vo.FnaVO;
 
+import java.util.Map;
+
 /**
 * @author Zhang Jianan
 * @description 针对表【fna(fna表)】的数据库操作Service
@@ -16,7 +18,7 @@ import com.yd.csf.service.vo.FnaVO;
 */
 public interface FnaService extends IService<Fna> {
 
-    String addFna(FnaAddRequest fnaAddRequest);
+    Map<String, Object> addFna(FnaAddRequest fnaAddRequest);
 
     /**
      * 获取查询条件

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CustomerServiceImpl.java

@@ -30,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -136,7 +133,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addCustomer(CustomerAddRequest customerAddRequest) {
+    public Map<String, Object> addCustomer(CustomerAddRequest customerAddRequest) {
         // 校验 请求 对象中，参数是否全部为空
         if (ValidateUtil.isAllFieldsNull(customerAddRequest)) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
@@ -176,7 +173,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
             updateCustomer.setCustomerExpandBizId(customerExpand.getCustomerBizId());
             customerService.updateById(updateCustomer);
         }
-        return customer.getCustomerBizId();
+        Map<String, Object> map = new HashMap<>();
+        map.put("customerBizId", customer.getCustomerBizId());
+        return map;
     }
 
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -45,7 +45,7 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addFna(FnaAddRequest fnaAddRequest) {
+    public Map<String, Object> addFna(FnaAddRequest fnaAddRequest) {
         Fna fna = new Fna();
         BeanUtils.copyProperties(fnaAddRequest, fna);
 
@@ -75,7 +75,11 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
 //        fnaService.updateById(updateFna);
 
         // 返回新写入的数据 id
-        return fna.getFnaBizId();
+        String fnaBizId = fna.getFnaBizId();
+        // 组装返回
+        Map<String, Object> map = new HashMap<>();
+        map.put("fnaBizId", fnaBizId);
+        return map;
     }
 
     /**