修改费用审核轨迹

src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.fnc.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
@@ -13,14 +15,17 @@ import com.ydtech.modules.fnc.entity.InsFeeAuditHistory;
 import com.ydtech.modules.fnc.entity.vo.ProblemOrderQueryVo;
 import com.ydtech.modules.fnc.service.InsFeeAuditHistoryService;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
+import com.ydtech.modules.order.constants.OrderFeeAuditHistroy;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.InsOrdersTrack;
 import com.ydtech.modules.order.entity.vo.AuditOrderFeeVo;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.order.service.InsOrdersTrackService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -42,15 +47,18 @@ public class CarSettleController extends BaseController {
 
     private final InsFeeAuditHistoryService insFeeAuditHistoryService;
 
+    private final InsOrdersTrackService insOrdersTrackService;
+
 
     public CarSettleController(InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService,
                                InsFeeAuditService insFeeAuditService,
-                               InsFeeAuditHistoryService insFeeAuditHistoryService) {
+                               InsFeeAuditHistoryService insFeeAuditHistoryService,InsOrdersTrackService insOrdersTrackService) {
 
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insFeeAuditService = insFeeAuditService;
         this.insFeeAuditHistoryService = insFeeAuditHistoryService;
+        this.insOrdersTrackService = insOrdersTrackService;
 
     }
 
@@ -144,24 +152,37 @@ public class CarSettleController extends BaseController {
 
     @GetMapping("/getFeeAuditHistory/{orderno}")
     @ApiOperation(value = "获取费用审核轨迹")
-    public HttpResult<List<InsFeeAuditHistory>> getFeeAuditHistory(@PathVariable("orderno") String orderno) {
+    public HttpResult getFeeAuditHistory(@PathVariable("orderno") String orderno) {
         InsAreaCompany underWrittenSubOrder = insAreaCompanyService.getById(orderno);
         if (underWrittenSubOrder == null) {
             return HttpResult.error("订单号有误-未承保");
         }
-        List<InsFeeAuditHistory> list = new ArrayList<>();
-        InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory();
-        insFeeAuditHistory.setOrderno(underWrittenSubOrder.getOrderno());
-        insFeeAuditHistory.setInsOrderNo(underWrittenSubOrder.getId());
-        insFeeAuditHistory.setInsCompany(underWrittenSubOrder.getInscompany());
-        insFeeAuditHistory.setOperator(underWrittenSubOrder.getUserName());
-        insFeeAuditHistory.setOperatorTime(underWrittenSubOrder.getSigningTime());
-        insFeeAuditHistory.setAuditstatus(FeeAuditAuditstatus.UNDERWRITING.getCode());
-        list.add(insFeeAuditHistory);
+        JSONArray list = new JSONArray();
+        List<InsOrdersTrack> insOrdersTracks = insOrdersTrackService.list(new LambdaQueryWrapper<InsOrdersTrack>().eq(InsOrdersTrack::getSuborder, orderno)
+                .orderByAsc(InsOrdersTrack::getCreateTime));
+        insOrdersTracks.forEach(item->{
+            String desc = OrderFeeAuditHistroy.getDesc(item.getOrderStatus());
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("insCompany",item.getInsCompany());
+            jsonObject.put("operatorTime",item.getCreateTime());
+            jsonObject.put("audituser",item.getOperatorId());
+            jsonObject.put("operator",item.getOperator());
+            jsonObject.put("desc",desc);
+            list.add(jsonObject);
+        });
+
         LambdaQueryWrapper<InsFeeAuditHistory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InsFeeAuditHistory::getInsOrderNo, orderno);
         wrapper.orderByAsc(InsFeeAuditHistory::getOperatorTime);
-        list.addAll(insFeeAuditHistoryService.list(wrapper));
+        List<InsFeeAuditHistory> insFeeAuditHistories = insFeeAuditHistoryService.list(wrapper);
+        insFeeAuditHistories.forEach(item->{
+            String desc = OrderFeeAuditHistroy.getDesc(OrderFeeAuditHistroy.convertStatus(item.getAuditstatus()));
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(item));
+            jsonObject.put("desc",desc);
+            list.add(jsonObject);
+        });
+
+
         return HttpResult.ok("success", list);
     }
 

src/main/java/com/ydtech/modules/order/constants/OrderFeeAuditHistroy.java

@@ -0,0 +1,55 @@
+package com.ydtech.modules.order.constants;
+
+public enum OrderFeeAuditHistroy {
+    OFH_0("0", "报价中"),
+    OFH_1("1", "待核保"),
+    OFH_2("2", "已核保代缴费"),
+    OFH_3("3", "已承保"),
+    OFH_4("4", "核保退回"),
+    OFH_5("5", "未审核"),
+    OFH_6("6", "已审核"),
+    OFH_7("7", "驳回"),
+    OFH_8("8", "电销未提交"),
+    OFH_9("9", "电销待提交");
+
+    private final String code;
+    private final String desc;
+
+    OrderFeeAuditHistroy(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDesc(){
+        return desc;
+    }
+
+    public static String getDesc(String code){
+        for( OrderFeeAuditHistroy audit : OrderFeeAuditHistroy.values()){
+            if(audit.getCode().equals(code)){
+                return audit.getDesc();
+            }
+        }
+        return "";
+    }
+
+    public static String convertStatus(String auditStatus){
+        if(auditStatus.equals("0")){
+            return OFH_5.getCode();
+        }else if(auditStatus.equals("1")){
+            return OFH_6.getCode();
+        }else if(auditStatus.equals("2")){
+            return OFH_7.getCode();
+        }else if(auditStatus.equals("4")){
+            return OFH_5.getCode();
+        }else if(auditStatus.equals("5")){
+            return OFH_6.getCode();
+        }
+        return "";
+    }
+
+}