Fna接口13

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

@@ -60,41 +60,11 @@ public class ApiFnaController {
      */
     @PostMapping("/add")
     @Operation(summary = "新建流程")
-    @Transactional(rollbackFor = Exception.class)
     public Result<String> addFna(@RequestBody FnaAddRequest fnaAddRequest, HttpServletRequest request) {
-
         if (fnaAddRequest == null) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
         }
-
-        Fna fna = new Fna();
-        BeanUtils.copyProperties(fnaAddRequest, fna);
-
-        // 获取Security上下文当前用户的登录信息
-//        AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
-//        String userBizId = authUserDto.getUserBizId();
-
-        String userBizId = "user_dMnkKPIwemvY0zhk";
-
-        fna.setUserBizId(userBizId);
-        fna.setFnaBizId(RandomStringGenerator.generateBizId16("fna"));
-
-        fna.setCreatorId(userBizId);
-        fna.setUpdaterId(userBizId);
-        // 写入数据库
-        boolean result = fnaService.save(fna);
-        if (!result) {
-            return Result.fail(ErrorCode.OPERATION_ERROR.getCode(), ErrorCode.OPERATION_ERROR.getMessage());
-        }
-        // 更新 fna_no
-        Fna updateFna = new Fna();
-        updateFna.setId(fna.getId());
-        updateFna.setFnaNo(fna.getId());
-        fnaService.updateById(updateFna);
-
-        // 返回新写入的数据 id
-        String newFnaId = fna.getFnaBizId();
-        return Result.success(newFnaId);
+        return Result.success(fnaService.addFna(fnaAddRequest));
     }
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaAddRequest.java

@@ -44,7 +44,6 @@ public class FnaAddRequest implements Serializable {
     @Schema(description = "预约信息主表唯一业务ID")
     private String appointmentBizId;
 
-
     /**
      * 核保编号
      */
@@ -64,12 +63,6 @@ public class FnaAddRequest implements Serializable {
     private String policyNo;
 
     /**
-     * 状态
-     */
-    @Schema(description = "状态")
-    private Object status;
-
-    /**
      * 产品代码
      */
     @Schema(description = "产品代码")

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

@@ -2,6 +2,7 @@ package com.yd.csf.service.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.service.dto.FnaAddRequest;
 import com.yd.csf.service.dto.FnaQueryRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.csf.service.model.Fna;
@@ -14,7 +15,7 @@ import com.yd.csf.service.vo.FnaVO;
 */
 public interface FnaService extends IService<Fna> {
 
-    boolean addFna(Fna fna);
+    String addFna(FnaAddRequest fnaAddRequest);
 
     /**
      * 获取查询条件

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

@@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.yd.common.result.Result;
+import com.yd.common.utils.RandomStringGenerator;
+import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dao.FnaMapper;
+import com.yd.csf.service.dto.FnaAddRequest;
 import com.yd.csf.service.dto.FnaQueryRequest;
 import com.yd.csf.service.model.Fna;
 import com.yd.csf.service.service.FnaService;
@@ -14,7 +18,9 @@ import com.yd.csf.service.vo.FnaVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -36,11 +42,38 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
 
 
     @Override
-    public boolean addFna(Fna fna) {
+    @Transactional(rollbackFor = Exception.class)
+    public String addFna(FnaAddRequest fnaAddRequest) {
+        Fna fna = new Fna();
+        BeanUtils.copyProperties(fnaAddRequest, fna);
+
+        // 获取Security上下文当前用户的登录信息
+//        AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
+//        String userBizId = authUserDto.getUserBizId();
+
+        String userBizId = "user_dMnkKPIwemvY0zhk";
+
+        fna.setUserBizId(userBizId);
+        fna.setFnaBizId(RandomStringGenerator.generateBizId16("fna"));
+
+        fna.setCreatorId(userBizId);
+        fna.setUpdaterId(userBizId);
+        fna.setStatus("UNCOMPLETED");
+
         Date date = new Date();
         fna.setCreateTime(date);
         fna.setUpdateTime(date);
-        return this.save(fna);
+        // 写入数据库
+        boolean result = this.save(fna);
+
+        // 更新 fna_no
+//        Fna updateFna = new Fna();
+//        updateFna.setId(fna.getId());
+//        updateFna.setFnaNo(fna.getId());
+//        fnaService.updateById(updateFna);
+
+        // 返回新写入的数据 id
+        return fna.getFnaBizId();
     }
 
     /**