【update】bpm回调新增记录审批状态逻辑

src/main/java/com/chint/domain/service/BPMOrderDomainService.java

@@ -113,21 +113,22 @@ public class BPMOrderDomainService {
             Leg leg = jdbcLegRepository.findByLegId(legId);
             anExceedStandardDto.setApplyNo(routeOrder.getApproveOrderNo().getFakeOrderNo())//申请单号
                     .setLegNo(leg == null ? "" : leg.getLegNo());//行程编号
-            //审批结果
             boolean success=bpmRequest.ANExceedStandard(anExceedStandardDto).getSuccess();
             DelayDispatch.attemptToSend(() -> success,
                     0);
             //保存超标报表
             OrderExceedStandard orderExceedStandard = OrderExceedStandard.builder()
-                    .applicant(anExceedStandardDto.getApplicant())
+                    .applicant(orderDetail.getSupplierName())
                     .companyName(user.getCompanyName())
                     .deptName(user.getDepartmentInfo().getDepartmentNameOne())
                     .standardType(getProductTypeName(command.getProductType()))
                     .sourceName(anExceedStandardDto.getSourceSystem())
                     .reason(anExceedStandardDto.getOrderType())
-                    .approvalStatus(success?"通过":"拒绝")
+                    .approvalStatus("未审批")
                     .standardAmount(anExceedStandardDto.getOrderMoney())
                     .employeeNo(employeeNo)
+                    .actualOrderNo(routeOrder.getApproveOrderNo().getActualOrderNo())
+                    .orderNo(anExceedStandardDto.getOrderNo())
                     .build();
             jdbcOrderExceedStandardRepository.save(orderExceedStandard);
         } else {
@@ -148,15 +149,17 @@ public class BPMOrderDomainService {
                     0);
             //保存超标报表
             OrderExceedStandard orderExceedStandard = OrderExceedStandard.builder()
-                    .applicant(exceedStandardDto.getOccupant())
+                    .applicant(orderDetail.getSupplierName())
                     .companyName(user.getCompanyName())
                     .deptName(user.getDepartmentInfo().getDepartmentNameOne())
                     .standardType(getProductTypeName(command.getProductType()))
                     .sourceName(exceedStandardDto.getOrderSource())
                     .reason(exceedStandardDto.getOrderType())
-                    .approvalStatus(success?"通过":"拒绝")
+                    .approvalStatus("未审批")
                     .standardAmount(exceedStandardDto.getExcessAmount())
                     .employeeNo(employeeNo)
+                    .actualOrderNo(routeOrder.getApproveOrderNo().getActualOrderNo())
+                    .orderNo(exceedStandardDto.getOrderNo())
                     .build();
             jdbcOrderExceedStandardRepository.save(orderExceedStandard);
         }

src/main/java/com/chint/interfaces/rest/bpm/BPMController.java

@@ -16,6 +16,7 @@ import com.chint.interfaces.rest.ly.LyApprovalRequest;
 import com.chint.interfaces.rest.ly.dto.strokepush.Param;
 import com.chint.interfaces.rest.ly.dto.strokepush.StrokeController;
 import com.chint.interfaces.rest.ly.dto.strokepush.StrokePushDTO;
+import com.chint.manage.mapper.JdbcOrderExceedStandardRepository;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,6 +53,9 @@ public class BPMController {
     @Autowired
     private LyApprovalRequest lyApprovalRequest;
 
+    @Autowired
+    private JdbcOrderExceedStandardRepository jdbcOrderExceedStandardRepository;
+
     //超标
     @ApiOperation("BPM超标审批结果回传")
     @PostMapping("/exceedStandard/back")
@@ -101,6 +105,8 @@ public class BPMController {
 
             }
         }
+        //记录审批状态
+        jdbcOrderExceedStandardRepository.updateApprovalStatusById(bpmBack.getResult(),bpmBack.getOrderNo());
         return Result.Success(CommonMessageConstant.SUCCESS);
     }
 

src/main/java/com/chint/manage/entity/OrderExceedStandard.java

@@ -45,4 +45,8 @@ public class OrderExceedStandard implements Serializable {
     private BigDecimal standardAmount;  // 超标金额
 
     private String employeeNo;  // 用户ID
+
+    private String orderNo; //订单号
+
+    private String actualOrderNo; //申请单号
 }

src/main/java/com/chint/manage/mapper/JdbcOrderExceedStandardRepository.java

@@ -1,11 +1,16 @@
 package com.chint.manage.mapper;
 
 import com.chint.manage.entity.OrderExceedStandard;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.data.jdbc.repository.query.Modifying;
+import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface JdbcOrderExceedStandardRepository extends CrudRepository<OrderExceedStandard, Long> {
 
-
+    @Modifying
+    @Query("UPDATE order_exceed_standard SET approval_status = :status WHERE order_no = :orderNo")
+    void updateApprovalStatusById(@Param("status") String status, @Param("orderNo") String orderNo);
 }

src/test/java/com/chint/ManageTest.java

@@ -1,13 +1,11 @@
 package com.chint;
 
 import com.chint.domain.aggregates.order.OrderDetail;
-import com.chint.domain.repository.OrderDetailRepository;
 import com.chint.infrastructure.repository.jdbc.JdbcOrderDetailRepository;
 import com.chint.infrastructure.util.PageResult;
 import com.chint.manage.entity.OrderExceedStandard;
-import com.chint.manage.entity.excel.BaseExcel;
-import com.chint.manage.entity.excel.TrainOrderDetailExcel;
 import com.chint.manage.entity.dto.ConsumptionDetailDto;
+import com.chint.manage.entity.excel.BaseExcel;
 import com.chint.manage.mapper.JdbcOrderExceedStandardRepository;
 import com.chint.manage.service.ManageService;
 import org.junit.jupiter.api.Test;
@@ -25,6 +23,11 @@ public class ManageTest {
     private JdbcOrderExceedStandardRepository jdbcOrderExceedStandardRepository;
 
 
+    @Test
+    void update(){
+        jdbcOrderExceedStandardRepository.updateApprovalStatusById("拒绝",null);
+    }
+
     @Test
     void getOrderDetail() {
         boolean success = false;