fix: 修复订单详情知情书的显示

wzp

2025-05-23 53443db90d66094124dbbeebbcf763032a2333d0

fix: 修复订单详情知情书的显示

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java

@@ -17,6 +17,8 @@
import com.ruoyi.system.service.IDispatchOrdService;
import com.ruoyi.system.service.IPayInfoService;
import com.ruoyi.system.service.ITbOrdersService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -47,6 +49,8 @@
@RestController
@RequestMapping("/system/order")
public class ServiceOrderController extends BaseController {

    private static final Logger log = LoggerFactory.getLogger(ServiceOrderController.class);
    @Autowired
    private IServiceOrderService serviceOrderService;

@@ -281,19 +285,9 @@
        otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "-"));

        //知情同意书
        List<String> imageUrls = new ArrayList<>();//测试使用

        if(serviceOrdId==88801)
        {
            //测试数据  
            imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3VhEv_VVql2K6eM9tS9uXgKv8fm7vaKtrSFCiP0SraTgz2qe1isgvIuUrqSNv-XgEvdC5kFUxeyrn_wz8Mfc2Sg.jpg");
            imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3cDOPpqc_fzEJ-dHz8lq5aIx3tsnmEtossC6F5VCi2vj6sBwkuzOx4g1RcsWnQ3XNua7COADksYI1rHnbizccOw.jpg");
        List<String> imageUrls = dispatchOrdService.selectImageUrlsByDOrdIDDt(orderDetail.getServiceOrdID());  //正式使用
            otherInfo.put("imageUrls", imageUrls);
        }
        else{
            imageUrls = dispatchOrdService.selectImageUrlsByDOrdIDDt(orderDetail.getServiceOrdID());  //正式使用
            otherInfo.put("imageUrls", imageUrls);
        }
        log.info("【监测】知情同意书:{}", imageUrls);

        //发票获取
        Map<String, Object> invoiceInfo = new HashMap<>();

 ruoyi-admin/src/main/resources/application.yml

@@ -56,7 +56,7 @@
    basename: i18n/messages
  profiles:
    # 环境 dev|test|prod
    active: dev
    active: prod
  # 文件上传
  servlet:
    multipart:

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -10,6 +10,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;

import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;

import java.util.HashMap;
@@ -207,6 +211,22 @@
                        map.put("driverMobile",driverMobiles.toString());
                        map.put("driverName", driverNames.toString());

                        //格式化更新时间
                        try {

                            // 2. 定义目标格式（24小时制 "HH"）
                            DateTimeFormatter targetFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                            String formattedTime = orderStatus.getUpdateTime().format(targetFormat);
                            map.put("updateTime", formattedTime);
                        }
                        catch (Exception ex)
                        {
                            log.error("时间格式转化出错");
                        }




                        log.info("【监测】[" + tbOrders.getOrderID() + "]车牌号：" + carLicenseStr);
                        //打印map
                        log.info("【监测】[" + tbOrders.getOrderID() + "]回调请求参数：" + map);

 ruoyi-system/src/main/resources/mapper/system/DispatchOrdMapper.xml

@@ -78,7 +78,7 @@
    <select id="selectImageUrlsByDOrdIDDt" parameterType="String" resultType="String">
        select ImageUrl 
        from ImageData 
        where DOrdIDDt = #{dOrdIDDt}
        where SOrdIDDt = #{dOrdIDDt}
        and ImageDel = 0 
        and ImageType in (1,2)
        order by UpImageTime desc

 ruoyi-system/src/main/resources/mapper/system/TbOrdersMapper.xml

@@ -250,6 +250,7 @@
    <select id="selectTbOrdersByServiceOrdID" parameterType="String" resultMap="TbOrdersResult">
        <include refid="selectTbOrdersVo"/>
        where ServiceOrdID = #{ServiceOrdID}
        LIMIT 1
    </select>

</mapper>

 ruoyi-ui/src/views/system/order/detail.vue

@@ -127,7 +127,7 @@
                  <el-image
                    v-for="image in otherInfo.imageUrls"
                    :key="image"
                    :src="image"
                    :src="`https://sys.966120.com.cn${image}`"
                    :preview-src-list="otherInfo.imageUrls"
                    class="preview-image"
                  />