Merge remote-tracking branch 'origin/master'

luodangjia

2024-06-05 7b055971157b91bf1f0de03c1332965a7b161735

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -11,10 +11,7 @@
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +24,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;

/**
@@ -83,9 +83,22 @@
     * 跳转到修改专车订单
     */
    @RequestMapping("/tOrderPrivateCar_orderDetail/{tOrderPrivateCarId}")
    public String tOrderPrivateCarUpdate(@PathVariable Integer tOrderPrivateCarId, Model model) {
    public String tOrderPrivateCarUpdate(@PathVariable Integer tOrderPrivateCarId, Model model) throws ParseException {
        Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
        model.addAttribute("item",item);
        if(Objects.nonNull(item.get("routeRecord"))){
            List<String> routeRecordList = Arrays.asList(item.get("routeRecord").toString().split(","));
            model.addAttribute("routeRecordList",routeRecordList);
        }
        if(Objects.nonNull(item.get("routeRecord")) && Objects.nonNull(item.get("recordTime"))){
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            LocalDateTime recordTime = DateUtil.dateToLocalDateTime(format.parse(item.get("recordTime").toString()));
            if(LocalDateTime.now().isBefore(recordTime.plusMonths(1))){
                model.addAttribute("recordState",1);
            }else {
                model.addAttribute("recordState",2);
            }
        }
        return PREFIX + "tOrderPrivateCar_orderDetail.html";
    }