wzp
2025-05-23 53443db90d66094124dbbeebbcf763032a2333d0
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<>();